Unite vpx_psnr_pkt and PSNR_STATS

Change-Id: Ia2be91a49dfa95906fa2ce232ff9d3a69deda4ad

diff --git a/vpx_dsp/psnr.h b/vpx_dsp/psnr.h
index a556355..9ebb64d 100644 (file)
--- a/vpx_dsp/psnr.h
+++ b/vpx_dsp/psnr.h
@@ -12,6 +12,7 @@
 #define VPX_VPX_DSP_PSNR_H_
 
 #include "vpx_scale/yv12config.h"
+#include "vpx/vpx_encoder.h"
 
 #define MAX_PSNR 100.0
 
@@ -19,11 +20,7 @@
 extern "C" {
 #endif
 
-typedef struct {
-  double psnr[4];       // total/y/u/v
-  uint64_t sse[4];      // total/y/u/v
-  uint32_t samples[4];  // total/y/u/v
-} PSNR_STATS;
+typedef struct vpx_psnr_pkt PSNR_STATS;
 
 // TODO(dkovalev) change vpx_sse_to_psnr signature: double -> int64_t