RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vp9: ignore reference segmentation map if error_resilience flag is set. 

Fixes ffvp9_fails_where_libvpx.succeeds.webm.

Bug-Id: ffmpeg/3849.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Ronald S. Bultje 2014-08-12 18:11:05 -04:00 committed by Anton Khirnov
parent dc3fe45fca
commit a451324ddd
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vp9.c
View File

@ -64,7 +64,7 @@ static int vp9_frame_alloc(AVCodecContext *avctx, VP9Frame *f)
f->mv = (VP9MVRefPair*)f->mv_buf->data; f->mv = (VP9MVRefPair*)f->mv_buf->data;
if (s->segmentation.enabled && !s->segmentation.update_map && if (s->segmentation.enabled && !s->segmentation.update_map &&
!s->keyframe && !s->intraonly) !s->keyframe && !s->intraonly && !s->errorres)
memcpy(f->segmentation_map, s->frames[LAST_FRAME].segmentation_map, sz); memcpy(f->segmentation_map, s->frames[LAST_FRAME].segmentation_map, sz);
return 0; return 0;

24
libavcodec/vp9block.c
View File

@ -70,18 +70,22 @@ static void decode_mode(VP9Context *s, VP9Block *const b)
vp56_rac_get_prob_branchy(&s->c, vp56_rac_get_prob_branchy(&s->c,
s->prob.segpred[s->above_segpred_ctx[col] + s->prob.segpred[s->above_segpred_ctx[col] +
s->left_segpred_ctx[row7]]))) { s->left_segpred_ctx[row7]]))) {
uint8_t *refsegmap = s->frames[LAST_FRAME].segmentation_map; if (!s->errorres) {
int pred = MAX_SEGMENT - 1; uint8_t *refsegmap = s->frames[LAST_FRAME].segmentation_map;
int x; int pred = MAX_SEGMENT - 1;
int x;
if (!s->last_uses_2pass) if (!s->last_uses_2pass)
ff_thread_await_progress(&s->frames[LAST_FRAME].tf, row >> 3, 0); ff_thread_await_progress(&s->frames[LAST_FRAME].tf, row >> 3, 0);
for (y = 0; y < h4; y++) for (y = 0; y < h4; y++)
for (x = 0; x < w4; x++) for (x = 0; x < w4; x++)
pred = FFMIN(pred, pred = FFMIN(pred,
refsegmap[(y + row) * 8 * s->sb_cols + x + col]); refsegmap[(y + row) * 8 * s->sb_cols + x + col]);
b->seg_id = pred; b->seg_id = pred;
} else {
b->seg_id = 0;
}
memset(&s->above_segpred_ctx[col], 1, w4); memset(&s->above_segpred_ctx[col], 1, w4);
memset(&s->left_segpred_ctx[row7], 1, h4); memset(&s->left_segpred_ctx[row7], 1, h4);