diff options
author | Alpha Lam <hclam@google.com> | 2011-08-30 19:23:34 +0100 |
---|---|---|
committer | Alpha Lam <hclam@google.com> | 2011-08-30 19:23:34 +0100 |
commit | bc9293b8159b68e64d9b73e118b90f9fdadd6d80 (patch) | |
tree | 84aeba762068e237fb4abef35d6f79c846df0e31 /vp8 | |
parent | 2f964bac26340746d4e40f69cff61074770b81ba (diff) | |
download | libvpx-bc9293b8159b68e64d9b73e118b90f9fdadd6d80.tar libvpx-bc9293b8159b68e64d9b73e118b90f9fdadd6d80.tar.gz libvpx-bc9293b8159b68e64d9b73e118b90f9fdadd6d80.tar.bz2 libvpx-bc9293b8159b68e64d9b73e118b90f9fdadd6d80.zip |
Recalculate zbin_extra only if regular quantizer is being used
vp8_update_zbin_extra() is called all the time even though the fast
quantizer doesn't use it. Skip this call if fast quantizer is used.
Change-Id: Ia711c38431930cc2486cf59b8466060ef0e9d9db
Diffstat (limited to 'vp8')
-rw-r--r-- | vp8/encoder/encodeframe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 5d4e7e71e..a19425993 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1257,7 +1257,11 @@ int vp8cx_encode_inter_macroblock cpi->zbin_mode_boost = MV_ZBIN_BOOST; } } - vp8_update_zbin_extra(cpi, x); + + /* The fast quantizer doesn't use zbin_extra, only do so with + * the regular quantizer. */ + if (cpi->sf.improved_quant) + vp8_update_zbin_extra(cpi, x); } cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++; |