diff options
| author | sdeng <sdeng@google.com> | 2019-06-12 16:05:33 -0700 |
|---|---|---|
| committer | sdeng <sdeng@google.com> | 2019-06-24 09:21:28 -0700 |
| commit | cb27e6ad055dade63acce084bad1f839cf2a7dd8 (patch) | |
| tree | 23edff9c7643f54ad458499a1be088c104ec9aa7 /vp9 | |
| parent | 7d9288f5f86e1b0a03ae5a555dc034e7055845ca (diff) | |
| download | libvpx-cb27e6ad055dade63acce084bad1f839cf2a7dd8.tar libvpx-cb27e6ad055dade63acce084bad1f839cf2a7dd8.tar.gz libvpx-cb27e6ad055dade63acce084bad1f839cf2a7dd8.tar.bz2 libvpx-cb27e6ad055dade63acce084bad1f839cf2a7dd8.zip | |
Change parameters for highbd tune=ssim
With this CL:
PSNR SSIM MS-SSIM
lowres_10bd 2.8 -5.6 -6.5
midres_10bd 2.6 -5.6 -6.3
Before this CL:
PSNR SSIM MS-SSIM
lowres_10bd 6.1 -6.5 -7.7
midres_10bd 6.2 -6.0 -7.2
Change-Id: Iad0ad96d55ad140db00ce86c34ab85461cd963eb
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 35a8a077f..ae41c0efd 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -4783,18 +4783,7 @@ static void set_mb_ssim_rdmult_scaling(VP9_COMP *cpi) { double log_sum = 0.0; int row, col; -#if CONFIG_VP9_HIGHBITDEPTH - double c2; - if (xd->bd == 10) { - c2 = 941.8761; // (.03*1023)^2 - } else if (xd->bd == 12) { - c2 = 15092.1225; // (.03*4095)^2 - } else { - c2 = 58.5225; // (.03*255)^2 - } -#else - const double c2 = 58.5225; // (.03*255)^2 -#endif + const double c2 = 58.5225 * SSIM_VAR_SCALE; // 58.5225 = (.03*255)^2 // Loop through each 64x64 block. for (row = 0; row < num_rows; ++row) { @@ -4817,18 +4806,18 @@ static void set_mb_ssim_rdmult_scaling(VP9_COMP *cpi) { // In order to make SSIM_VAR_SCALE in a same scale for both 8 bit // and high bit videos, the variance needs to be divided by 2.0 or // 64.0 separately. + // TODO(sdeng): need to tune for 12bit videos. #if CONFIG_VP9_HIGHBITDEPTH if (cpi->Source->flags & YV12_FLAG_HIGHBITDEPTH) - var += - vp9_high_get_sby_variance(cpi, &buf, BLOCK_8X8, xd->bd) / 2.0; + var += vp9_high_get_sby_variance(cpi, &buf, BLOCK_8X8, xd->bd); else #endif - var += vp9_get_sby_variance(cpi, &buf, BLOCK_8X8) / 64.0; + var += vp9_get_sby_variance(cpi, &buf, BLOCK_8X8); num_of_var += 1.0; } } - var = var / num_of_var / SSIM_VAR_SCALE; + var = var / num_of_var / 64.0; var = 2.0 * var + c2; cpi->mi_ssim_rdmult_scaling_factors[index] = var; log_sum += log(var); |