commit d4c704f39084a102c897c3b69f463920035ccbec
author Yaowu Xu <yaowu@google.com> Thu Jan 21 22:20:55 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 22:20:55 2016 +0000
tree 55180b5414d9c1720b1490a09c0ffa05e202753b
parent b0dcc582208a0d70817086f6d078c3cbdeca562e
parent 50cbe24cc163e1fe6fedb16f3da2809e2b0f4749

Merge "remove more vp8 and vp9 only code"

vp10/encoder/encoder.c

diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index ef2fb68..91c7e43 100644
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -4067,7 +4067,6 @@
       if (cpi->b_calculate_psnr) {
         YV12_BUFFER_CONFIG *orig = cpi->Source;
         YV12_BUFFER_CONFIG *recon = cpi->common.frame_to_show;
-        YV12_BUFFER_CONFIG *pp = &cm->post_proc_buffer;
         PSNR_STATS psnr;
 #if CONFIG_VPX_HIGHBITDEPTH
         calc_highbd_psnr(orig, recon, &psnr, cpi->td.mb.e_mbd.bd,
@@ -4083,23 +4082,10 @@
         samples = psnr.samples[0];
 
         {
-          PSNR_STATS psnr2;
           double frame_ssim2 = 0, weight = 0;
           vpx_clear_system_state();
 
 #if CONFIG_VPX_HIGHBITDEPTH
-          calc_highbd_psnr(orig, pp, &psnr2, cpi->td.mb.e_mbd.bd,
-                           cpi->oxcf.input_bit_depth);
-#else
-          calc_psnr(orig, pp, &psnr2);
-#endif  // CONFIG_VPX_HIGHBITDEPTH
-
-          cpi->totalp_sq_error += psnr2.sse[0];
-          cpi->totalp_samples += psnr2.samples[0];
-          adjust_image_stat(psnr2.psnr[1], psnr2.psnr[2], psnr2.psnr[3],
-                            psnr2.psnr[0], &cpi->psnrp);
-
-#if CONFIG_VPX_HIGHBITDEPTH
           if (cm->use_highbitdepth) {
             frame_ssim2 = vpx_highbd_calc_ssim(orig, recon, &weight,
                                                (int)cm->bit_depth);
@@ -4114,17 +4100,6 @@
           cpi->summed_quality += frame_ssim2 * weight;
           cpi->summed_weights += weight;
 
-#if CONFIG_VPX_HIGHBITDEPTH
-          if (cm->use_highbitdepth) {
-            frame_ssim2 = vpx_highbd_calc_ssim(
-                orig, &cm->post_proc_buffer, &weight, (int)cm->bit_depth);
-          } else {
-            frame_ssim2 = vpx_calc_ssim(orig, &cm->post_proc_buffer, &weight);
-          }
-#else
-          frame_ssim2 = vpx_calc_ssim(orig, &cm->post_proc_buffer, &weight);
-#endif  // CONFIG_VPX_HIGHBITDEPTH
-
           cpi->summedp_quality += frame_ssim2 * weight;
           cpi->summedp_weights += weight;
 #if 0

vp10/encoder/mips/msa/fdct_msa.h

diff --git a/vp10/encoder/mips/msa/fdct_msa.h b/vp10/encoder/mips/msa/fdct_msa.h
index 5767280..bf56251 100644
--- a/vp10/encoder/mips/msa/fdct_msa.h
+++ b/vp10/encoder/mips/msa/fdct_msa.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_
-#define VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_
+#ifndef VP10_ENCODER_MIPS_MSA_VP10_FDCT_MSA_H_
+#define VP10_ENCODER_MIPS_MSA_VP10_FDCT_MSA_H_
 
 #include "vpx_dsp/mips/fwd_txfm_msa.h"
 #include "vpx_dsp/mips/txfm_macros_msa.h"
@@ -114,4 +114,4 @@
   PCKEV_H4_SH(in0_r_m, in0_r_m, in1_r_m, in1_r_m, s2_m, s2_m,     \
               s3_m, s3_m, out0, out1, out2, out3);                \
 }
-#endif  /* VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_ */
+#endif   // VP10_ENCODER_MIPS_MSA_VP10_FDCT_MSA_H_