virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

dashenc: Update extradata for mov muxer

Browse Source 
The mov muxer already supports picking up extradata that wasn't
present during the avformat_write_header call - we just need to
propagate it. Since the dash muxer uses delay_moov, we have time
up until the first segment is written to get extradata filled in.

Also update the codec description string when the extradata becomes
available.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Timo Rothenpieler 2015-03-04 22:48:43 +01:00 committed by Martin Storsjö
parent 6cf7f30655
commit 5aef535a64
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/dashenc.c
View File

@ -730,6 +730,29 @@ static void find_index_range(AVFormatContext *s, const char *full_path,
*index_length = AV_RB32(&buf[0]); *index_length = AV_RB32(&buf[0]);
} }
static int update_stream_extradata(AVFormatContext *s, OutputStream *os,
AVCodecContext *codec)
{
uint8_t *extradata;
if (os->ctx->streams[0]->codec->extradata_size || !codec->extradata_size)
return 0;
extradata = av_malloc(codec->extradata_size);
if (!extradata)
return AVERROR(ENOMEM);
memcpy(extradata, codec->extradata, codec->extradata_size);
os->ctx->streams[0]->codec->extradata = extradata;
os->ctx->streams[0]->codec->extradata_size = codec->extradata_size;
set_codec_str(s, codec, os->codec_str, sizeof(os->codec_str));
return 0;
}
static int dash_flush(AVFormatContext *s, int final, int stream) static int dash_flush(AVFormatContext *s, int final, int stream)
{ {
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
@ -833,6 +856,10 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
int64_t seg_end_duration = (os->segment_index) * (int64_t) c->min_seg_duration; int64_t seg_end_duration = (os->segment_index) * (int64_t) c->min_seg_duration;
int ret; int ret;
ret = update_stream_extradata(s, os, st->codec);
if (ret < 0)
return ret;
// If forcing the stream to start at 0, the mp4 muxer will set the start // If forcing the stream to start at 0, the mp4 muxer will set the start
// timestamps to 0. Do the same here, to avoid mismatches in duration/timestamps. // timestamps to 0. Do the same here, to avoid mismatches in duration/timestamps.
if (os->first_pts == AV_NOPTS_VALUE && if (os->first_pts == AV_NOPTS_VALUE &&