RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-25 16:21:13 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/vp8: Fix wrong vpx_rac_is_end() check

Browse Source 
The check of vpx_rac_is_end check(s) are added originally from
1afd246960. It causes a regression
of some vp8 stream. b6b9ac5698 fixes
the regression by a sort of band-aid way. This fixes the wrongness
of the original commit. vpx_rac_is_end() should be called against
the bool decoder for the vp8 headr context, not one for each
coefficient. Reference is vp8_dixie_tokens_process_row() in token.c
in spec 20.16.

Fixes: Ticket 8069
Fixes: regression of 1afd246960.
Fixes: b6b9ac5698

Co-authored-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Hirokazu Honda 2022-11-16 17:44:12 +09:00 committed by Ronald S. Bultje
parent 66afa361e8
commit 7f3e38bda8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/vp8.c
View File

@ -2404,7 +2404,8 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
int num_jobs = s->num_jobs; int num_jobs = s->num_jobs;
const VP8Frame *prev_frame = s->prev_frame; const VP8Frame *prev_frame = s->prev_frame;
VP8Frame *curframe = s->curframe; VP8Frame *curframe = s->curframe;
VPXRangeCoder *c = &s->coeff_partition[mb_y & (s->num_coeff_partitions - 1)]; VPXRangeCoder *coeff_c = &s->coeff_partition[mb_y & (s->num_coeff_partitions - 1)];
VP8Macroblock *mb; VP8Macroblock *mb;
uint8_t *dst[3] = { uint8_t *dst[3] = {
curframe->tf.f->data[0] + 16 * mb_y * s->linesize, curframe->tf.f->data[0] + 16 * mb_y * s->linesize,
@ -2412,7 +2413,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
curframe->tf.f->data[2] + 8 * mb_y * s->uvlinesize curframe->tf.f->data[2] + 8 * mb_y * s->uvlinesize
}; };
if (vpx_rac_is_end(c)) if (vpx_rac_is_end(&s->c))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (mb_y == 0) if (mb_y == 0)
@ -2443,7 +2444,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
td->mv_bounds.mv_max.x = ((s->mb_width - 1) << 6) + MARGIN; td->mv_bounds.mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
if (vpx_rac_is_end(c)) if (vpx_rac_is_end(&s->c))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
// Wait for previous thread to read mb_x+2, and reach mb_y-1. // Wait for previous thread to read mb_x+2, and reach mb_y-1.
if (prev_td != td) { if (prev_td != td) {
@ -2470,8 +2471,11 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP8_FRAME_PREVIOUS); prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP8_FRAME_PREVIOUS);
if (!mb->skip) if (!mb->skip) {
decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz, is_vp7); if (vpx_rac_is_end(coeff_c))
return AVERROR_INVALIDDATA;
decode_mb_coeffs(s, td, coeff_c, mb, s->top_nnz[mb_x], td->left_nnz, is_vp7);
}
if (mb->mode <= MODE_I4x4) if (mb->mode <= MODE_I4x4)
intra_predict(s, td, dst, mb, mb_x, mb_y, is_vp7); intra_predict(s, td, dst, mb, mb_x, mb_y, is_vp7);