shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes Ibfa447fe,I771809ba

* changes:
  Fix generic-gnu target build
  Fix rounding in ARNR calculation

--- a/vp8/common/postproc.c

+++ b/vp8/common/postproc.c

@@ -310,6 +310,7 @@

     }

 }

+#if CONFIG_POSTPROC

 static void vp8_de_mblock(YV12_BUFFER_CONFIG         *post,

                           int                         q)

 {

@@ -382,6 +383,7 @@

         vp8_yv12_copy_frame(source, post);

     }

 }

+#endif

 #if !(CONFIG_TEMPORAL_DENOISING)

 void vp8_de_noise(VP8_COMMON                 *cm,

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -5227,7 +5227,7 @@

                 int y_samples = orig->y_height * orig->y_width ;

                 int uv_samples = orig->uv_height * orig->uv_width ;

                 int t_samples = y_samples + 2 * uv_samples;

-                double sq_error, sq_error2;

+                double sq_error;

                 ye = calc_plane_error(orig->y_buffer, orig->y_stride,

                   recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height);

@@ -5250,6 +5250,7 @@

 #if CONFIG_POSTPROC

                 {

                     YV12_BUFFER_CONFIG      *pp = &cm->post_proc_buffer;

+                    double sq_error2;

                     double frame_psnr2, frame_ssim2 = 0;

                     double weight = 0;

--- a/vp8/encoder/temporal_filter.c

+++ b/vp8/encoder/temporal_filter.c

@@ -98,6 +98,7 @@

     unsigned int i, j, k;

     int modifier;

     int byte = 0;

+    const int rounding = strength > 0 ? 1 << (strength - 1) : 0;

     for (i = 0,k = 0; i < block_size; i++)

     {

@@ -114,7 +115,7 @@

              */

             modifier  *= modifier;

             modifier  *= 3;

-            modifier  += 1 << (strength - 1);

+            modifier  += rounding;

             modifier >>= strength;

             if (modifier > 16)

--- a/vp9/encoder/vp9_temporal_filter.c

+++ b/vp9/encoder/vp9_temporal_filter.c

@@ -99,6 +99,7 @@

   unsigned int i, j, k;

   int modifier;

   int byte = 0;

+  const int rounding = strength > 0 ? 1 << (strength - 1) : 0;

   for (i = 0, k = 0; i < block_size; i++) {

     for (j = 0; j < block_size; j++, k++) {

@@ -111,7 +112,7 @@

       // modifier =  (int)roundf(coeff > 16 ? 0 : 16-coeff);

       modifier  *= modifier;

       modifier  *= 3;

-      modifier  += 1 << (strength - 1);

+      modifier  += rounding;

       modifier >>= strength;

       if (modifier > 16)