ref: fc018e0d927430e2cea1d8822a8e4cf6a3b2aca7
parent: 6b1b28a83c3aa4eb25173a95708b55b722190e99
parent: dd08db9315d77b183ba563c8a83cc4e0aee439d6
author: John Koleszar <jkoleszar@google.com>
date: Tue Oct 12 01:33:22 EDT 2010
Merge "Remove INTRARDOPT #define and intra_rd_opt option."
--- 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;
--- 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;