diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-08-25 06:39:49 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-25 06:39:49 -0700 |
| commit | 8a896fa54db6c3b7437fbe75586830a1a804f4a1 (patch) | |
| tree | e80ac0b58cc88d30c1722bf82ad67f17182bc23a | |
| parent | 10d3afb44fa1b07916eba2a5af3a6da34666a518 (diff) | |
| parent | 3c463ab056b6bf3a2db4380b5604e99277265900 (diff) | |
| download | libvpx-8a896fa54db6c3b7437fbe75586830a1a804f4a1.tar libvpx-8a896fa54db6c3b7437fbe75586830a1a804f4a1.tar.gz libvpx-8a896fa54db6c3b7437fbe75586830a1a804f4a1.tar.bz2 libvpx-8a896fa54db6c3b7437fbe75586830a1a804f4a1.zip | |
Merge "vp9_calc_ssim: remove unused parm to resolve warning"
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ssim.c | 2 | ||||
| -rw-r--r-- | 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 3e82a004c..0626f44a4 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2792,12 +2792,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); |