Commit 8edb9d45 authored by Peter Große's avatar Peter Große Committed by Michael Niedermayer

dashenc: move UTCTiming element to the end of the manifest

Required by comformance XSD [1].

[1] https://github.com/Dash-Industry-Forum/Conformance-and-reference-source/blob/master/conformance/MPDValidator/schemas/DASH-MPD.xsdSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 3606c114
...@@ -627,8 +627,6 @@ static int write_manifest(AVFormatContext *s, int final) ...@@ -627,8 +627,6 @@ static int write_manifest(AVFormatContext *s, int final)
av_free(escaped); av_free(escaped);
} }
avio_printf(out, "\t</ProgramInformation>\n"); avio_printf(out, "\t</ProgramInformation>\n");
if (c->utc_timing_url)
avio_printf(out, "\t<UTCTiming schemeIdUri=\"urn:mpeg:dash:utc:http-xsdate:2014\" value=\"%s\"/>\n", c->utc_timing_url);
if (c->window_size && s->nb_streams > 0 && c->streams[0].nb_segments > 0 && !c->use_template) { if (c->window_size && s->nb_streams > 0 && c->streams[0].nb_segments > 0 && !c->use_template) {
OutputStream *os = &c->streams[0]; OutputStream *os = &c->streams[0];
...@@ -646,6 +644,10 @@ static int write_manifest(AVFormatContext *s, int final) ...@@ -646,6 +644,10 @@ static int write_manifest(AVFormatContext *s, int final)
return ret; return ret;
} }
avio_printf(out, "\t</Period>\n"); avio_printf(out, "\t</Period>\n");
if (c->utc_timing_url)
avio_printf(out, "\t<UTCTiming schemeIdUri=\"urn:mpeg:dash:utc:http-xsdate:2014\" value=\"%s\"/>\n", c->utc_timing_url);
avio_printf(out, "</MPD>\n"); avio_printf(out, "</MPD>\n");
avio_flush(out); avio_flush(out);
ff_format_io_close(s, &out); ff_format_io_close(s, &out);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment