diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-27 11:55:15 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-06-27 11:55:15 -0700 |
| commit | 7985e023ebd83351b670bf5b18060f4d391b3a64 (patch) | |
| tree | 9e8a97c776f7fa869eb1ba8e702e71d6fb4bdc85 /vp8/encoder | |
| parent | 1ec4e270957a463cf7a8f320b23325d99577d9c8 (diff) | |
| parent | 7793b386a7007d72f78942ef7f41eb2eeb0410b5 (diff) | |
| download | libvpx-7985e023ebd83351b670bf5b18060f4d391b3a64.tar libvpx-7985e023ebd83351b670bf5b18060f4d391b3a64.tar.gz libvpx-7985e023ebd83351b670bf5b18060f4d391b3a64.tar.bz2 libvpx-7985e023ebd83351b670bf5b18060f4d391b3a64.zip | |
Merge "fix build issues for experimental branch" into experimental
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/rdopt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 9173272fc..f0ddf44fa 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -630,7 +630,12 @@ static void macro_block_yrd( MACROBLOCK *mb, // Distortion d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2; + +#if CONFIG_EXTEND_QRANGE + d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2; +#else d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff); +#endif *Distortion = (d >> 4); @@ -1049,10 +1054,7 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels return distortion; } -#if CONFIG_EXTEND_QRANGE - d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2; -#else -#endif + static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0}; |