#include <stdio.h>
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
+#include "apetag.h"
+
+#define ENABLE_DEBUG 0
/* The earliest and latest file formats supported by this library */
-#define APE_MIN_VERSION 3970
+#define APE_MIN_VERSION 3950
#define APE_MAX_VERSION 3990
#define MAC_FORMAT_FLAG_8_BIT 1 // is 8-bit [OBSOLETE]
return 0;
}
-static void ape_dumpinfo(APEContext * ape_ctx)
+static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
{
+#if ENABLE_DEBUG
int i;
- av_log(NULL, AV_LOG_DEBUG, "Descriptor Block:\n\n");
- av_log(NULL, AV_LOG_DEBUG, "magic = \"%c%c%c%c\"\n", ape_ctx->magic[0], ape_ctx->magic[1], ape_ctx->magic[2], ape_ctx->magic[3]);
- av_log(NULL, AV_LOG_DEBUG, "fileversion = %d\n", ape_ctx->fileversion);
- av_log(NULL, AV_LOG_DEBUG, "descriptorlength = %d\n", ape_ctx->descriptorlength);
- av_log(NULL, AV_LOG_DEBUG, "headerlength = %d\n", ape_ctx->headerlength);
- av_log(NULL, AV_LOG_DEBUG, "seektablelength = %d\n", ape_ctx->seektablelength);
- av_log(NULL, AV_LOG_DEBUG, "wavheaderlength = %d\n", ape_ctx->wavheaderlength);
- av_log(NULL, AV_LOG_DEBUG, "audiodatalength = %d\n", ape_ctx->audiodatalength);
- av_log(NULL, AV_LOG_DEBUG, "audiodatalength_high = %d\n", ape_ctx->audiodatalength_high);
- av_log(NULL, AV_LOG_DEBUG, "wavtaillength = %d\n", ape_ctx->wavtaillength);
- av_log(NULL, AV_LOG_DEBUG, "md5 = ");
+ av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n");
+ av_log(s, AV_LOG_DEBUG, "magic = \"%c%c%c%c\"\n", ape_ctx->magic[0], ape_ctx->magic[1], ape_ctx->magic[2], ape_ctx->magic[3]);
+ av_log(s, AV_LOG_DEBUG, "fileversion = %d\n", ape_ctx->fileversion);
+ av_log(s, AV_LOG_DEBUG, "descriptorlength = %d\n", ape_ctx->descriptorlength);
+ av_log(s, AV_LOG_DEBUG, "headerlength = %d\n", ape_ctx->headerlength);
+ av_log(s, AV_LOG_DEBUG, "seektablelength = %d\n", ape_ctx->seektablelength);
+ av_log(s, AV_LOG_DEBUG, "wavheaderlength = %d\n", ape_ctx->wavheaderlength);
+ av_log(s, AV_LOG_DEBUG, "audiodatalength = %d\n", ape_ctx->audiodatalength);
+ av_log(s, AV_LOG_DEBUG, "audiodatalength_high = %d\n", ape_ctx->audiodatalength_high);
+ av_log(s, AV_LOG_DEBUG, "wavtaillength = %d\n", ape_ctx->wavtaillength);
+ av_log(s, AV_LOG_DEBUG, "md5 = ");
for (i = 0; i < 16; i++)
- av_log(NULL, AV_LOG_DEBUG, "%02x", ape_ctx->md5[i]);
- av_log(NULL, AV_LOG_DEBUG, "\n");
+ av_log(s, AV_LOG_DEBUG, "%02x", ape_ctx->md5[i]);
+ av_log(s, AV_LOG_DEBUG, "\n");
- av_log(NULL, AV_LOG_DEBUG, "\nHeader Block:\n\n");
+ av_log(s, AV_LOG_DEBUG, "\nHeader Block:\n\n");
- av_log(NULL, AV_LOG_DEBUG, "compressiontype = %d\n", ape_ctx->compressiontype);
- av_log(NULL, AV_LOG_DEBUG, "formatflags = %d\n", ape_ctx->formatflags);
- av_log(NULL, AV_LOG_DEBUG, "blocksperframe = %d\n", ape_ctx->blocksperframe);
- av_log(NULL, AV_LOG_DEBUG, "finalframeblocks = %d\n", ape_ctx->finalframeblocks);
- av_log(NULL, AV_LOG_DEBUG, "totalframes = %d\n", ape_ctx->totalframes);
- av_log(NULL, AV_LOG_DEBUG, "bps = %d\n", ape_ctx->bps);
- av_log(NULL, AV_LOG_DEBUG, "channels = %d\n", ape_ctx->channels);
- av_log(NULL, AV_LOG_DEBUG, "samplerate = %d\n", ape_ctx->samplerate);
+ av_log(s, AV_LOG_DEBUG, "compressiontype = %d\n", ape_ctx->compressiontype);
+ av_log(s, AV_LOG_DEBUG, "formatflags = %d\n", ape_ctx->formatflags);
+ av_log(s, AV_LOG_DEBUG, "blocksperframe = %d\n", ape_ctx->blocksperframe);
+ av_log(s, AV_LOG_DEBUG, "finalframeblocks = %d\n", ape_ctx->finalframeblocks);
+ av_log(s, AV_LOG_DEBUG, "totalframes = %d\n", ape_ctx->totalframes);
+ av_log(s, AV_LOG_DEBUG, "bps = %d\n", ape_ctx->bps);
+ av_log(s, AV_LOG_DEBUG, "channels = %d\n", ape_ctx->channels);
+ av_log(s, AV_LOG_DEBUG, "samplerate = %d\n", ape_ctx->samplerate);
- av_log(NULL, AV_LOG_DEBUG, "\nSeektable\n\n");
+ av_log(s, AV_LOG_DEBUG, "\nSeektable\n\n");
if ((ape_ctx->seektablelength / sizeof(uint32_t)) != ape_ctx->totalframes) {
- av_log(NULL, AV_LOG_DEBUG, "No seektable\n");
+ av_log(s, AV_LOG_DEBUG, "No seektable\n");
} else {
for (i = 0; i < ape_ctx->seektablelength / sizeof(uint32_t); i++) {
if (i < ape_ctx->totalframes - 1) {
- av_log(NULL, AV_LOG_DEBUG, "%8d %d (%d bytes)\n", i, ape_ctx->seektable[i], ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
+ av_log(s, AV_LOG_DEBUG, "%8d %d (%d bytes)\n", i, ape_ctx->seektable[i], ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
} else {
- av_log(NULL, AV_LOG_DEBUG, "%8d %d\n", i, ape_ctx->seektable[i]);
+ av_log(s, AV_LOG_DEBUG, "%8d %d\n", i, ape_ctx->seektable[i]);
}
}
}
- av_log(NULL, AV_LOG_DEBUG, "\nFrames\n\n");
+ av_log(s, AV_LOG_DEBUG, "\nFrames\n\n");
for (i = 0; i < ape_ctx->totalframes; i++)
- av_log(NULL, AV_LOG_DEBUG, "%8d %8lld %8d (%d samples)\n", i, ape_ctx->frames[i].pos, ape_ctx->frames[i].size, ape_ctx->frames[i].nblocks);
+ av_log(s, AV_LOG_DEBUG, "%8d %8lld %8d (%d samples)\n", i, ape_ctx->frames[i].pos, ape_ctx->frames[i].size, ape_ctx->frames[i].nblocks);
- av_log(NULL, AV_LOG_DEBUG, "\nCalculated information:\n\n");
- av_log(NULL, AV_LOG_DEBUG, "junklength = %d\n", ape_ctx->junklength);
- av_log(NULL, AV_LOG_DEBUG, "firstframe = %d\n", ape_ctx->firstframe);
- av_log(NULL, AV_LOG_DEBUG, "totalsamples = %d\n", ape_ctx->totalsamples);
+ av_log(s, AV_LOG_DEBUG, "\nCalculated information:\n\n");
+ av_log(s, AV_LOG_DEBUG, "junklength = %d\n", ape_ctx->junklength);
+ av_log(s, AV_LOG_DEBUG, "firstframe = %d\n", ape_ctx->firstframe);
+ av_log(s, AV_LOG_DEBUG, "totalsamples = %d\n", ape_ctx->totalsamples);
+#endif
}
static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
APEContext *ape = s->priv_data;
AVStream *st;
uint32_t tag;
}
ape->frames = av_malloc(ape->totalframes * sizeof(APEFrame));
if(!ape->frames)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
ape->firstframe = ape->junklength + ape->descriptorlength + ape->headerlength + ape->seektablelength + ape->wavheaderlength;
ape->currentframe = 0;
}
- ape_dumpinfo(ape);
+ ape_dumpinfo(s, ape);
+
+ /* try to read APE tags */
+ if (!url_is_streamed(pb)) {
+ ff_ape_parse_tag(s);
+ url_fseek(pb, 0, SEEK_SET);
+ }
av_log(s, AV_LOG_DEBUG, "Decoding file - v%d.%02d, compression level %d\n", ape->fileversion / 1000, (ape->fileversion % 1000) / 10, ape->compressiontype);
total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_APE;
st->codec->codec_tag = MKTAG('A', 'P', 'E', ' ');
st->codec->channels = ape->channels;
st->codec->sample_rate = ape->samplerate;
- st->codec->bits_per_sample = ape->bps;
+ st->codec->bits_per_coded_sample = ape->bps;
st->codec->frame_size = MAC_SUBFRAME_SIZE;
st->nb_frames = ape->totalframes;
- s->start_time = 0;
- s->duration = (int64_t) total_blocks * AV_TIME_BASE / ape->samplerate;
+ st->start_time = 0;
+ st->duration = total_blocks / MAC_SUBFRAME_SIZE;
av_set_pts_info(st, 64, MAC_SUBFRAME_SIZE, ape->samplerate);
st->codec->extradata = av_malloc(APE_EXTRADATA_SIZE);
APEContext *ape = s->priv_data;
uint32_t extra_size = 8;
- if (url_feof(&s->pb))
- return AVERROR_IO;
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
if (ape->currentframe > ape->totalframes)
- return AVERROR_IO;
+ return AVERROR(EIO);
- url_fseek (&s->pb, ape->frames[ape->currentframe].pos, SEEK_SET);
+ url_fseek (s->pb, ape->frames[ape->currentframe].pos, SEEK_SET);
/* Calculate how many blocks there are in this frame */
if (ape->currentframe == (ape->totalframes - 1))
nblocks = ape->blocksperframe;
if (av_new_packet(pkt, ape->frames[ape->currentframe].size + extra_size) < 0)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
AV_WL32(pkt->data , nblocks);
AV_WL32(pkt->data + 4, ape->frames[ape->currentframe].skip);
- ret = get_buffer(&s->pb, pkt->data + extra_size, ape->frames[ape->currentframe].size);
+ ret = get_buffer(s->pb, pkt->data + extra_size, ape->frames[ape->currentframe].size);
pkt->pts = ape->frames[ape->currentframe].pts;
pkt->stream_index = 0;
AVInputFormat ape_demuxer = {
"ape",
- "Monkey's Audio",
+ NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext),
ape_probe,
ape_read_header,
projects / ffmpeg / blobdiff