* Copyright (c) 2008 Maxim Poliakovski
* 2008 Benjamin Larsson
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavformat/oma.c
+ * @file
* This is a demuxer for Sony OpenMG Music files
*
* 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)
#include "avformat.h"
#include "libavutil/intreadwrite.h"
-#include "raw.h"
+#include "pcm.h"
#include "riff.h"
+#include "id3v2.h"
#define EA3_HEADER_SIZE 96
{ 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)
+ ff_id3v2_read(s, ID3v2_EA3_MAGIC);
+ ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);
+ if (ret < EA3_HEADER_SIZE)
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;
- }
-
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");
return -1;
return AVERROR(ENOMEM);
st->start_time = 0;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = buf[32];
st->codec->codec_id = ff_codec_get_id(codec_oma_tags, st->codec->codec_tag);
case OMA_CODECID_ATRAC3:
samplerate = srate_tab[(codec_params >> 13) & 7]*100;
if (samplerate != 44100)
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate, send sample file to developers: %d\n", samplerate);
+ av_log_ask_for_sample(s, "Unsupported sample rate: %d\n",
+ samplerate);
framesize = (codec_params & 0x3FF) * 8;
jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */
default:
av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n",buf[32]);
return -1;
- break;
}
st->codec->block_align = framesize;
- url_fseek(s->pb, EA3_pos + EA3_HEADER_SIZE, SEEK_SET);
return 0;
}
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;
}
-AVInputFormat oma_demuxer = {
- "oma",
- NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
- 0,
- oma_read_probe,
- oma_read_header,
- oma_read_packet,
- 0,
- pcm_read_seek,
+AVInputFormat ff_oma_demuxer = {
+ .name = "oma",
+ .long_name = NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
+ .read_probe = oma_read_probe,
+ .read_header = oma_read_header,
+ .read_packet = oma_read_packet,
+ .read_seek = pcm_read_seek,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "oma,aa3",
.codec_tag= (const AVCodecTag* const []){codec_oma_tags, 0},
projects / ffmpeg / blobdiff