diff options
author | Thiago Santos <thiagoss@osg.samsung.com> | 2014-11-07 19:30:18 -0300 |
---|---|---|
committer | Thiago Santos <thiagoss@osg.samsung.com> | 2014-11-07 19:30:18 -0300 |
commit | 613b110b25ab9dfc3580ffd07fc4e8738aa0e209 (patch) | |
tree | db45021caa5987e3b4a4c1fffff0c9594444d221 /ext/smoothstreaming | |
parent | 39ba21619eef0f5b3c48f129696070652a1c8a82 (diff) | |
download | gstreamer-plugins-bad-613b110b25ab9dfc3580ffd07fc4e8738aa0e209.tar.gz |
mssdemux: seeks in the manifest never fail
Set void as the return and remove error handling as it could
never fail
Diffstat (limited to 'ext/smoothstreaming')
-rw-r--r-- | ext/smoothstreaming/gstmssdemux.c | 5 | ||||
-rw-r--r-- | ext/smoothstreaming/gstmssmanifest.c | 11 | ||||
-rw-r--r-- | ext/smoothstreaming/gstmssmanifest.h | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c index 5028c3930..f7a5265a7 100644 --- a/ext/smoothstreaming/gstmssdemux.c +++ b/ext/smoothstreaming/gstmssdemux.c @@ -607,10 +607,7 @@ gst_mss_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event) gst_mss_demux_stop_tasks (mssdemux, TRUE); - if (!gst_mss_manifest_seek (mssdemux->manifest, start)) {; - GST_WARNING_OBJECT (mssdemux, "Could not find seeked fragment"); - goto not_supported; - } + gst_mss_manifest_seek (mssdemux->manifest, start); for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) { GstMssDemuxStream *stream = iter->data; diff --git a/ext/smoothstreaming/gstmssmanifest.c b/ext/smoothstreaming/gstmssmanifest.c index 63519d39f..9f2c681bf 100644 --- a/ext/smoothstreaming/gstmssmanifest.c +++ b/ext/smoothstreaming/gstmssmanifest.c @@ -897,17 +897,14 @@ gst_mss_stream_type_name (GstMssStreamType streamtype) * * @time: time in nanoseconds */ -gboolean +void gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time) { - gboolean ret = TRUE; GSList *iter; for (iter = manifest->streams; iter; iter = g_slist_next (iter)) { - ret = gst_mss_stream_seek (iter->data, time) & ret; + gst_mss_stream_seek (iter->data, time); } - - return ret; } /** @@ -915,7 +912,7 @@ gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time) * * @time: time in nanoseconds */ -gboolean +void gst_mss_stream_seek (GstMssStream * stream, guint64 time) { GList *iter; @@ -943,8 +940,6 @@ gst_mss_stream_seek (GstMssStream * stream, guint64 time) break; } } - - return TRUE; } guint64 diff --git a/ext/smoothstreaming/gstmssmanifest.h b/ext/smoothstreaming/gstmssmanifest.h index 8db1e67c5..9969f77fc 100644 --- a/ext/smoothstreaming/gstmssmanifest.h +++ b/ext/smoothstreaming/gstmssmanifest.h @@ -44,7 +44,7 @@ GSList * gst_mss_manifest_get_streams (GstMssManifest * manifest); guint64 gst_mss_manifest_get_timescale (GstMssManifest * manifest); guint64 gst_mss_manifest_get_duration (GstMssManifest * manifest); GstClockTime gst_mss_manifest_get_gst_duration (GstMssManifest * manifest); -gboolean gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time); +void gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time); gboolean gst_mss_manifest_change_bitrate (GstMssManifest *manifest, guint64 bitrate); guint64 gst_mss_manifest_get_current_bitrate (GstMssManifest * manifest); gboolean gst_mss_manifest_is_live (GstMssManifest * manifest); @@ -60,7 +60,7 @@ GstFlowReturn gst_mss_stream_get_fragment_url (GstMssStream * stream, gchar ** u GstClockTime gst_mss_stream_get_fragment_gst_timestamp (GstMssStream * stream); GstClockTime gst_mss_stream_get_fragment_gst_duration (GstMssStream * stream); GstFlowReturn gst_mss_stream_advance_fragment (GstMssStream * stream); -gboolean gst_mss_stream_seek (GstMssStream * stream, guint64 time); +void gst_mss_stream_seek (GstMssStream * stream, guint64 time); const gchar * gst_mss_stream_get_lang (GstMssStream * stream); const gchar * gst_mss_stream_type_name (GstMssStreamType streamtype); |