shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "disable trellis optimization for first pass"

--- 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)

--- a/vp8/encoder/encodeintra.h

+++ b/vp8/encoder/encodeintra.h

@@ -17,6 +17,5 @@

 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

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -1232,7 +1232,7 @@

         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;