X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Faiffenc.c;h=24bc17400e016e768e4982c753c7ad629cd14586;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=0b837cd264f954383982941b4777029cfd3d356c;hpb=c694fc5759719de577fd0751103e20b6ce902a8f;p=ffmpeg diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 0b837cd264f..24bc17400e0 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -23,6 +23,7 @@ #include "libavutil/intfloat.h" #include "libavutil/opt.h" +#include "libavcodec/packet_internal.h" #include "avformat.h" #include "internal.h" #include "aiff.h" @@ -36,7 +37,7 @@ typedef struct AIFFOutputContext { int64_t frames; int64_t ssnd; int audio_stream_idx; - AVPacketList *pict_list, *pict_list_end; + PacketList *pict_list, *pict_list_end; int write_id3v2; int id3v2_version; } AIFFOutputContext; @@ -47,12 +48,9 @@ static int put_id3v2_tags(AVFormatContext *s, AIFFOutputContext *aiff) uint64_t pos, end, size; ID3v2EncContext id3v2 = { 0 }; AVIOContext *pb = s->pb; - AVPacketList *pict_list = aiff->pict_list; + PacketList *pict_list = aiff->pict_list; - if (!pb->seekable & AVIO_SEEKABLE_NORMAL) - return 0; - - if (!s->metadata && !aiff->pict_list) + if (!s->metadata && !s->nb_chapters && !aiff->pict_list) return 0; avio_wl32(pb, MKTAG('I', 'D', '3', ' ')); @@ -125,7 +123,7 @@ static int aiff_write_header(AVFormatContext *s) /* First verify if format is ok */ if (!par->codec_tag) - return -1; + return AVERROR(EINVAL); if (par->codec_tag != MKTAG('N','O','N','E')) aifc = 1; @@ -138,7 +136,7 @@ static int aiff_write_header(AVFormatContext *s) if (aifc) { // compressed audio if (!par->block_align) { av_log(s, AV_LOG_ERROR, "block align not set\n"); - return -1; + return AVERROR(EINVAL); } /* Version chunk */ ffio_wfourcc(pb, "FVER"); @@ -169,7 +167,7 @@ static int aiff_write_header(AVFormatContext *s) par->bits_per_coded_sample = av_get_bits_per_sample(par->codec_id); if (!par->bits_per_coded_sample) { av_log(s, AV_LOG_ERROR, "could not compute bits per sample\n"); - return -1; + return AVERROR(EINVAL); } if (!par->block_align) par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; @@ -202,9 +200,6 @@ static int aiff_write_header(AVFormatContext *s) avpriv_set_pts_info(s->streams[aiff->audio_stream_idx], 64, 1, s->streams[aiff->audio_stream_idx]->codecpar->sample_rate); - /* Data is starting here */ - avio_flush(pb); - return 0; } @@ -215,9 +210,6 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index == aiff->audio_stream_idx) avio_write(pb, pkt->data, pkt->size); else { - if (s->streams[pkt->stream_index]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) - return 0; - /* warn only once for each stream */ if (s->streams[pkt->stream_index]->nb_frames == 1) { av_log(s, AV_LOG_WARNING, "Got more than one picture in stream %d," @@ -226,8 +218,8 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) if (s->streams[pkt->stream_index]->nb_frames >= 1) return 0; - return ff_packet_list_put(&aiff->pict_list, &aiff->pict_list_end, - pkt, FF_PACKETLIST_FLAG_REF_PACKET); + return avpriv_packet_list_put(&aiff->pict_list, &aiff->pict_list_end, + pkt, av_packet_ref, 0); } return 0; @@ -241,44 +233,41 @@ static int aiff_write_trailer(AVFormatContext *s) AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar; /* Chunks sizes must be even */ - int64_t file_size, end_size; - end_size = file_size = avio_tell(pb); - if (file_size & 1) { + int64_t file_size, data_size; + data_size = avio_tell(pb); + if (data_size & 1) avio_w8(pb, 0); - end_size++; - } if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { - /* Number of sample frames */ - avio_seek(pb, aiff->frames, SEEK_SET); - avio_wb32(pb, (file_size - aiff->ssnd - 12) / par->block_align); - - /* Sound Data chunk size */ - avio_seek(pb, aiff->ssnd, SEEK_SET); - avio_wb32(pb, file_size - aiff->ssnd - 4); - - /* return to the end */ - avio_seek(pb, end_size, SEEK_SET); - /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - goto free; + return ret; /* File length */ file_size = avio_tell(pb); avio_seek(pb, aiff->form, SEEK_SET); avio_wb32(pb, file_size - aiff->form - 4); - avio_flush(pb); - } + /* Number of sample frames */ + avio_seek(pb, aiff->frames, SEEK_SET); + avio_wb32(pb, (data_size - aiff->ssnd - 12) / par->block_align); -free: - ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); + /* Sound Data chunk size */ + avio_seek(pb, aiff->ssnd, SEEK_SET); + avio_wb32(pb, data_size - aiff->ssnd - 4); + } return ret; } +static void aiff_deinit(AVFormatContext *s) +{ + AIFFOutputContext *aiff = s->priv_data; + + avpriv_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); +} + #define OFFSET(x) offsetof(AIFFOutputContext, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -296,7 +285,7 @@ static const AVClass aiff_muxer_class = { .version = LIBAVUTIL_VERSION_INT, }; -AVOutputFormat ff_aiff_muxer = { +const AVOutputFormat ff_aiff_muxer = { .name = "aiff", .long_name = NULL_IF_CONFIG_SMALL("Audio IFF"), .mime_type = "audio/aiff", @@ -307,6 +296,7 @@ AVOutputFormat ff_aiff_muxer = { .write_header = aiff_write_header, .write_packet = aiff_write_packet, .write_trailer = aiff_write_trailer, - .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, + .deinit = aiff_deinit, + .codec_tag = ff_aiff_codec_tags_list, .priv_class = &aiff_muxer_class, };