[FFmpeg-cvslog] vc1: Simplify code by using INIT_LUT()

Michael Niedermayer git at videolan.org
Wed May 15 20:21:23 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 24 12:51:28 2013 +0200| [37f2ac36a9099b3489500ba79bb3831c8698feea] | committer: Martin Storsjö

vc1: Simplify code by using INIT_LUT()

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavcodec/vc1.c |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index f94d52a..b490165 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -693,22 +693,7 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
             v->lumshift = get_bits(gb, 6);
             v->use_ic   = 1;
             /* fill lookup tables for intensity compensation */
-            if (!v->lumscale) {
-                scale = -64;
-                shift = (255 - v->lumshift * 2) << 6;
-                if (v->lumshift > 31)
-                    shift += 128 << 6;
-            } else {
-                scale = v->lumscale + 32;
-                if (v->lumshift > 31)
-                    shift = (v->lumshift - 64) << 6;
-                else
-                    shift = v->lumshift << 6;
-            }
-            for (i = 0; i < 256; i++) {
-                v->luty[i]  = av_clip_uint8((scale * i + shift + 32) >> 6);
-                v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
-            }
+            INIT_LUT(v->lumscale, v->lumshift, v->luty, v->lutuv);
         }
         v->qs_last = v->s.quarter_sample;
         if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)



More information about the ffmpeg-cvslog mailing list