shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Code cleanup: remove unused members in RD_OPT"

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -1410,7 +1410,7 @@

 VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {

-  unsigned int i, j;

+  unsigned int i;

   VP9_COMP *const cpi = vpx_memalign(32, sizeof(VP9_COMP));

   VP9_COMMON *const cm = cpi != NULL ? &cpi->common : NULL;

@@ -1645,14 +1645,6 @@

                   vpx_calloc(cm->MBs, sizeof(diff)));

   cpi->source_var_thresh = 0;

   cpi->frames_till_next_var_check = 0;

-

-  // Default rd threshold factors for mode selection

-  for (i = 0; i < BLOCK_SIZES; ++i) {

-    for (j = 0; j < MAX_MODES; ++j) {

-      cpi->rd.thresh_freq_fact[i][j] = 32;

-      cpi->rd.mode_map[i][j] = j;

-    }

-  }

 #define BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX3F, SDX8F, SDX4DF)\

     cpi->fn_ptr[BT].sdf            = SDF; \

--- a/vp9/encoder/vp9_rd.h

+++ b/vp9/encoder/vp9_rd.h

@@ -101,9 +101,6 @@

   int thresh_mult_sub8x8[MAX_REFS];

   int threshes[MAX_SEGMENTS][BLOCK_SIZES][MAX_MODES];

-  int thresh_freq_fact[BLOCK_SIZES][MAX_MODES];

-

-  int mode_map[BLOCK_SIZES][MAX_MODES];

   int64_t prediction_type_threshes[MAX_REF_FRAMES][REFERENCE_MODES];

   // TODO(agrange): can this overflow?