mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: Handle case without an initialization segment

Browse source 
If no initialization segment is defined, then don't print a
critical or a warning, just ignore it.

https://bugzilla.gnome.org/show_bug.cgi?id=701961
This commit is contained in:
Olivier Crête 2013-06-10 18:01:14 -04:00 committed by Thiago Santos
parent 4c89fab390
commit 3f26bb9154
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/dash/gstdashdemux.c
View file

@ -1728,18 +1728,24 @@ gst_dash_demux_get_next_header (GstDashDemux * demux, guint stream_idx)
initializationURL, range_start, range_end);
/* check if we have an index */
if (gst_mpd_client_get_next_header_index (demux->client, &initializationURL,
stream_idx, &range_start, &range_end)) {
GST_INFO_OBJECT (demux, "Fetching index %s %" G_GINT64_FORMAT "-%"
G_GINT64_FORMAT, initializationURL, range_start, range_end);
index_buffer = gst_dash_demux_download_header_fragment (demux, stream_idx,
if (header_buffer
&& gst_mpd_client_get_next_header_index (demux->client,
&initializationURL, stream_idx, &range_start, &range_end)) {
GST_INFO_OBJECT (demux,
"Fetching index %s %" G_GINT64_FORMAT "-%" G_GINT64_FORMAT,
initializationURL, range_start, range_end);
index_buffer =
gst_dash_demux_download_header_fragment (demux, stream_idx,
initializationURL, range_start, range_end);
}
if (index_buffer && header_buffer) {
if (header_buffer == NULL) {
GST_WARNING_OBJECT (demux, "Unable to fetch header");
return NULL;
}
if (index_buffer) {
header_buffer = gst_buffer_append (header_buffer, index_buffer);
} else if (index_buffer) {
gst_buffer_unref (index_buffer);
}
return header_buffer;
@ -1975,9 +1981,7 @@ gst_dash_demux_get_next_fragment (GstDashDemux * demux)
if (selected_stream->need_header) {
/* We need to fetch a new header */
if ((header_buffer =
gst_dash_demux_get_next_header (demux, stream_idx)) == NULL) {
GST_WARNING_OBJECT (demux, "Unable to fetch header");
} else {
gst_dash_demux_get_next_header (demux, stream_idx)) != NULL) {
buffer = gst_buffer_append (header_buffer, buffer);
}
selected_stream->need_header = FALSE;

8
ext/dash/gstmpdparser.c
View file

@ -3437,9 +3437,11 @@ gst_mpd_client_get_next_header (GstMpdClient * client, gchar ** uri,
&& stream_period->period->SegmentTemplate->initialization) {
initialization = stream_period->period->SegmentTemplate->initialization;
}
*uri = gst_mpdparser_build_URL_from_template (initialization,
stream->cur_representation->id, 0,
stream->cur_representation->bandwidth, 0);
if (initialization) {
*uri = gst_mpdparser_build_URL_from_template (initialization,
stream->cur_representation->id, 0,
stream->cur_representation->bandwidth, 0);
}
}
GST_MPD_CLIENT_UNLOCK (client);