From db4d9faf8d5269f195e0271067fc0e3cbc0838b5 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 24 Oct 2004 02:59:36 +0000
Subject: [PATCH] optimzation
Originally committed as revision 3630 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9bd155dda5e..1518a07d7c9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4118,8 +4118,7 @@ static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) {
int amvd = abs( h->mvd_cache[list][scan8[n] - 1][l] ) +
abs( h->mvd_cache[list][scan8[n] - 8][l] );
int ctxbase = (l == 0) ? 40 : 47;
- int ctx;
- int mvd = 0;
+ int ctx, mvd;
if( amvd < 3 )
ctx = 0;
@@ -4128,11 +4127,14 @@ static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) {
else
ctx = 1;
+ if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
+ return 0;
+
+ mvd= 1;
+ ctx= 3;
while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) {
mvd++;
- if( ctx < 3 )
- ctx = 3;
- else if( ctx < 6 )
+ if( ctx < 6 )
ctx++;
}
@@ -4147,12 +4149,10 @@ static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) {
mvd += 1 << k;
}
}
- if( mvd != 0 && get_cabac_bypass( &h->cabac ) )
- return -mvd;
- return mvd;
+ if( get_cabac_bypass( &h->cabac ) ) return -mvd;
+ else return mvd;
}
-
static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
int nza, nzb;
int ctx = 0;
--
GitLab