Remove INTRARDOPT #define and intra_rd_opt option. This is just eliminating some cruft. Although a number of variables are declared only when INTRARDOPT is defined, they are used elsewhere without that protection, and no longer just for intra RDO. The intra_rd_opt flag was hard-coded to 1 and never checked. Change-Id: I83a81554ecee8053e7b4ccd8aa04e18fa60f8e4f
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6b7333f..34af6ea 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c
@@ -2188,11 +2188,6 @@ #endif -#ifdef INTRARDOPT - cpi->intra_rd_opt = 1; - -#endif - cpi->frames_since_key = 8; // Give a sensible default for the first frame. cpi->key_frame_frequency = cpi->oxcf.key_freq;
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 0ea6a3b..cb768c0 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h
@@ -29,7 +29,6 @@ #include "vpx/internal/vpx_codec_internal.h" #include "mcomp.h" -#define INTRARDOPT //#define SPEEDSTATS 1 #define MIN_GF_INTERVAL 4 #define DEFAULT_GF_INTERVAL 7 @@ -310,15 +309,12 @@ int subseqblockweight; int errthresh; -#ifdef INTRARDOPT int RDMULT; int RDDIV ; TOKENEXTRA *rdtok; - int intra_rd_opt; vp8_writer rdbc; int intra_mode_costs[10]; -#endif CODING_CONTEXT coding_context;