diff options
| author | Adrian Grange <agrange@google.com> | 2014-05-05 15:41:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-05 15:41:10 -0700 |
| commit | 6b4efa493a242b2d067b7523cf6bf7e4ba62e627 (patch) | |
| tree | a3f2891defb4a91806f0c2199182441aae8a6f36 /vp8/encoder/onyx_if.c | |
| parent | 34843e97847fe58a71ada19a3774dc60a44bf467 (diff) | |
| parent | 93a8a1eb8c8b9febb40329897d6486d7ade3f2f8 (diff) | |
| download | libvpx-6b4efa493a242b2d067b7523cf6bf7e4ba62e627.tar libvpx-6b4efa493a242b2d067b7523cf6bf7e4ba62e627.tar.gz libvpx-6b4efa493a242b2d067b7523cf6bf7e4ba62e627.tar.bz2 libvpx-6b4efa493a242b2d067b7523cf6bf7e4ba62e627.zip | |
Merge changes Ibfa447fe,I771809ba
* changes:
Fix generic-gnu target build
Fix rounding in ARNR calculation
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 560134ee5..e95e44fd5 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -5227,7 +5227,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l int y_samples = orig->y_height * orig->y_width ; int uv_samples = orig->uv_height * orig->uv_width ; int t_samples = y_samples + 2 * uv_samples; - double sq_error, sq_error2; + double sq_error; ye = calc_plane_error(orig->y_buffer, orig->y_stride, recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height); @@ -5250,6 +5250,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l #if CONFIG_POSTPROC { YV12_BUFFER_CONFIG *pp = &cm->post_proc_buffer; + double sq_error2; double frame_psnr2, frame_ssim2 = 0; double weight = 0; |