Index: source/libvpx/vp9/encoder/vp9_ssim.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_ssim.c (revision 263011) |
+++ source/libvpx/vp9/encoder/vp9_ssim.c (working copy) |
@@ -8,8 +8,9 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
+#include "./vp9_rtcd.h" |
-#include "vp9/encoder/vp9_onyx_int.h" |
+#include "vp9/encoder/vp9_ssim.h" |
void vp9_ssim_parms_16x16_c(uint8_t *s, int sp, uint8_t *r, |
int rp, unsigned long *sum_s, unsigned long *sum_r, |
@@ -65,12 +66,6 @@ |
return ssim_n * 1.0 / ssim_d; |
} |
-static double ssim_16x16(uint8_t *s, int sp, uint8_t *r, int rp) { |
- unsigned long sum_s = 0, sum_r = 0, sum_sq_s = 0, sum_sq_r = 0, sum_sxr = 0; |
- vp9_ssim_parms_16x16(s, sp, r, rp, &sum_s, &sum_r, &sum_sq_s, &sum_sq_r, |
- &sum_sxr); |
- return similarity(sum_s, sum_r, sum_sq_s, sum_sq_r, sum_sxr, 256); |
-} |
static double ssim_8x8(uint8_t *s, int sp, uint8_t *r, int rp) { |
unsigned long sum_s = 0, sum_r = 0, sum_sq_s = 0, sum_sq_r = 0, sum_sxr = 0; |
vp9_ssim_parms_8x8(s, sp, r, rp, &sum_s, &sum_r, &sum_sq_s, &sum_sq_r, |