ref: 5b63c2797a50a6a007a9b20377b071cd0aa6d702
parent: 9da4cd94f561903272d23d500279ff39497e16fc
parent: 8684c232600997df2c8e41a2708cafee97086a99
author: Jingning Han <[email protected]>
date: Mon Aug 11 04:53:34 EDT 2014
Merge "Integrate fast txfm and quant path into skip_recode system"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3573,6 +3573,9 @@
cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ &&
cpi->sf.allow_skip_recode;
+ if (!x->skip_recode && !cpi->sf.use_nonrd_pick_mode)
+ vpx_memset(x->skip_txfm, 0, sizeof(x->skip_txfm));
+
x->skip_optimize = ctx->is_coded;
ctx->is_coded = 1;
x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -475,22 +475,22 @@
return;
}
- if (x->skip_txfm[plane] == 0) {- // full forward transform and quantization
- if (!x->skip_recode) {+ if (!x->skip_recode) {+ if (x->skip_txfm[plane] == 0) {+ // full forward transform and quantization
if (x->quant_fp)
vp9_xform_quant_fp(x, plane, block, plane_bsize, tx_size);
else
vp9_xform_quant(x, plane, block, plane_bsize, tx_size);
+ } else if (x->skip_txfm[plane] == 2) {+ // fast path forward transform and quantization
+ vp9_xform_quant_dc(x, plane, block, plane_bsize, tx_size);
+ } else {+ // skip forward transform
+ p->eobs[block] = 0;
+ *a = *l = 0;
+ return;
}
- } else if (x->skip_txfm[plane] == 2) {- // fast path forward transform and quantization
- vp9_xform_quant_dc(x, plane, block, plane_bsize, tx_size);
- } else {- // skip forward transform
- p->eobs[block] = 0;
- *a = *l = 0;
- return;
}
if (x->optimize && (!x->skip_recode || !x->skip_optimize)) {