diff options
author | Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de> | 2010-06-17 14:59:49 +0400 |
---|---|---|
committer | Maxim Poliakovski <max_pole@gmx.de> | 2010-06-17 14:59:49 +0400 |
commit | 6afd0ee3b2bfc7ed8024f1d30dfc9db39df98320 (patch) | |
tree | 83438c0a6cd5693c4044d672a19445e9af50367c /libavformat/oma.c | |
parent | 8a2679ada43665f19eb8282e82f2acaad8ba4f84 (diff) |
Add metadata support. Patch by Michael Karcher.
Originally committed as revision 23639 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oma.c')
-rw-r--r-- | libavformat/oma.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c index c12365e10c..a47fde02f9 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -27,7 +27,8 @@ * * Known file extensions: ".oma", "aa3" * The format of such files consists of three parts: - * - "ea3" header carrying overall info and metadata. + * - "ea3" header carrying overall info and metadata. Except for starting with + * "ea" instead of "ID", it's an ID3v2 header. * - "EA3" header is a Sony-specific header containing information about * the OpenMG file: codec type (usually ATRAC, can also be MP3 or WMA), * codec specific info (packet size, sample rate, channels and so on) @@ -46,6 +47,7 @@ #include "libavutil/intreadwrite.h" #include "raw.h" #include "riff.h" +#include "id3v2.h" #define EA3_HEADER_SIZE 96 @@ -63,36 +65,21 @@ static const AVCodecTag codec_oma_tags[] = { { CODEC_ID_MP3, OMA_CODECID_MP3 }, }; +#define ID3v2_EA3_MAGIC "ea3" + static int oma_read_header(AVFormatContext *s, AVFormatParameters *ap) { static const uint16_t srate_tab[6] = {320,441,480,882,960,0}; - int ret, ea3_taglen, EA3_pos, framesize, jsflag, samplerate; + int ret, framesize, jsflag, samplerate; uint32_t codec_params; int16_t eid; uint8_t buf[EA3_HEADER_SIZE]; uint8_t *edata; AVStream *st; - ret = get_buffer(s->pb, buf, 10); - if (ret != 10) - 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_pos = ea3_taglen + 10; - if (buf[5] & 0x10) - EA3_pos += 10; - - url_fseek(s->pb, EA3_pos, SEEK_SET); - ret = get_buffer(s->pb, buf, EA3_HEADER_SIZE); - if (ret != EA3_HEADER_SIZE) - return -1; - } else { - ret = get_buffer(s->pb, buf + 10, EA3_HEADER_SIZE - 10); - EA3_pos = 0; - } + ff_id3v2_read(s, ID3v2_EA3_MAGIC); + ret = get_buffer(s->pb, buf, 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"); @@ -163,7 +150,6 @@ static int oma_read_header(AVFormatContext *s, } st->codec->block_align = framesize; - url_fseek(s->pb, EA3_pos + EA3_HEADER_SIZE, SEEK_SET); return 0; } @@ -182,9 +168,21 @@ static int oma_read_packet(AVFormatContext *s, AVPacket *pkt) static int oma_read_probe(AVProbeData *p) { - 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)) + const uint8_t *buf; + unsigned tag_len = 0; + + buf = p->buf; + /* version must be 3 and flags byte zero */ + if (ff_id3v2_match(buf, ID3v2_EA3_MAGIC) && buf[3] == 3 && !buf[4]) + tag_len = ff_id3v2_tag_len(buf); + + // This check cannot overflow as tag_len has at most 28 bits + if (p->buf_size < tag_len + 5) + return 0; + + buf += tag_len; + + if (!memcmp(buf, "EA3", 3) && !buf[4] && buf[5] == EA3_HEADER_SIZE) return AVPROBE_SCORE_MAX; else return 0; @@ -203,5 +201,6 @@ AVInputFormat oma_demuxer = { .flags= AVFMT_GENERIC_INDEX, .extensions = "oma,aa3", .codec_tag= (const AVCodecTag* const []){codec_oma_tags, 0}, + .metadata_conv = ff_id3v2_metadata_conv, }; |