diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-27 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-27 00:05:07 -0400 |
| commit | 5944829d6d26d0d3c090badf5149d8a7a61659e7 (patch) | |
| tree | 82b0e5171babff4c88af5795c43a15fda03c1c0c | |
| parent | d7d9236e30d9eef55612667d3e1728ae19b9a67f (diff) | |
| parent | 0da77a840b79c8037272687ba5fa8c3e01885572 (diff) | |
| download | libvpx-5944829d6d26d0d3c090badf5149d8a7a61659e7.tar libvpx-5944829d6d26d0d3c090badf5149d8a7a61659e7.tar.gz libvpx-5944829d6d26d0d3c090badf5149d8a7a61659e7.tar.bz2 libvpx-5944829d6d26d0d3c090badf5149d8a7a61659e7.zip | |
Merge remote branch 'internal/upstream' into HEAD
| -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 3df0ba73a..8cf4e4711 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) { |