diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-02-10 11:49:22 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-02-10 11:49:22 -0800 |
| commit | 9ded6e375a417c992ba6f55e3d31b8be74dca131 (patch) | |
| tree | c5718350701e1f0974e48639919951e142d10dd8 /vp8/encoder/quantize.c | |
| parent | 2615ca5d41388216ec65db9d9cb0f719efef855a (diff) | |
| download | libvpx-9ded6e375a417c992ba6f55e3d31b8be74dca131.tar libvpx-9ded6e375a417c992ba6f55e3d31b8be74dca131.tar.gz libvpx-9ded6e375a417c992ba6f55e3d31b8be74dca131.tar.bz2 libvpx-9ded6e375a417c992ba6f55e3d31b8be74dca131.zip | |
fixed an issue related to 2nd order size due to merge artifacts.
For 8x8 transformed macroblock, the 2nd order transform is a 2x2 haar
transform, here there is only 4 coefficients total. A previous merge
changed these to 64, causing crashes when encoding with 8x8 transform
enabled. (i.e. when input video image size > 640x360 ) This commit
reverts them back to 4 and fixes the crashes.
Change-Id: I3290b81f8c0d32c7efec03093a61ea57736c0550
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 04939c7c7..300c407e7 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -1222,7 +1222,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) { x->block[24].eob_max_offset = 16; #if CONFIG_T8X8 - x->block[24].eob_max_offset_8x8 = 64; + x->block[24].eob_max_offset_8x8 = 4; #endif } |