diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-05-27 00:14:14 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-06-01 10:32:33 +0400 |
commit | e19d48dfce52f1417f7f06143b96fed00cbcdc52 (patch) | |
tree | 3d031e577a222bedcb5456aa850938ef0d9bc4fe /libavformat/flacenc.c | |
parent | 0097cbea695e534fce39958ccd103af2fbf65831 (diff) |
flac muxer: support reading updated extradata from side data
Diffstat (limited to 'libavformat/flacenc.c')
-rw-r--r-- | libavformat/flacenc.c | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 0365764605..a686826543 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -31,6 +31,9 @@ typedef struct FlacMuxerContext { const AVClass *class; int write_header; + + /* updated streaminfo sent by the encoder at the end */ + uint8_t *streaminfo; } FlacMuxerContext; static int flac_write_block_padding(AVIOContext *pb, unsigned int n_padding_bytes, @@ -80,7 +83,8 @@ static int flac_write_header(struct AVFormatContext *s) if (!c->write_header) return 0; - ret = ff_flac_write_header(s->pb, codec, 0); + ret = ff_flac_write_header(s->pb, codec->extradata, + codec->extradata_size, 0); if (ret) return ret; @@ -118,17 +122,14 @@ static int flac_write_header(struct AVFormatContext *s) static int flac_write_trailer(struct AVFormatContext *s) { AVIOContext *pb = s->pb; - uint8_t *streaminfo; - enum FLACExtradataFormat format; int64_t file_size; FlacMuxerContext *c = s->priv_data; + uint8_t *streaminfo = c->streaminfo ? c->streaminfo : + s->streams[0]->codec->extradata; - if (!c->write_header) + if (!c->write_header || !streaminfo) return 0; - if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo)) - return -1; - if (pb->seekable) { /* rewrite the STREAMINFO header block data */ file_size = avio_tell(pb); @@ -139,12 +140,32 @@ static int flac_write_trailer(struct AVFormatContext *s) } else { av_log(s, AV_LOG_WARNING, "unable to rewrite FLAC header.\n"); } + + av_freep(&c->streaminfo); + return 0; } static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt) { - avio_write(s->pb, pkt->data, pkt->size); + FlacMuxerContext *c = s->priv_data; + uint8_t *streaminfo; + int streaminfo_size; + + /* check for updated streaminfo */ + streaminfo = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + &streaminfo_size); + if (streaminfo && streaminfo_size == FLAC_STREAMINFO_SIZE) { + av_freep(&c->streaminfo); + + c->streaminfo = av_malloc(FLAC_STREAMINFO_SIZE); + if (!c->streaminfo) + return AVERROR(ENOMEM); + memcpy(c->streaminfo, streaminfo, FLAC_STREAMINFO_SIZE); + } + + if (pkt->size) + avio_write(s->pb, pkt->data, pkt->size); return 0; } |