generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RM audio stream version should be 16-bit followed by header size or reserved

Browse Source 
word, so treat it this way instead of extracting different parts from 32-bit
value.

Originally committed as revision 20820 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-12-13 09:08:58 +00:00
parent 461ef74116
commit 119c61a30f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/rmdec.c
View File

@ -130,19 +130,20 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
uint32_t version; uint32_t version;
/* ra type header */ /* ra type header */
version = get_be32(pb); /* version */ version = get_be16(pb); /* version */
if (((version >> 16) & 0xff) == 3) { if (version == 3) {
int header_size = get_be16(pb);
int64_t startpos = url_ftell(pb); int64_t startpos = url_ftell(pb);
url_fskip(pb, 14); url_fskip(pb, 14);
rm_read_metadata(s, 0); rm_read_metadata(s, 0);
if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) { if ((startpos + header_size) >= url_ftell(pb) + 2) {
// fourcc (should always be "lpcJ") // fourcc (should always be "lpcJ")
get_byte(pb); get_byte(pb);
get_str8(pb, buf, sizeof(buf)); get_str8(pb, buf, sizeof(buf));
} }
// Skip extra header crap (this should never happen) // Skip extra header crap (this should never happen)
if ((startpos + (version & 0xffff)) > url_ftell(pb)) if ((startpos + header_size) > url_ftell(pb))
url_fskip(pb, (version & 0xffff) + startpos - url_ftell(pb)); url_fskip(pb, header_size + startpos - url_ftell(pb));
st->codec->sample_rate = 8000; st->codec->sample_rate = 8000;
st->codec->channels = 1; st->codec->channels = 1;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
@ -151,6 +152,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
int flavor, sub_packet_h, coded_framesize, sub_packet_size; int flavor, sub_packet_h, coded_framesize, sub_packet_size;
int codecdata_length; int codecdata_length;
/* old version (4) */ /* old version (4) */
url_fskip(pb, 2); /* unused */
get_be32(pb); /* .ra4 */ get_be32(pb); /* .ra4 */
get_be32(pb); /* data size */ get_be32(pb); /* data size */
get_be16(pb); /* version2 */ get_be16(pb); /* version2 */
@ -164,13 +166,13 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
st->codec->block_align= get_be16(pb); /* frame size */ st->codec->block_align= get_be16(pb); /* frame size */
ast->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */ ast->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */
get_be16(pb); /* ??? */ get_be16(pb); /* ??? */
if (((version >> 16) & 0xff) == 5) { if (version == 5) {
get_be16(pb); get_be16(pb); get_be16(pb); get_be16(pb); get_be16(pb); get_be16(pb);
} }
st->codec->sample_rate = get_be16(pb); st->codec->sample_rate = get_be16(pb);
get_be32(pb); get_be32(pb);
st->codec->channels = get_be16(pb); st->codec->channels = get_be16(pb);
if (((version >> 16) & 0xff) == 5) { if (version == 5) {
get_be32(pb); get_be32(pb);
get_buffer(pb, buf, 4); get_buffer(pb, buf, 4);
buf[4] = 0; buf[4] = 0;
@ -201,7 +203,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
case CODEC_ID_ATRAC3: case CODEC_ID_ATRAC3:
case CODEC_ID_SIPR: case CODEC_ID_SIPR:
get_be16(pb); get_byte(pb); get_be16(pb); get_byte(pb);
if (((version >> 16) & 0xff) == 5) if (version == 5)
get_byte(pb); get_byte(pb);
codecdata_length = get_be32(pb); codecdata_length = get_be32(pb);
if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){ if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
@ -241,7 +243,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
break; break;
case CODEC_ID_AAC: case CODEC_ID_AAC:
get_be16(pb); get_byte(pb); get_be16(pb); get_byte(pb);
if (((version >> 16) & 0xff) == 5) if (version == 5)
get_byte(pb); get_byte(pb);
st->codec->codec_id = CODEC_ID_AAC; st->codec->codec_id = CODEC_ID_AAC;
codecdata_length = get_be32(pb); codecdata_length = get_be32(pb);