[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec parser.c,1.37,1.38
Måns Rullgård CVS
mru
Fri Feb 10 02:19:56 CET 2006
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat voc.c,1.1,1.2
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat adtsenc.c, NONE, 1.1 Makefile, 1.116, 1.117 allformats.c, 1.56, 1.57 avformat.h, 1.140, 1.141 raw.c, 1.66, 1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv333
Modified Files:
parser.c
Log Message:
use get_bits1/skip_bits[1] in ac3 and aac parsers
Index: parser.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/parser.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- parser.c 8 Feb 2006 00:49:58 -0000 1.37
+++ parser.c 10 Feb 2006 01:19:54 -0000 1.38
@@ -738,7 +738,7 @@
} AC3ParseContext;
#define AC3_HEADER_SIZE 7
-#define AAC_HEADER_SIZE 8
+#define AAC_HEADER_SIZE 7
static const int ac3_sample_rates[4] = {
48000, 44100, 32000, 0
@@ -815,7 +815,7 @@
if(get_bits(&bits, 16) != 0x0b77)
return 0;
- get_bits(&bits, 16); /* crc */
+ skip_bits(&bits, 16); /* crc */
fscod = get_bits(&bits, 2);
frmsizecod = get_bits(&bits, 6);
@@ -825,15 +825,15 @@
bsid = get_bits(&bits, 5);
if(bsid > 8)
return 0;
- get_bits(&bits, 3); /* bsmod */
+ skip_bits(&bits, 3); /* bsmod */
acmod = get_bits(&bits, 3);
if(acmod & 1 && acmod != 1)
- get_bits(&bits, 2); /* cmixlev */
+ skip_bits(&bits, 2); /* cmixlev */
if(acmod & 4)
- get_bits(&bits, 2); /* surmixlev */
+ skip_bits(&bits, 2); /* surmixlev */
if(acmod & 2)
- get_bits(&bits, 2); /* dsurmod */
- lfeon = get_bits(&bits, 1);
+ skip_bits(&bits, 2); /* dsurmod */
+ lfeon = get_bits1(&bits);
*sample_rate = ac3_sample_rates[fscod];
*bit_rate = ac3_bitrates[frmsizecod] * 1000;
@@ -854,26 +854,26 @@
if(get_bits(&bits, 12) != 0xfff)
return 0;
- get_bits(&bits, 1);
- get_bits(&bits, 2);
- get_bits(&bits, 1); /* protection_absent */
- get_bits(&bits, 2);
- sr = get_bits(&bits, 4);
+ skip_bits1(&bits); /* id */
+ skip_bits(&bits, 2); /* layer */
+ skip_bits1(&bits); /* protection_absent */
+ skip_bits(&bits, 2); /* profile_objecttype */
+ sr = get_bits(&bits, 4); /* sample_frequency_index */
if(!aac_sample_rates[sr])
return 0;
- get_bits(&bits, 1); /* private_bit */
- ch = get_bits(&bits, 3);
+ skip_bits1(&bits); /* private_bit */
+ ch = get_bits(&bits, 3); /* channel_configuration */
if(!aac_channels[ch])
return 0;
- get_bits(&bits, 1); /* original/copy */
- get_bits(&bits, 1); /* home */
+ skip_bits1(&bits); /* original/copy */
+ skip_bits1(&bits); /* home */
/* adts_variable_header */
- get_bits(&bits, 1); /* copyright_identification_bit */
- get_bits(&bits, 1); /* copyright_identification_start */
- size = get_bits(&bits, 13);
- get_bits(&bits, 11); /* adts_buffer_fullness */
- rdb = get_bits(&bits, 2);
+ skip_bits1(&bits); /* copyright_identification_bit */
+ skip_bits1(&bits); /* copyright_identification_start */
+ size = get_bits(&bits, 13); /* aac_frame_length */
+ skip_bits(&bits, 11); /* adts_buffer_fullness */
+ rdb = get_bits(&bits, 2); /* number_of_raw_data_blocks_in_frame */
*channels = aac_channels[ch];
*sample_rate = aac_sample_rates[sr];
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat voc.c,1.1,1.2
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat adtsenc.c, NONE, 1.1 Makefile, 1.116, 1.117 allformats.c, 1.56, 1.57 avformat.h, 1.140, 1.141 raw.c, 1.66, 1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list