shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Making vp9_activity_masking() static."

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -319,7 +319,7 @@

 }

 // Macroblock activity masking

-void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x) {

+static void activity_masking(VP9_COMP *cpi, MACROBLOCK *x) {

 #if USE_ACT_INDEX

   x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2);

   x->errorperbit = x->rdmult * 100 / (110 * x->rddiv);

@@ -673,7 +673,7 @@

   }

   if (cpi->oxcf.tuning == VP8_TUNE_SSIM)

-    vp9_activity_masking(cpi, x);

+    activity_masking(cpi, x);

   if (cpi->oxcf.aq_mode == VARIANCE_AQ) {

     vp9_clear_system_state();  // __asm emms;

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

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

@@ -692,8 +692,6 @@

 void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size);

-void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x);

-

 void vp9_set_speed_features(VP9_COMP *cpi);

 int vp9_calc_ss_err(const YV12_BUFFER_CONFIG *source,