diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-05-19 16:00:28 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-05-19 17:22:14 -0700 |
| commit | d5b8f7860f17ad5c37bd5f6e9e73d548c80817ab (patch) | |
| tree | 17215a23055dcc77d9e056d6bcbf8b09e88e595c /vp8/encoder | |
| parent | 00a1e2f8e4878f59c95f017f4cdbc80ada07a487 (diff) | |
| download | libvpx-d5b8f7860f17ad5c37bd5f6e9e73d548c80817ab.tar libvpx-d5b8f7860f17ad5c37bd5f6e9e73d548c80817ab.tar.gz libvpx-d5b8f7860f17ad5c37bd5f6e9e73d548c80817ab.tar.bz2 libvpx-d5b8f7860f17ad5c37bd5f6e9e73d548c80817ab.zip | |
disable trellis optimization for first pass
also remove 2 #defines and 1 function declaration that are not in use.
Change-Id: I8f743d0e3dd9ebf1de24a8b0c30ff09f29b00c53
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/encodeintra.c | 3 | ||||
| -rw-r--r-- | vp8/encoder/encodeintra.h | 1 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index 5d52c9fc4..6f7e66371 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -21,9 +21,6 @@ #include "vp8/common/g_common.h" #include "encodeintra.h" -#define intra4x4ibias_rate 128 -#define intra4x4pbias_rate 256 - #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp8/encoder/encodeintra.h b/vp8/encoder/encodeintra.h index 40930bc42..8159097c6 100644 --- a/vp8/encoder/encodeintra.h +++ b/vp8/encoder/encodeintra.h @@ -17,6 +17,5 @@ void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x); void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x); void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb); void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode); -void vp8_encode_intra4x4block_rd(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode); #endif diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 2a7723581..ae85a68d5 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1232,7 +1232,7 @@ void vp8_set_speed_features(VP8_COMP *cpi) cpi->find_fractional_mv_step = vp8_skip_fractional_mv_step; } - if (cpi->sf.optimize_coefficients == 1) + if (cpi->sf.optimize_coefficients == 1 && cpi->pass!=1) cpi->mb.optimize = 1; else cpi->mb.optimize = 0; |