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
This commit is contained in:
Родитель
4d2b178a22
Коммит
dd08db9315
|
@ -2188,11 +2188,6 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
|
|||
#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;
|
||||
|
||||
|
|
|
@ -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 @@ typedef struct
|
|||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче