[FFmpeg-cvslog] VC1: Fix intensity compensation performance regression

[Mason Carter]

ffmpeg | branch: master | Mason Carter <void.main.argc.argv at gmail.com> | Sat Dec 21 17:27:18 2013 -0800| [ed5bed4152203aed8cce01a679bed67bbda8903f] | committer: Michael Niedermayer

VC1: Fix intensity compensation performance regression

Fix https://trac.ffmpeg.org/ticket/3204

The problem was that intensity compensation was always used once it was
encountered. This is because v->next_use_ic was never set back to zero.
To fix this, when resetting v->next_luty/uv, also reset v->next_use_ic.

This improved (restored) performance by 85% when decoding
http://bit.ly/bbbwmv

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed5bed4152203aed8cce01a679bed67bbda8903f
---

 libavcodec/vc1.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 6557724..5391e85 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -610,6 +610,10 @@ static void rotate_luts(VC1Context *v)
     INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
     INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
     v->curr_use_ic = 0;
+    if (v->curr_luty == v->next_luty) {
+        // If we just initialized next_lut, clear next_use_ic to match.
+        v->next_use_ic = 0;
+    }
 }
 
 int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)