github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

swscale/ops_dispatch: fix rounding direction of plane_size

Browse Source 
This is an upper bound, so it should be rounded up.

Signed-off-by: Niklas Haas <git@haasn.dev>
This commit is contained in:
Niklas Haas
2026-04-15 20:31:34 +02:00
committed by Niklas Haas
parent c6e47b293d
commit 95e4f7cac5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/ops_dispatch.c
View File

@@ -162,7 +162,7 @@ static int op_pass_setup(const SwsFrame *out, const SwsFrame *in,
int sub_y = chroma ? indesc->log2_chroma_h : 0; int sub_y = chroma ? indesc->log2_chroma_h : 0;
size_t plane_w = AV_CEIL_RSHIFT(aligned_w, sub_x); size_t plane_w = AV_CEIL_RSHIFT(aligned_w, sub_x);
size_t plane_pad = AV_CEIL_RSHIFT(comp->over_read, sub_x); size_t plane_pad = AV_CEIL_RSHIFT(comp->over_read, sub_x);
size_t plane_size = plane_w * p->pixel_bits_in >> 3; size_t plane_size = (plane_w * p->pixel_bits_in + 7) >> 3;
size_t total_size = plane_size + plane_pad; size_t total_size = plane_size + plane_pad;
size_t loop_size = num_blocks * exec->block_size_in; size_t loop_size = num_blocks * exec->block_size_in;
if (in->linesize[idx] >= 0) { if (in->linesize[idx] >= 0) {
@@ -184,7 +184,7 @@ static int op_pass_setup(const SwsFrame *out, const SwsFrame *in,
int sub_y = chroma ? outdesc->log2_chroma_h : 0; int sub_y = chroma ? outdesc->log2_chroma_h : 0;
size_t plane_w = AV_CEIL_RSHIFT(aligned_w, sub_x); size_t plane_w = AV_CEIL_RSHIFT(aligned_w, sub_x);
size_t plane_pad = AV_CEIL_RSHIFT(comp->over_write, sub_x); size_t plane_pad = AV_CEIL_RSHIFT(comp->over_write, sub_x);
size_t plane_size = plane_w * p->pixel_bits_out >> 3; size_t plane_size = (plane_w * p->pixel_bits_out + 7) >> 3;
size_t loop_size = num_blocks * exec->block_size_out; size_t loop_size = num_blocks * exec->block_size_out;
p->memcpy_out |= plane_size + plane_pad > FFABS(out->linesize[idx]); p->memcpy_out |= plane_size + plane_pad > FFABS(out->linesize[idx]);
exec->out[i] = out->data[idx]; exec->out[i] = out->data[idx];