diff options
| author | Jingning Han <jingning@google.com> | 2013-04-10 13:43:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-10 13:43:51 -0700 |
| commit | 5b9dc7c68e9398a5fbf77a988fbffd04caf10c89 (patch) | |
| tree | 94fae6f72bcde4b8d0d431e6c3cde8556651ff21 /vp9/decoder/vp9_decodframe.c | |
| parent | 0cef7234e1227dbd008dd9dcc608a8579bc52e24 (diff) | |
| parent | e63099d199b492710cd2d74f02f56071ba8a6749 (diff) | |
| download | libvpx-5b9dc7c68e9398a5fbf77a988fbffd04caf10c89.tar libvpx-5b9dc7c68e9398a5fbf77a988fbffd04caf10c89.tar.gz libvpx-5b9dc7c68e9398a5fbf77a988fbffd04caf10c89.tar.bz2 libvpx-5b9dc7c68e9398a5fbf77a988fbffd04caf10c89.zip | |
Merge "Make SB Decoding units size-independent" into experimental
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index af8e7c04a..214c72b85 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -625,7 +625,7 @@ static void decode_sb64(VP9D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb_col, } // dequantization and idct - eobtotal = vp9_decode_sb64_tokens(pbi, xd, bc); + eobtotal = vp9_decode_tokens(pbi, xd, bc, BLOCK_SIZE_SB64X64); if (eobtotal == 0) { // skip loopfilter for (n = 0; n < 16; n++) { const int x_idx = n & 3, y_idx = n >> 2; @@ -704,7 +704,7 @@ static void decode_sb32(VP9D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb_col, } // dequantization and idct - eobtotal = vp9_decode_sb_tokens(pbi, xd, bc); + eobtotal = vp9_decode_tokens(pbi, xd, bc, BLOCK_SIZE_SB32X32); if (eobtotal == 0) { // skip loopfilter mi->mbmi.mb_skip_coeff = 1; if (mb_col + 1 < pc->mb_cols) @@ -766,7 +766,7 @@ static void decode_mb(VP9D_COMP *pbi, MACROBLOCKD *xd, #if CONFIG_NEWBINTRAMODES if (mode != B_PRED) #endif - eobtotal = vp9_decode_mb_tokens(pbi, xd, bc); + eobtotal = vp9_decode_tokens(pbi, xd, bc, BLOCK_SIZE_MB16X16); } //mode = xd->mode_info_context->mbmi.mode; |