0x1573cd93da7df623, 0x47f98d79620dd535
};
+/** map ATRAC-X channel id to internal channel layout */
+static const uint64_t oma_chid_to_native_layout[7] = {
+ AV_CH_LAYOUT_MONO,
+ AV_CH_LAYOUT_STEREO,
+ AV_CH_LAYOUT_SURROUND,
+ AV_CH_LAYOUT_4POINT0,
+ AV_CH_LAYOUT_5POINT1_BACK,
+ AV_CH_LAYOUT_6POINT1_BACK,
+ AV_CH_LAYOUT_7POINT1
+};
+
+/** map ATRAC-X channel id to total number of channels */
+static const int oma_chid_to_num_channels[7] = { 1, 2, 3, 4, 6, 7, 8 };
+
typedef struct OMAContext {
uint64_t content_start;
int encrypted;
int (*read_packet)(AVFormatContext *s, AVPacket *pkt);
} OMAContext;
+static int oma_read_close(AVFormatContext *s)
+{
+ OMAContext *oc = s->priv_data;
+ av_freep(&oc->av_des);
+ return 0;
+}
+
static void hex_log(AVFormatContext *s, int level,
const char *name, const uint8_t *value, int len)
{
av_log(s, AV_LOG_INFO, "File is encrypted\n");
/* find GEOB metadata */
- while (em) {
- if (!strcmp(em->tag, "GEOB") &&
- (geob = em->data) &&
- (!strcmp(geob->description, "OMG_LSI") ||
- !strcmp(geob->description, "OMG_BKLSI"))) {
+ for (; em; em = em->next) {
+ if (strcmp(em->tag, "GEOB"))
+ continue;
+ geob = &em->data.geob;
+ if (!strcmp(geob->description, "OMG_LSI") ||
+ !strcmp(geob->description, "OMG_BKLSI"))
break;
- }
- em = em->next;
}
if (!em) {
av_log(s, AV_LOG_ERROR, "No encryption header found\n");
uint8_t buf[EA3_HEADER_SIZE];
uint8_t *edata;
AVStream *st;
- ID3v2ExtraMeta *extra_meta = NULL;
+ ID3v2ExtraMeta *extra_meta;
OMAContext *oc = s->priv_data;
ff_id3v2_read(s, ID3v2_EA3_MAGIC, &extra_meta, 0);
- if ((ret = ff_id3v2_parse_chapters(s, &extra_meta)) < 0) {
+ if ((ret = ff_id3v2_parse_chapters(s, extra_meta)) < 0) {
ff_id3v2_free_extra_meta(&extra_meta);
return ret;
}
ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);
- if (ret < EA3_HEADER_SIZE)
+ if (ret < EA3_HEADER_SIZE) {
+ ff_id3v2_free_extra_meta(&extra_meta);
return -1;
+ }
if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}), 3) ||
buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
+ ff_id3v2_free_extra_meta(&extra_meta);
av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
return AVERROR_INVALIDDATA;
}
codec_params = AV_RB24(&buf[33]);
st = avformat_new_stream(s, NULL);
- if (!st)
- return AVERROR(ENOMEM);
+ if (!st) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
st->start_time = 0;
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
if (!samplerate) {
av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
if (samplerate != 44100)
avpriv_request_sample(s, "Sample rate %d", samplerate);
/* fake the ATRAC3 extradata
* (wav format, makes stream copy to wav work) */
- if (ff_alloc_extradata(st->codecpar, 14))
- return AVERROR(ENOMEM);
+ if ((ret = ff_alloc_extradata(st->codecpar, 14)) < 0)
+ goto fail;
edata = st->codecpar->extradata;
AV_WL16(&edata[0], 1); // always 1
if (!channel_id) {
av_log(s, AV_LOG_ERROR,
"Invalid ATRAC-X channel id: %"PRIu32"\n", channel_id);
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
- st->codecpar->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1];
- st->codecpar->channels = ff_oma_chid_to_num_channels[channel_id - 1];
+ st->codecpar->channel_layout = oma_chid_to_native_layout[channel_id - 1];
+ st->codecpar->channels = oma_chid_to_num_channels[channel_id - 1];
framesize = ((codec_params & 0x3FF) * 8) + 8;
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
if (!samplerate) {
av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
st->codecpar->sample_rate = samplerate;
st->codecpar->bit_rate = samplerate * framesize / (2048 / 8);
break;
default:
av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n", buf[32]);
- return AVERROR(ENOSYS);
+ ret = AVERROR(ENOSYS);
+ goto fail;
}
st->codecpar->block_align = framesize;
return 0;
+fail:
+ oma_read_close(s);
+ return ret;
}
static int oma_read_packet(AVFormatContext *s, AVPacket *pkt)
return oc->read_packet(s, pkt);
}
-static int oma_read_probe(AVProbeData *p)
+static int oma_read_probe(const AVProbeData *p)
{
const uint8_t *buf = p->buf;
unsigned tag_len = 0;
return err;
}
-static int oma_read_close(AVFormatContext *s)
-{
- OMAContext *oc = s->priv_data;
- av_free(oc->av_des);
- return 0;
-}
-
AVInputFormat ff_oma_demuxer = {
.name = "oma",
.long_name = NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
.read_close = oma_read_close,
.flags = AVFMT_GENERIC_INDEX,
.extensions = "oma,omg,aa3",
- .codec_tag = (const AVCodecTag* const []){ff_oma_codec_tags, 0},
+ .codec_tag = ff_oma_codec_tags_list,
};