diff options
| author | Jingning Han <jingning@google.com> | 2014-08-11 08:53:34 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-11 08:53:34 -0700 |
| commit | 5b63c2797a50a6a007a9b20377b071cd0aa6d702 (patch) | |
| tree | f9566758be1f29930ca7d5e5fcce22e7b2d8a9d3 /vp9/encoder/vp9_encodemb.c | |
| parent | 9da4cd94f561903272d23d500279ff39497e16fc (diff) | |
| parent | 8684c232600997df2c8e41a2708cafee97086a99 (diff) | |
| download | libvpx-5b63c2797a50a6a007a9b20377b071cd0aa6d702.tar.gz | |
Merge "Integrate fast txfm and quant path into skip_recode system"
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 6934f1188..8a737e18e 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -475,22 +475,22 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize, 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)) { |