summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Große <pegro@friks.de>2017-01-27 00:25:08 +0100
committerMartin Storsjö <martin@martin.st>2017-01-27 14:27:40 +0200
commit95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18 (patch)
tree650a2d72fdd0fc1385b48474b7b59da58b91ae61
parent1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a (diff)
downloadffmpeg-streaming-95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18.zip
ffmpeg-streaming-95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18.tar.gz
dashenc: add mandatory id to AdaptationSet and Period in manifest
Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/dashenc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 2b27950..865f50a 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -439,7 +439,7 @@ static int write_manifest(AVFormatContext *s, int final)
DASHContext *c = s->priv_data;
AVIOContext *out;
char temp_filename[1024];
- int ret, i;
+ int ret, i, as_id = 0;
AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0);
snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", s->filename);
@@ -494,15 +494,15 @@ static int write_manifest(AVFormatContext *s, int final)
OutputStream *os = &c->streams[0];
int start_index = FFMAX(os->nb_segments - c->window_size, 0);
int64_t start_time = av_rescale_q(os->segments[start_index]->time, s->streams[0]->time_base, AV_TIME_BASE_Q);
- avio_printf(out, "\t<Period start=\"");
+ avio_printf(out, "\t<Period id=\"0\" start=\"");
write_time(out, start_time);
avio_printf(out, "\">\n");
} else {
- avio_printf(out, "\t<Period start=\"PT0.0S\">\n");
+ avio_printf(out, "\t<Period id=\"0\" start=\"PT0.0S\">\n");
}
if (c->has_video) {
- avio_printf(out, "\t\t<AdaptationSet contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
+ avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n", as_id++);
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i];
@@ -515,7 +515,7 @@ static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "\t\t</AdaptationSet>\n");
}
if (c->has_audio) {
- avio_printf(out, "\t\t<AdaptationSet contentType=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
+ avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n", as_id++);
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i];
OpenPOWER on IntegriCloud