diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-13 14:14:27 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-13 14:14:27 -0800 |
| commit | b3c75a2d6c04213e729c8e4cc45ec7f45aa1c38f (patch) | |
| tree | 2f05fcbee174254d6f609eeffa61d03bc1300995 | |
| parent | e4d10f3838b562eb04ee879aec76bb596740f174 (diff) | |
| parent | 94d4add1f70bf2c9b93332f6450541625b252203 (diff) | |
| download | libvpx-b3c75a2d6c04213e729c8e4cc45ec7f45aa1c38f.tar libvpx-b3c75a2d6c04213e729c8e4cc45ec7f45aa1c38f.tar.gz libvpx-b3c75a2d6c04213e729c8e4cc45ec7f45aa1c38f.tar.bz2 libvpx-b3c75a2d6c04213e729c8e4cc45ec7f45aa1c38f.zip | |
Merge "Replacing raster_block with block in the encoder."
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 7afed26d6..b709848dd 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -136,7 +136,6 @@ static void optimize_b(MACROBLOCK *mb, const int16_t *scan, *nb; const int mul = 1 + (tx_size == TX_32X32); uint8_t token_cache[1024]; - const int ib = txfrm_block_to_raster_block(plane_bsize, tx_size, block); const int16_t *dequant_ptr = pd->dequant; const uint8_t *const band_translate = (tx_size == TX_4X4 ? vp9_coefband_trans_4x4 : @@ -145,7 +144,7 @@ static void optimize_b(MACROBLOCK *mb, assert((!type && !plane) || (type && plane)); dqcoeff_ptr = BLOCK_OFFSET(pd->dqcoeff, block); qcoeff_ptr = BLOCK_OFFSET(pd->qcoeff, block); - get_scan(xd, tx_size, type, ib, &scan, &nb); + get_scan(xd, tx_size, type, block, &scan, &nb); assert(eob <= default_eob); /* Now set up a Viterbi trellis to evaluate alternative roundings. */ |