summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_quantize.c
diff options
context:
space:
mode:
authorAlex Converse <aconverse@google.com>2014-07-17 11:29:59 -0700
committerAlex Converse <aconverse@google.com>2014-07-21 15:55:50 -0700
commit5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee (patch)
tree2dfea1d154dfdbf4eb21054d37cff459b0afa5e1 /vp9/encoder/vp9_quantize.c
parent765485cab21021ac4ba9d1cbddce2432f421de99 (diff)
downloadlibvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar
libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar.gz
libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar.bz2
libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.zip
Remove unfinished VP9 alpha channel.
Change-Id: Ic5d3a3a0dac10b49495771886a31e793bb78b5ca
Diffstat (limited to 'vp9/encoder/vp9_quantize.c')
-rw-r--r--vp9/encoder/vp9_quantize.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c
index 370e1ce77..e153b2077 100644
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -315,16 +315,6 @@ void vp9_init_quantizer(VP9_COMP *cpi) {
quants->uv_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant, 7);
quants->uv_round[q][i] = (qrounding_factor * quant) >> 7;
cm->uv_dequant[q][i] = quant;
-
-#if CONFIG_ALPHA
- // alpha
- quant = i == 0 ? vp9_dc_quant(q, cm->a_dc_delta_q)
- : vp9_ac_quant(q, cm->a_ac_delta_q);
- invert_quant(&quants->a_quant[q][i], &quants->a_quant_shift[q][i], quant);
- quants->a_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant, 7);
- quants->a_round[q][i] = (qrounding_factor * quant) >> 7;
- cm->a_dequant[q][i] = quant;
-#endif
}
for (i = 2; i < 8; i++) {
@@ -343,14 +333,6 @@ void vp9_init_quantizer(VP9_COMP *cpi) {
quants->uv_zbin[q][i] = quants->uv_zbin[q][1];
quants->uv_round[q][i] = quants->uv_round[q][1];
cm->uv_dequant[q][i] = cm->uv_dequant[q][1];
-
-#if CONFIG_ALPHA
- quants->a_quant[q][i] = quants->a_quant[q][1];
- quants->a_quant_shift[q][i] = quants->a_quant_shift[q][1];
- quants->a_zbin[q][i] = quants->a_zbin[q][1];
- quants->a_round[q][i] = quants->a_round[q][1];
- cm->a_dequant[q][i] = cm->a_dequant[q][1];
-#endif
}
}
}
@@ -387,15 +369,6 @@ void vp9_init_plane_quantizers(VP9_COMP *cpi, MACROBLOCK *x) {
xd->plane[i].dequant = cm->uv_dequant[qindex];
}
-#if CONFIG_ALPHA
- x->plane[3].quant = quants->a_quant[qindex];
- x->plane[3].quant_shift = quants->a_quant_shift[qindex];
- x->plane[3].zbin = quants->a_zbin[qindex];
- x->plane[3].round = quants->a_round[qindex];
- x->plane[3].zbin_extra = (int16_t)((cm->a_dequant[qindex][1] * zbin) >> 7);
- xd->plane[3].dequant = cm->a_dequant[qindex];
-#endif
-
x->skip_block = vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP);
x->q_index = qindex;