har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nlmeans_vulkan: fix width/height for chroma plane weights calculation

Browse Source
This commit is contained in:
Lynne 2023-09-16 00:42:53 +02:00
parent 6028728bb8
commit 6bc8ff7d93
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_nlmeans_vulkan.c
View File

@ -100,7 +100,7 @@ static void insert_horizontal_pass(FFVkSPIRVShader *shd, int nb_rows, int first,
gl_SemanticsMakeAvailable | gl_SemanticsMakeAvailable |
gl_SemanticsMakeVisible); ); gl_SemanticsMakeVisible); );
} }
GLSLC(1, for (y = 0; y < height[0]; y++) { ); GLSLF(1, for (y = 0; y < height[%i]; y++) { ,plane);
GLSLC(2, offset = uint64_t(int_stride)*y*T_ALIGN; ); GLSLC(2, offset = uint64_t(int_stride)*y*T_ALIGN; );
GLSLC(2, dst = DataBuffer(uint64_t(integral_data) + offset); ); GLSLC(2, dst = DataBuffer(uint64_t(integral_data) + offset); );
GLSLC(0, ); GLSLC(0, );
@ -127,7 +127,7 @@ static void insert_vertical_pass(FFVkSPIRVShader *shd, int nb_rows, int first, i
gl_SemanticsMakeAvailable | gl_SemanticsMakeAvailable |
gl_SemanticsMakeVisible); ); gl_SemanticsMakeVisible); );
} }
GLSLC(1, for (x = 0; x < width[0]; x++) { ); GLSLF(1, for (x = 0; x < width[%i]; x++) { ,plane);
GLSLC(2, dst = DataBuffer(uint64_t(integral_data) + x*T_ALIGN); ); GLSLC(2, dst = DataBuffer(uint64_t(integral_data) + x*T_ALIGN); );
for (int r = 0; r < nb_rows; r++) { for (int r = 0; r < nb_rows; r++) {
@ -156,13 +156,13 @@ static void insert_weights_pass(FFVkSPIRVShader *shd, int nb_rows, int vert,
gl_SemanticsMakeVisible); ); gl_SemanticsMakeVisible); );
GLSLC(1, barrier(); ); GLSLC(1, barrier(); );
if (!vert) { if (!vert) {
GLSLC(1, for (y = 0; y < height[0]; y++) { ); GLSLF(1, for (y = 0; y < height[%i]; y++) { ,plane);
GLSLF(2, if (gl_GlobalInvocationID.x*%i >= width[%i]) ,nb_rows, plane); GLSLF(2, if (gl_GlobalInvocationID.x*%i >= width[%i]) ,nb_rows, plane);
GLSLC(3, break; ); GLSLC(3, break; );
GLSLF(2, for (r = 0; r < %i; r++) { ,nb_rows); GLSLF(2, for (r = 0; r < %i; r++) { ,nb_rows);
GLSLF(3, x = int(gl_GlobalInvocationID.x) * %i + r; ,nb_rows); GLSLF(3, x = int(gl_GlobalInvocationID.x) * %i + r; ,nb_rows);
} else { } else {
GLSLC(1, for (x = 0; x < width[0]; x++) { ); GLSLF(1, for (x = 0; x < width[%i]; x++) { ,plane);
GLSLF(2, if (gl_GlobalInvocationID.x*%i >= height[%i]) ,nb_rows, plane); GLSLF(2, if (gl_GlobalInvocationID.x*%i >= height[%i]) ,nb_rows, plane);
GLSLC(3, break; ); GLSLC(3, break; );
GLSLF(2, for (r = 0; r < %i; r++) { ,nb_rows); GLSLF(2, for (r = 0; r < %i; r++) { ,nb_rows);