diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-12-05 13:40:50 -0800 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-12-05 13:40:50 -0800 |
| commit | 37448d3e1f2f01f10035abca18033099e2df3259 (patch) | |
| tree | 5f030f990fb48466657362404a107b1470de61ae /vp9/encoder/vp9_encoder.c | |
| parent | 6ae829088f3b45a43ac75f838d088599cde74973 (diff) | |
| download | libvpx-37448d3e1f2f01f10035abca18033099e2df3259.tar libvpx-37448d3e1f2f01f10035abca18033099e2df3259.tar.gz libvpx-37448d3e1f2f01f10035abca18033099e2df3259.tar.bz2 libvpx-37448d3e1f2f01f10035abca18033099e2df3259.zip | |
Some internal-stats, vp9-highbitdepth bug fixes
Change-Id: I0363d98f6f6558a43276aec48f27dca37c93f5ad
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index aee362ae4..1c5cf4974 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3846,7 +3846,8 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, #if CONFIG_VP9_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 { 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 (cm->use_highbitdepth) { 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 { 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 (cm->use_highbitdepth) { frame_all = vp9_highbd_calc_ssimg(cpi->Source, cm->frame_to_show, &y, - &u, &v, xd->bd); + &u, &v, (int)cm->bit_depth); } else { frame_all = vp9_calc_ssimg(cpi->Source, cm->frame_to_show, &y, &u, &v); |