diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-29 12:18:53 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-10-29 12:18:53 -0700 |
| commit | e6dcf2aeb6138b162412e42d8fc9db6deb5b05db (patch) | |
| tree | e944819ebea621e17d898492dc64cc2648188231 /vp9/encoder | |
| parent | a8e31d624aa50c15d8bf8e403ac8256b780eceed (diff) | |
| download | libvpx-e6dcf2aeb6138b162412e42d8fc9db6deb5b05db.tar libvpx-e6dcf2aeb6138b162412e42d8fc9db6deb5b05db.tar.gz libvpx-e6dcf2aeb6138b162412e42d8fc9db6deb5b05db.tar.bz2 libvpx-e6dcf2aeb6138b162412e42d8fc9db6deb5b05db.zip | |
Fixing wrongly initialized tx_type variable.
Wrong value was used in get_tx_type_4x4() function, so making
initialization before that call.
Change-Id: Ief30bb1e0c03b2f23d993bbf9ae18d7150ba9a83
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 6eb69f8bb..c1342088a 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1032,7 +1032,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, ENTROPY_CONTEXT ta[2], tempa[2]; ENTROPY_CONTEXT tl[2], templ[2]; - TX_TYPE tx_type = DCT_DCT; + const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; int idx, idy; @@ -1072,8 +1072,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, uint8_t *src = src_init + idx * 4 + idy * 4 * src_stride; uint8_t *dst = dst_init + idx * 4 + idy * 4 * dst_stride; const int block = ib + idy * 2 + idx; - - get_scan_nb_4x4(tx_type, &scan, &nb); + TX_TYPE tx_type; xd->mi_8x8[0]->bmi[block].as_mode = mode; src_diff = raster_block_offset_int16(BLOCK_8X8, block, p->src_diff); coeff = BLOCK_OFFSET(x->plane[0].coeff, block); @@ -1087,10 +1086,13 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, dst, dst_stride); tx_type = get_tx_type_4x4(PLANE_TYPE_Y_WITH_DC, xd, block); + get_scan_nb_4x4(tx_type, &scan, &nb); + if (tx_type != DCT_DCT) vp9_short_fht4x4(src_diff, coeff, 8, tx_type); else x->fwd_txm4x4(src_diff, coeff, 8); + vp9_regular_quantize_b_4x4(x, 16, block, scan, get_iscan_4x4(tx_type)); ratey += cost_coeffs(x, 0, block, |