shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing unused SPEEDSTATS."

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -93,13 +93,8 @@

 FILE *keyfile;

 #endif

-#ifdef SPEEDSTATS

-unsigned int frames_at_speed[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-                                    0, 0, 0};

-#endif

+void vp9_init_quantizer(VP9_COMP *cpi);

-extern void vp9_init_quantizer(VP9_COMP *cpi);

-

 static const double in_frame_q_adj_ratio[MAX_SEGMENTS] =

   {1.0, 1.5, 2.0, 1.0, 1.0, 1.0, 1.0, 1.0};

@@ -953,10 +948,6 @@

   }

   cpi->mb.optimize = cpi->sf.optimize_coefficients == 1 && cpi->pass != 1;

-

-#ifdef SPEEDSTATS

-  frames_at_speed[cpi->speed]++;

-#endif

 }

 static void alloc_raw_frame_buffers(VP9_COMP *cpi) {

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -38,7 +38,6 @@

 // #define MODE_TEST_HIT_STATS

-// #define SPEEDSTATS 1

 #if CONFIG_MULTIPLE_ARF

 // Set MIN_GF_INTERVAL to 1 for the full decomposition.

 #define MIN_GF_INTERVAL             2