From 3c463ab056b6bf3a2db4380b5604e99277265900 Mon Sep 17 00:00:00 2001 From: Jim Bankoski Date: Fri, 22 Aug 2014 12:25:07 -0700 Subject: vp9_calc_ssim: remove unused parm to resolve warning Change-Id: I2b4f4e929495837817010eae12aa6225899afaff --- vp9/encoder/vp9_encoder.c | 4 ++-- vp9/encoder/vp9_ssim.c | 2 +- vp9/encoder/vp9_ssim.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 1aa8b9584..fe39e103f 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2742,12 +2742,12 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, cpi->totalp_sq_error += psnr2.sse[0]; cpi->totalp_samples += psnr2.samples[0]; - frame_ssim2 = vp9_calc_ssim(orig, recon, 1, &weight); + frame_ssim2 = vp9_calc_ssim(orig, recon, &weight); cpi->summed_quality += frame_ssim2 * weight; cpi->summed_weights += weight; - frame_ssim2 = vp9_calc_ssim(orig, &cm->post_proc_buffer, 1, &weight); + frame_ssim2 = vp9_calc_ssim(orig, &cm->post_proc_buffer, &weight); cpi->summedp_quality += frame_ssim2 * weight; cpi->summedp_weights += weight; diff --git a/vp9/encoder/vp9_ssim.c b/vp9/encoder/vp9_ssim.c index 026e6a8fd..8435640c8 100644 --- a/vp9/encoder/vp9_ssim.c +++ b/vp9/encoder/vp9_ssim.c @@ -95,7 +95,7 @@ double vp9_ssim2(uint8_t *img1, uint8_t *img2, int stride_img1, return ssim_total; } double vp9_calc_ssim(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, - int lumamask, double *weight) { + double *weight) { double a, b, c; double ssimv; diff --git a/vp9/encoder/vp9_ssim.h b/vp9/encoder/vp9_ssim.h index a581c2c23..d1dd1b722 100644 --- a/vp9/encoder/vp9_ssim.h +++ b/vp9/encoder/vp9_ssim.h @@ -18,7 +18,7 @@ extern "C" { #include "vpx_scale/yv12config.h" double vp9_calc_ssim(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, - int lumamask, double *weight); + double *weight); double vp9_calc_ssimg(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, double *ssim_y, double *ssim_u, double *ssim_v); -- cgit v1.2.3