diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-02-04 12:51:16 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-04 12:51:16 -0800 |
| commit | 3bc0c6576f161a1cb0d5924bd9cac850306982a0 (patch) | |
| tree | ec5a079ae8480aa2d4089fc97a1a68232f2991fd | |
| parent | 1221641914b9c774cb4dc87c4c8578fb444611ef (diff) | |
| parent | 02537ebbe4a591a8dd9b1049cbe7d7ff3742de72 (diff) | |
| download | libvpx-3bc0c6576f161a1cb0d5924bd9cac850306982a0.tar libvpx-3bc0c6576f161a1cb0d5924bd9cac850306982a0.tar.gz libvpx-3bc0c6576f161a1cb0d5924bd9cac850306982a0.tar.bz2 libvpx-3bc0c6576f161a1cb0d5924bd9cac850306982a0.zip | |
Merge "Move calls to avoid unnecessary operations"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b9d0809fd..5ddb6ca0a 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3794,9 +3794,6 @@ static INTERP_FILTER get_interp_filter( void vp9_encode_frame(VP9_COMP *cpi) { VP9_COMMON *const cm = &cpi->common; - RD_OPT *const rd_opt = &cpi->rd; - FRAME_COUNTS *counts = cpi->td.counts; - RD_COUNTS *const rdc = &cpi->td.rd_counts; // In the longer term the encoder should be generalized to match the // decoder such that we allow compound where one of the 3 buffers has a @@ -3818,11 +3815,11 @@ void vp9_encode_frame(VP9_COMP *cpi) { } } - vpx_memset(cpi->td.counts->tx.tx_totals, 0, - sizeof(cpi->td.counts->tx.tx_totals)); - if (cpi->sf.frame_parameter_update) { int i; + RD_OPT *const rd_opt = &cpi->rd; + FRAME_COUNTS *counts = cpi->td.counts; + RD_COUNTS *const rdc = &cpi->td.rd_counts; // This code does a single RD pass over the whole frame assuming // either compound, single or hybrid prediction as per whatever has |