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

Merge "vp8cx- alternate ssim function with optimizations"

Browse Source
This commit is contained in:
John Koleszar
2011-03-11 05:53:41 -08:00
committed by Code Review
parent 76ec21928c 3f6f7289aa
commit 29c46b64a2
7 changed files with 468 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vp8/encoder/onyx_if.c
View File

@@ -86,9 +86,11 @@ extern double vp8_calc_ssim
YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *dest,
int lumamask,
double *weight
double *weight,
const vp8_variance_rtcd_vtable_t *rtcd
);
extern double vp8_calc_ssimg
(
YV12_BUFFER_CONFIG *source,
@@ -5155,8 +5157,12 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
vp8_deblock(cm->frame_to_show, &cm->post_proc_buffer, cm->filter_level * 10 / 6, 1, 0, IF_RTCD(&cm->rtcd.postproc));
vp8_clear_system_state();
frame_psnr2 = vp8_calc_psnr(cpi->Source, &cm->post_proc_buffer, &y2, &u2, &v2, &sq_error);
frame_ssim2 = vp8_calc_ssim(cpi->Source, &cm->post_proc_buffer, 1, &weight);
frame_psnr2 = vp8_calc_psnr(cpi->Source,
&cm->post_proc_buffer, &y2, &u2, &v2, &sq_error);
frame_ssim2 = vp8_calc_ssim(cpi->Source,
&cm->post_proc_buffer, 1, &weight,
IF_RTCD(&cpi->rtcd.variance));
cpi->summed_quality += frame_ssim2 * weight;
cpi->summed_weights += weight;