generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/dashenc: Update codec_str on extradata_size change

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Timo Rothenpieler 2015-03-01 22:59:55 +01:00 committed by Michael Niedermayer
parent b86af8da31
commit 6cfd536675
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/dashenc.c
View File

@ -72,6 +72,7 @@ typedef struct OutputStream {
int bit_rate; int bit_rate;
char bandwidth_str[64]; char bandwidth_str[64];
int codec_str_extradata_size;
char codec_str[100]; char codec_str[100];
} OutputStream; } OutputStream;
@ -501,6 +502,13 @@ static int write_manifest(AVFormatContext *s, int final)
if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO)
continue; continue;
if (os->codec_str_extradata_size != st->codec->extradata_size) {
memset(os->codec_str, 0, sizeof(os->codec_str));
set_codec_str(s, st->codec, os->codec_str, sizeof(os->codec_str));
os->codec_str_extradata_size = st->codec->extradata_size;
}
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/mp4\" codecs=\"%s\"%s width=\"%d\" height=\"%d\">\n", i, os->codec_str, os->bandwidth_str, st->codec->width, st->codec->height); avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/mp4\" codecs=\"%s\"%s width=\"%d\" height=\"%d\">\n", i, os->codec_str, os->bandwidth_str, st->codec->width, st->codec->height);
output_segment_list(&c->streams[i], out, c); output_segment_list(&c->streams[i], out, c);
avio_printf(out, "\t\t\t</Representation>\n"); avio_printf(out, "\t\t\t</Representation>\n");
@ -515,6 +523,13 @@ static int write_manifest(AVFormatContext *s, int final)
if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
continue; continue;
if (os->codec_str_extradata_size != st->codec->extradata_size) {
memset(os->codec_str, 0, sizeof(os->codec_str));
set_codec_str(s, st->codec, os->codec_str, sizeof(os->codec_str));
os->codec_str_extradata_size = st->codec->extradata_size;
}
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/mp4\" codecs=\"%s\"%s audioSamplingRate=\"%d\">\n", i, os->codec_str, os->bandwidth_str, st->codec->sample_rate); avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/mp4\" codecs=\"%s\"%s audioSamplingRate=\"%d\">\n", i, os->codec_str, os->bandwidth_str, st->codec->sample_rate);
avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n", st->codec->channels); avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n", st->codec->channels);
output_segment_list(&c->streams[i], out, c); output_segment_list(&c->streams[i], out, c);
@ -649,7 +664,8 @@ static int dash_write_header(AVFormatContext *s)
else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
c->has_audio = 1; c->has_audio = 1;
set_codec_str(s, os->ctx->streams[0]->codec, os->codec_str, sizeof(os->codec_str)); set_codec_str(s, s->streams[i]->codec, os->codec_str, sizeof(os->codec_str));
os->codec_str_extradata_size = s->streams[i]->codec->extradata_size;
os->first_pts = AV_NOPTS_VALUE; os->first_pts = AV_NOPTS_VALUE;
os->max_pts = AV_NOPTS_VALUE; os->max_pts = AV_NOPTS_VALUE;
os->segment_index = 1; os->segment_index = 1;