mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-20 07:48:15 +02:00
avcodec/vvc/refs: fix negative pps_scaling_win offsets
The spec seems to allow these to be negative Fixes: left shift of negative value -15 Fixes: 392687035/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-6559804532785152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Frank Plowman <post@frankplowman.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
a750bcb237
commit
33679f5325
@ -147,10 +147,10 @@ static VVCFrame *alloc_frame(VVCContext *s, VVCFrameContext *fc)
|
||||
for (int j = 0; j < frame->ctb_count; j++)
|
||||
frame->rpl_tab[j] = frame->rpl;
|
||||
|
||||
win->left_offset = pps->r->pps_scaling_win_left_offset << sps->hshift[CHROMA];
|
||||
win->right_offset = pps->r->pps_scaling_win_right_offset << sps->hshift[CHROMA];
|
||||
win->top_offset = pps->r->pps_scaling_win_top_offset << sps->vshift[CHROMA];
|
||||
win->bottom_offset = pps->r->pps_scaling_win_bottom_offset << sps->vshift[CHROMA];
|
||||
win->left_offset = pps->r->pps_scaling_win_left_offset * (1 << sps->hshift[CHROMA]);
|
||||
win->right_offset = pps->r->pps_scaling_win_right_offset * (1 << sps->hshift[CHROMA]);
|
||||
win->top_offset = pps->r->pps_scaling_win_top_offset * (1 << sps->vshift[CHROMA]);
|
||||
win->bottom_offset = pps->r->pps_scaling_win_bottom_offset * (1 << sps->vshift[CHROMA]);
|
||||
frame->ref_width = pps->r->pps_pic_width_in_luma_samples - win->left_offset - win->right_offset;
|
||||
frame->ref_height = pps->r->pps_pic_height_in_luma_samples - win->bottom_offset - win->top_offset;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user