diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-04-25 14:44:44 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-04-25 14:44:54 -0700 |
| commit | a672351af986725df4cbeae546c15fc85fb2e38c (patch) | |
| tree | fe760cf96385508432a9fc9045cbeb04f6a81283 /vp9/encoder/vp9_rdopt.c | |
| parent | e40a769036a97403718244caa81b8680a4c9c7eb (diff) | |
| download | libvpx-a672351af986725df4cbeae546c15fc85fb2e38c.tar libvpx-a672351af986725df4cbeae546c15fc85fb2e38c.tar.gz libvpx-a672351af986725df4cbeae546c15fc85fb2e38c.tar.bz2 libvpx-a672351af986725df4cbeae546c15fc85fb2e38c.zip | |
quantize: make 4x4, 8x8 common with larger transforms
There were 4 variants of the quantize loop in vp9_quantize.c, now
there is 1.
Change-Id: Ic853393411214b32d46a6ba53769413bd14e1cac
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5c4402a5b..f54a51aaa 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -909,10 +909,10 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, tx_type = get_tx_type_4x4(xd, ib); if (tx_type != DCT_DCT) { vp9_short_fht4x4(src_diff, coeff, 16, tx_type); - vp9_ht_quantize_b_4x4(x, ib, tx_type); + x->quantize_b_4x4(x, ib, tx_type, 16); } else { x->fwd_txm4x4(src_diff, coeff, 32); - x->quantize_b_4x4(x, ib, 16); + x->quantize_b_4x4(x, ib, tx_type, 16); } tempa = ta; @@ -1167,7 +1167,7 @@ static int64_t rd_pick_intra8x8block(VP9_COMP *cpi, MACROBLOCK *x, int ib, tx_type = get_tx_type_4x4(xd, ib + iblock[i]); if (tx_type != DCT_DCT) { vp9_short_fht4x4(src_diff, coeff, 16, tx_type); - vp9_ht_quantize_b_4x4(x, ib + iblock[i], tx_type); + x->quantize_b_4x4(x, ib + iblock[i], tx_type, 16); } else if (!(i & 1) && get_tx_type_4x4(xd, ib + iblock[i] + 1) == DCT_DCT) { x->fwd_txm8x4(src_diff, coeff, 32); @@ -1175,7 +1175,7 @@ static int64_t rd_pick_intra8x8block(VP9_COMP *cpi, MACROBLOCK *x, int ib, do_two = 1; } else { x->fwd_txm4x4(src_diff, coeff, 32); - x->quantize_b_4x4(x, ib + iblock[i], 16); + x->quantize_b_4x4(x, ib + iblock[i], tx_type, 16); } distortion += vp9_block_error_c(coeff, BLOCK_OFFSET(xd->plane[0].dqcoeff, ib + iblock[i], 16), @@ -1756,7 +1756,7 @@ static int64_t encode_inter_mb_segment(VP9_COMMON *const cm, src, src_stride, *(bd->base_dst) + bd->dst, bd->dst_stride); x->fwd_txm4x4(src_diff, coeff, 32); - x->quantize_b_4x4(x, i, 16); + x->quantize_b_4x4(x, i, DCT_DCT, 16); thisdistortion = vp9_block_error(coeff, BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16), 16); *distortion += thisdistortion; |