generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Some internal-stats, vp9-highbitdepth bug fixes"

Browse Source
This commit is contained in:
Deb Mukherjee 2014-12-05 17:49:52 -08:00 committed by Gerrit Code Review
commit 0d367474d0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_encoder.c
View File

@ -3846,7 +3846,8 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) { if (cm->use_highbitdepth) {
frame_ssim2 = vp9_highbd_calc_ssim(orig, recon, &weight, xd->bd); frame_ssim2 = vp9_highbd_calc_ssim(orig, recon, &weight,
(int)cm->bit_depth);
} else { } else {
frame_ssim2 = vp9_calc_ssim(orig, recon, &weight); frame_ssim2 = vp9_calc_ssim(orig, recon, &weight);
} }
@ -3860,7 +3861,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) { if (cm->use_highbitdepth) {
frame_ssim2 = vp9_highbd_calc_ssim( frame_ssim2 = vp9_highbd_calc_ssim(
orig, &cm->post_proc_buffer, &weight, xd->bd); orig, &cm->post_proc_buffer, &weight, (int)cm->bit_depth);
} else { } else {
frame_ssim2 = vp9_calc_ssim(orig, &cm->post_proc_buffer, &weight); frame_ssim2 = vp9_calc_ssim(orig, &cm->post_proc_buffer, &weight);
} }
@ -3888,7 +3889,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) { if (cm->use_highbitdepth) {
frame_all = vp9_highbd_calc_ssimg(cpi->Source, cm->frame_to_show, &y, frame_all = vp9_highbd_calc_ssimg(cpi->Source, cm->frame_to_show, &y,
&u, &v, xd->bd); &u, &v, (int)cm->bit_depth);
} else { } else {
frame_all = vp9_calc_ssimg(cpi->Source, cm->frame_to_show, &y, &u, frame_all = vp9_calc_ssimg(cpi->Source, cm->frame_to_show, &y, &u,
&v); &v);