diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-09 22:05:13 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-24 20:27:59 -0300 |
| commit | f8c73e87532a80821422db9972514c0405b17047 (patch) | |
| tree | 12c4560bfef8d68de7bac40054e3c5b5e7c5cf43 /libavformat/movenc.c | |
| parent | cfec0d64752509f8ac798acca6225df630fa5284 (diff) | |
| download | ffmpeg-f8c73e87532a80821422db9972514c0405b17047.tar.gz | |
avformat/movenc: always check for new extradata on a packet
Don't just look at zero sized packets, and also check for AAC extradata
updates, in preparation for the following patches.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ba901fbb0f..8bcd335172 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5313,6 +5313,24 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT; } + if (trk->par->codec_id == AV_CODEC_ID_MP4ALS || + trk->par->codec_id == AV_CODEC_ID_AAC || + trk->par->codec_id == AV_CODEC_ID_FLAC) { + int side_size = 0; + uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); + if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { + void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!newextra) + return AVERROR(ENOMEM); + av_free(par->extradata); + par->extradata = newextra; + memcpy(par->extradata, side, side_size); + par->extradata_size = side_size; + if (!pkt->size) // Flush packet + mov->need_rewrite_extradata = 1; + } + } + if (!pkt->size) { if (trk->start_dts == AV_NOPTS_VALUE && trk->frag_discont) { trk->start_dts = pkt->dts; @@ -5322,22 +5340,6 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) trk->start_cts = 0; } - if (trk->par->codec_id == AV_CODEC_ID_MP4ALS || - trk->par->codec_id == AV_CODEC_ID_FLAC) { - int side_size = 0; - uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); - if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { - void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!newextra) - return AVERROR(ENOMEM); - av_free(par->extradata); - par->extradata = newextra; - memcpy(par->extradata, side, side_size); - par->extradata_size = side_size; - mov->need_rewrite_extradata = 1; - } - } - return 0; /* Discard 0 sized packets */ } |