[FFmpeg-cvslog] r21101 - in trunk/libavcodec: h263dec.c msmpeg4.c
michael
subversion
Fri Jan 8 20:10:11 CET 2010
Author: michael
Date: Fri Jan 8 20:10:11 2010
New Revision: 21101
Log:
Use h263 tables in msmpeg4v1 dont duplicate them halfway.
Modified:
trunk/libavcodec/h263dec.c
trunk/libavcodec/msmpeg4.c
Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c Fri Jan 8 19:54:52 2010 (r21100)
+++ trunk/libavcodec/h263dec.c Fri Jan 8 20:10:11 2010 (r21101)
@@ -116,7 +116,7 @@ av_cold int ff_h263_decode_init(AVCodecC
if (CONFIG_MSMPEG4_DECODER && s->h263_msmpeg4)
ff_msmpeg4_decode_init(s);
- else
+
h263_decode_init_vlc(s);
return 0;
Modified: trunk/libavcodec/msmpeg4.c
==============================================================================
--- trunk/libavcodec/msmpeg4.c Fri Jan 8 19:54:52 2010 (r21100)
+++ trunk/libavcodec/msmpeg4.c Fri Jan 8 20:10:11 2010 (r21101)
@@ -45,8 +45,6 @@
//#define DEBUG
#define DC_VLC_BITS 9
-#define V1_INTRA_CBPC_VLC_BITS 6
-#define V1_INTER_CBPC_VLC_BITS 6
#define V2_INTRA_CBPC_VLC_BITS 3
#define V2_MB_TYPE_VLC_BITS 7
#define MV_VLC_BITS 9
@@ -1063,8 +1061,6 @@ static VLC v2_dc_chroma_vlc;
static VLC v2_intra_cbpc_vlc;
static VLC v2_mb_type_vlc;
static VLC v2_mv_vlc;
-static VLC v1_intra_cbpc_vlc;
-static VLC v1_inter_cbpc_vlc;
VLC ff_inter_intra_vlc;
/* This is identical to h263 except that its range is multiplied by 2. */
@@ -1122,7 +1118,7 @@ static int msmpeg4v12_decode_mb(MpegEncC
if(s->msmpeg4_version==2)
code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1);
else
- code = get_vlc2(&s->gb, v1_inter_cbpc_vlc.table, V1_INTER_CBPC_VLC_BITS, 3);
+ code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
if(code<0 || code>7){
av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y);
return -1;
@@ -1136,7 +1132,7 @@ static int msmpeg4v12_decode_mb(MpegEncC
if(s->msmpeg4_version==2)
cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1);
else
- cbp= get_vlc2(&s->gb, v1_intra_cbpc_vlc.table, V1_INTRA_CBPC_VLC_BITS, 1);
+ cbp= get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 1);
if(cbp<0 || cbp>3){
av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
return -1;
@@ -1326,9 +1322,6 @@ av_cold int ff_msmpeg4_decode_init(MpegE
&v2_dc_chroma_table[0][1], 8, 4,
&v2_dc_chroma_table[0][0], 8, 4, 1506);
- INIT_VLC_STATIC(&ff_h263_cbpy_vlc, CBPY_VLC_BITS, 16,
- &ff_h263_cbpy_tab[0][1], 2, 1,
- &ff_h263_cbpy_tab[0][0], 2, 1, 64);
INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
&v2_intra_cbpc[0][1], 2, 1,
&v2_intra_cbpc[0][0], 2, 1, 8);
@@ -1356,13 +1349,6 @@ av_cold int ff_msmpeg4_decode_init(MpegE
&ff_msmp4_mb_i_table[0][1], 4, 2,
&ff_msmp4_mb_i_table[0][0], 4, 2, 536);
- INIT_VLC_STATIC(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8,
- ff_h263_intra_MCBPC_bits, 1, 1,
- ff_h263_intra_MCBPC_code, 1, 1, 64);
- INIT_VLC_STATIC(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25,
- ff_h263_inter_MCBPC_bits, 1, 1,
- ff_h263_inter_MCBPC_code, 1, 1, 104);
-
INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
&table_inter_intra[0][1], 2, 1,
&table_inter_intra[0][0], 2, 1, 8);
More information about the ffmpeg-cvslog
mailing list