Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Support demuxing of Sony OpenMG files without metadata header.

Browse source 
Original patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de

Originally committed as revision 21257 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Karcher 2010-01-17 00:23:08 +00:00 • committed by Carl Eugen Hoyos
parent 5090d8e16a
commit 1454618426
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libavformat/oma.c
View file

@ -78,6 +78,7 @@ static int oma_read_header(AVFormatContext *s,
if (ret != 10) if (ret != 10)
return -1; return -1;
if(!memcmp(buf, "ea3", 3)) {
ea3_taglen = ((buf[6] & 0x7f) << 21) | ((buf[7] & 0x7f) << 14) | ((buf[8] & 0x7f) << 7) | (buf[9] & 0x7f); ea3_taglen = ((buf[6] & 0x7f) << 21) | ((buf[7] & 0x7f) << 14) | ((buf[8] & 0x7f) << 7) | (buf[9] & 0x7f);
EA3_pos = ea3_taglen + 10; EA3_pos = ea3_taglen + 10;
@ -88,6 +89,10 @@ static int oma_read_header(AVFormatContext *s,
ret = get_buffer(s->pb, buf, EA3_HEADER_SIZE); ret = get_buffer(s->pb, buf, EA3_HEADER_SIZE);
if (ret != EA3_HEADER_SIZE) if (ret != EA3_HEADER_SIZE)
return -1; return -1;
} else {
ret = get_buffer(s->pb, buf + 10, EA3_HEADER_SIZE - 10);
EA3_pos = 0;
}
if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) { if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n"); av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
@ -177,7 +182,9 @@ static int oma_read_packet(AVFormatContext *s, AVPacket *pkt)
static int oma_read_probe(AVProbeData *p) static int oma_read_probe(AVProbeData *p)
{ {
if (!memcmp(p->buf, ((const uint8_t[]){'e', 'a', '3', 3, 0}),5)) if (!memcmp(p->buf, ((const uint8_t[]){'e', 'a', '3', 3, 0}), 5) ||
(!memcmp(p->buf, "EA3", 3) &&
!p->buf[4] && p->buf[5] == EA3_HEADER_SIZE))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
else else
return 0; return 0;