#include "caf.h"
#include "isom.h"
#include "avio_internal.h"
+#include "mux.h"
#include "libavutil/intfloat.h"
#include "libavutil/dict.h"
+#define FRAME_SIZE_OFFSET 40
+
typedef struct {
int64_t data;
- uint8_t *pkt_sizes;
int size_buffer_size;
int size_entries_used;
int packets;
}
}
-static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int block_align) {
+static uint32_t samples_per_packet(const AVCodecParameters *par) {
+ enum AVCodecID codec_id = par->codec_id;
+ int channels = par->ch_layout.nb_channels, block_align = par->block_align;
+ int frame_size = par->frame_size, sample_rate = par->sample_rate;
+
switch (codec_id) {
case AV_CODEC_ID_PCM_S8:
case AV_CODEC_ID_PCM_S16LE:
case AV_CODEC_ID_MP1:
return 384;
case AV_CODEC_ID_OPUS:
- return 960;
+ return frame_size * 48000 / sample_rate;
case AV_CODEC_ID_MP2:
case AV_CODEC_ID_MP3:
return 1152;
AVIOContext *pb = s->pb;
AVCodecParameters *par = s->streams[0]->codecpar;
CAFContext *caf = s->priv_data;
- AVDictionaryEntry *t = NULL;
+ const AVDictionaryEntry *t = NULL;
unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id);
int64_t chunk_size = 0;
- int frame_size = par->frame_size;
+ int frame_size = par->frame_size, sample_rate = par->sample_rate;
if (s->nb_streams != 1) {
av_log(s, AV_LOG_ERROR, "CAF files have exactly one stream\n");
return AVERROR_PATCHWELCOME;
}
- if (par->codec_id == AV_CODEC_ID_OPUS && par->channels > 2) {
+ if (par->codec_id == AV_CODEC_ID_OPUS && par->ch_layout.nb_channels > 2) {
av_log(s, AV_LOG_ERROR, "Only mono and stereo are supported for Opus\n");
return AVERROR_INVALIDDATA;
}
}
if (par->codec_id != AV_CODEC_ID_MP3 || frame_size != 576)
- frame_size = samples_per_packet(par->codec_id, par->channels, par->block_align);
+ frame_size = samples_per_packet(par);
+
+ if (par->codec_id == AV_CODEC_ID_OPUS)
+ sample_rate = 48000;
ffio_wfourcc(pb, "caff"); //< mFileType
avio_wb16(pb, 1); //< mFileVersion
ffio_wfourcc(pb, "desc"); //< Audio Description chunk
avio_wb64(pb, 32); //< mChunkSize
- avio_wb64(pb, av_double2int(par->sample_rate)); //< mSampleRate
+ avio_wb64(pb, av_double2int(sample_rate)); //< mSampleRate
avio_wl32(pb, codec_tag); //< mFormatID
avio_wb32(pb, codec_flags(par->codec_id)); //< mFormatFlags
avio_wb32(pb, par->block_align); //< mBytesPerPacket
avio_wb32(pb, frame_size); //< mFramesPerPacket
- avio_wb32(pb, par->channels); //< mChannelsPerFrame
+ avio_wb32(pb, par->ch_layout.nb_channels); //< mChannelsPerFrame
avio_wb32(pb, av_get_bits_per_sample(par->codec_id)); //< mBitsPerChannel
- if (par->channel_layout) {
+ if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) {
ffio_wfourcc(pb, "chan");
avio_wb64(pb, 12);
- ff_mov_write_chan(pb, par->channel_layout);
+ ff_mov_write_chan(pb, par->ch_layout.u.mask);
}
if (par->codec_id == AV_CODEC_ID_ALAC) {
ff_standardize_creation_time(s);
if (av_dict_count(s->metadata)) {
ffio_wfourcc(pb, "info"); //< Information chunk
- while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ while ((t = av_dict_iterate(s->metadata, t))) {
chunk_size += strlen(t->key) + strlen(t->value) + 2;
}
avio_wb64(pb, chunk_size + 4);
avio_wb32(pb, av_dict_count(s->metadata));
t = NULL;
- while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ while ((t = av_dict_iterate(s->metadata, t))) {
avio_put_str(pb, t->key);
avio_put_str(pb, t->value);
}
static int caf_write_packet(AVFormatContext *s, AVPacket *pkt)
{
CAFContext *caf = s->priv_data;
+ AVStream *const st = s->streams[0];
- avio_write(s->pb, pkt->data, pkt->size);
- if (!s->streams[0]->codecpar->block_align) {
- void *pkt_sizes = caf->pkt_sizes;
- int i, alloc_size = caf->size_entries_used + 5;
- if (alloc_size < 0) {
- caf->pkt_sizes = NULL;
- } else {
- caf->pkt_sizes = av_fast_realloc(caf->pkt_sizes,
- &caf->size_buffer_size,
- alloc_size);
- }
- if (!caf->pkt_sizes) {
- av_free(pkt_sizes);
+ if (!st->codecpar->block_align) {
+ uint8_t *pkt_sizes;
+ int i, alloc_size = caf->size_entries_used + 5U;
+ if (alloc_size < 0)
+ return AVERROR(ERANGE);
+
+ pkt_sizes = av_fast_realloc(st->priv_data,
+ &caf->size_buffer_size,
+ alloc_size);
+ if (!pkt_sizes)
return AVERROR(ENOMEM);
- }
+ st->priv_data = pkt_sizes;
for (i = 4; i > 0; i--) {
unsigned top = pkt->size >> i * 7;
if (top)
- caf->pkt_sizes[caf->size_entries_used++] = 128 | top;
+ pkt_sizes[caf->size_entries_used++] = 128 | top;
}
- caf->pkt_sizes[caf->size_entries_used++] = pkt->size & 127;
+ pkt_sizes[caf->size_entries_used++] = pkt->size & 127;
caf->packets++;
}
+ avio_write(s->pb, pkt->data, pkt->size);
return 0;
}
{
CAFContext *caf = s->priv_data;
AVIOContext *pb = s->pb;
- AVCodecParameters *par = s->streams[0]->codecpar;
+ AVStream *st = s->streams[0];
+ AVCodecParameters *par = st->codecpar;
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
int64_t file_size = avio_tell(pb);
avio_seek(pb, caf->data, SEEK_SET);
avio_wb64(pb, file_size - caf->data - 8);
- avio_seek(pb, file_size, SEEK_SET);
if (!par->block_align) {
+ int packet_size = samples_per_packet(par);
+ if (!packet_size) {
+ packet_size = st->duration / (caf->packets - 1);
+ avio_seek(pb, FRAME_SIZE_OFFSET, SEEK_SET);
+ avio_wb32(pb, packet_size);
+ }
+ avio_seek(pb, file_size, SEEK_SET);
ffio_wfourcc(pb, "pakt");
- avio_wb64(pb, caf->size_entries_used + 24);
+ avio_wb64(pb, caf->size_entries_used + 24U);
avio_wb64(pb, caf->packets); ///< mNumberPackets
- avio_wb64(pb, caf->packets * samples_per_packet(par->codec_id, par->channels, par->block_align)); ///< mNumberValidFrames
+ avio_wb64(pb, caf->packets * packet_size); ///< mNumberValidFrames
avio_wb32(pb, 0); ///< mPrimingFrames
avio_wb32(pb, 0); ///< mRemainderFrames
- avio_write(pb, caf->pkt_sizes, caf->size_entries_used);
- caf->size_buffer_size = 0;
+ avio_write(pb, st->priv_data, caf->size_entries_used);
}
}
- av_freep(&caf->pkt_sizes);
return 0;
}
-AVOutputFormat ff_caf_muxer = {
- .name = "caf",
- .long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),
- .mime_type = "audio/x-caf",
- .extensions = "caf",
+const FFOutputFormat ff_caf_muxer = {
+ .p.name = "caf",
+ .p.long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),
+ .p.mime_type = "audio/x-caf",
+ .p.extensions = "caf",
.priv_data_size = sizeof(CAFContext),
- .audio_codec = AV_CODEC_ID_PCM_S16BE,
- .video_codec = AV_CODEC_ID_NONE,
+ .p.audio_codec = AV_CODEC_ID_PCM_S16BE,
+ .p.video_codec = AV_CODEC_ID_NONE,
.write_header = caf_write_header,
.write_packet = caf_write_packet,
.write_trailer = caf_write_trailer,
- .codec_tag = ff_caf_codec_tags_list,
+ .p.codec_tag = ff_caf_codec_tags_list,
};
projects / platform / upstream / ffmpeg.git / blobdiff