Commit b410c69f authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by Michael Niedermayer

webmdashenc: Fix UTCTiming Element

Remove the direct profile from UTCTiming element. Per DASH spec,
direct profile value should be the time at which the request was
made to the server and not the time at which the manifest was
written. So ffmpeg cannot write this value. This patch removes
the direct profile and write the UTCTiming element with the http
profile only if a URL is passed as a parameter. Update the fate
test to reflect this change.
Signed-off-by: 's avatarVignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 464c4915
...@@ -119,11 +119,11 @@ static void write_header(AVFormatContext *s) ...@@ -119,11 +119,11 @@ static void write_header(AVFormatContext *s)
avio_printf(s->pb, " timeShiftBufferDepth=\"PT%gS\"\n", w->time_shift_buffer_depth); avio_printf(s->pb, " timeShiftBufferDepth=\"PT%gS\"\n", w->time_shift_buffer_depth);
avio_printf(s->pb, " minimumUpdatePeriod=\"PT%dS\"", w->minimum_update_period); avio_printf(s->pb, " minimumUpdatePeriod=\"PT%dS\"", w->minimum_update_period);
avio_printf(s->pb, ">\n"); avio_printf(s->pb, ">\n");
avio_printf(s->pb, "<UTCTiming\n"); if (w->utc_timing_url) {
avio_printf(s->pb, " schemeIdUri=\"%s\"\n", avio_printf(s->pb, "<UTCTiming\n");
w->utc_timing_url ? "urn:mpeg:dash:utc:http-iso:2014" : "urn:mpeg:dash:utc:direct:2012"); avio_printf(s->pb, " schemeIdUri=\"urn:mpeg:dash:utc:http-iso:2014\"\n");
avio_printf(s->pb, " value=\"%s\"/>\n", avio_printf(s->pb, " value=\"%s\"/>\n", w->utc_timing_url);
w->utc_timing_url ? w->utc_timing_url : gmt_iso); }
} }
} }
......
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
availabilityStartTime="" availabilityStartTime=""
timeShiftBufferDepth="PT7200S" timeShiftBufferDepth="PT7200S"
minimumUpdatePeriod="PT60S"> minimumUpdatePeriod="PT60S">
<UTCTiming
schemeIdUri="urn:mpeg:dash:utc:direct:2012"
value=""/>
<Period id="0" start="PT0S" > <Period id="0" start="PT0S" >
<AdaptationSet id="0" mimeType="video/webm" codecs="vp9" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1"> <AdaptationSet id="0" mimeType="video/webm" codecs="vp9" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
<ContentComponent id="1" type="video"/> <ContentComponent id="1" type="video"/>
......
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