diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-04-26 10:12:37 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-04-26 10:12:37 -0700 |
| commit | 0da77a840b79c8037272687ba5fa8c3e01885572 (patch) | |
| tree | dd60c45d6707b0fe2221b85d33ba67f1acc1b137 /vp8/decoder | |
| parent | d5c46bdfc0d7bcc25e3ff549a0dc03d759050c19 (diff) | |
| parent | 7a2b9c50a33049eafb2f532de0e9eaef2fca3e3e (diff) | |
| download | libvpx-0da77a840b79c8037272687ba5fa8c3e01885572.tar libvpx-0da77a840b79c8037272687ba5fa8c3e01885572.tar.gz libvpx-0da77a840b79c8037272687ba5fa8c3e01885572.tar.bz2 libvpx-0da77a840b79c8037272687ba5fa8c3e01885572.zip | |
Merge "Test vector mismatch fix"
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodframe.c | 5 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 95985082f..aaee91170 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -198,6 +198,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) xd->mode_info_context->mbmi.mode == SPLITMV); if (!eobtotal) { + /* Special case: Force the loopfilter to skip when eobtotal and + * mb_skip_coeff are zero. + * */ + xd->mode_info_context->mbmi.mb_skip_coeff = 1; + skip_recon_mb(pbi, xd); return; } diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 06109e125..16afd591d 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -112,6 +112,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m xd->mode_info_context->mbmi.mode == SPLITMV); if (!eobtotal) { + /* Special case: Force the loopfilter to skip when eobtotal and + * mb_skip_coeff are zero. + * */ + xd->mode_info_context->mbmi.mb_skip_coeff = 1; + /*mt_skip_recon_mb(pbi, xd, mb_row, mb_col);*/ if (xd->frame_type == KEY_FRAME || xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) { |