libvpx: Pull from upstream

source/libvpx/examples/vp8_multi_resolution_encoder.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 /*
  * This is an example demonstrating multi-resolution encoding in VP8.
  * High-resolution input video is down-sampled to lower-resolutions. The
  * encoder then encodes the video and outputs multiple bitstreams with
  * different resolutions.
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "math.h"
+#include <math.h>
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "vpx/vpx_encoder.h"
 #include "vpx/vp8cx.h"
 #include "vpx_ports/mem_ops.h"
+#include "./tools_common.h"
 #define interface (vpx_codec_vp8_cx())
 #define fourcc    0x30385056
 
 #define IVF_FILE_HDR_SZ  (32)
 #define IVF_FRAME_HDR_SZ (12)
 
 /*
  * The input video frame is downsampled several times to generate a multi-level
  * hierarchical structure. NUM_ENCODERS is defined as the number of encoding
  * levels required. For example, if the size of input video is 1280x720,
  * NUM_ENCODERS is 3, and down-sampling factor is 2, the encoder outputs 3
  * bitstreams with resolution of 1280x720(level 0), 640x360(level 1), and
  * 320x180(level 2) respectively.
  */
 #define NUM_ENCODERS 3
 
 /* This example uses the scaler function in libyuv. */
 #include "third_party/libyuv/include/libyuv/basic_types.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 #include "third_party/libyuv/include/libyuv/cpu_id.h"
 
-static double vp8_mse2psnr(double Samples, double Peak, double Mse)
-{
-    double psnr;
-
-    if ((double)Mse > 0.0)
-        psnr = 10.0 * log10(Peak * Peak * Samples / Mse);
-    else
-        psnr = 60;      // Limit to prevent / 0
-
-    if (psnr > 60)
-        psnr = 60;
-
-    return psnr;
-}
-
 static void die(const char *fmt, ...) {
     va_list ap;
 
     va_start(ap, fmt);
     vprintf(fmt, ap);
     if(fmt[strlen(fmt)-1] != '\n')
         printf("\n");
     exit(EXIT_FAILURE);
 }
 
@@ skipping 375 matching lines @@
 
     fclose(infile);
 
     printf("Processed %ld frames.\n",(long int)frame_cnt-1);
     for (i=0; i< NUM_ENCODERS; i++)
     {
         /* Calculate PSNR and print it out */
         if ( (show_psnr) && (psnr_count[i]>0) )
         {
             int j;
-            double ovpsnr = vp8_mse2psnr(psnr_samples_total[i], 255.0,
-                                         psnr_sse_total[i]);
+            double ovpsnr = sse_to_psnr(psnr_samples_total[i], 255.0,
+                                        psnr_sse_total[i]);
 
             fprintf(stderr, "\n ENC%d PSNR (Overall/Avg/Y/U/V)", i);
 
             fprintf(stderr, " %.3lf", ovpsnr);
             for (j = 0; j < 4; j++)
             {
                 fprintf(stderr, " %.3lf", psnr_totals[i][j]/psnr_count[i]);
             }
         }
 
         if(vpx_codec_destroy(&codec[i]))
             die_codec(&codec[i], "Failed to destroy codec");
 
         vpx_img_free(&raw[i]);
 
         if(!outfile[i])
             continue;
 
         /* Try to rewrite the file header with the actual frame count */
         if(!fseek(outfile[i], 0, SEEK_SET))
             write_ivf_file_header(outfile[i], &cfg[i], frame_cnt-1);
         fclose(outfile[i]);
     }
     printf("\n");
 
     return EXIT_SUCCESS;
 }