FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mssdemux: seeks in the manifest never fail

Browse Source 
Set void as the return and remove error handling as it could
never fail
This commit is contained in:
Thiago Santos 2014-11-07 19:30:18 -03:00
parent 39ba21619e
commit 613b110b25
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/smoothstreaming/gstmssdemux.c
View File

@ -607,10 +607,7 @@ gst_mss_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_mss_demux_stop_tasks (mssdemux, TRUE); gst_mss_demux_stop_tasks (mssdemux, TRUE);
if (!gst_mss_manifest_seek (mssdemux->manifest, start)) {; gst_mss_manifest_seek (mssdemux->manifest, start);
GST_WARNING_OBJECT (mssdemux, "Could not find seeked fragment");
goto not_supported;
}
for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) { for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
GstMssDemuxStream *stream = iter->data; GstMssDemuxStream *stream = iter->data;

11
ext/smoothstreaming/gstmssmanifest.c
View File

@ -897,17 +897,14 @@ gst_mss_stream_type_name (GstMssStreamType streamtype)
* *
* @time: time in nanoseconds * @time: time in nanoseconds
*/ */
gboolean void
gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time) gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time)
{ {
gboolean ret = TRUE;
GSList *iter; GSList *iter;
for (iter = manifest->streams; iter; iter = g_slist_next (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 * @time: time in nanoseconds
*/ */
gboolean void
gst_mss_stream_seek (GstMssStream * stream, guint64 time) gst_mss_stream_seek (GstMssStream * stream, guint64 time)
{ {
GList *iter; GList *iter;
@ -943,8 +940,6 @@ gst_mss_stream_seek (GstMssStream * stream, guint64 time)
break; break;
} }
} }
return TRUE;
} }
guint64 guint64

4
ext/smoothstreaming/gstmssmanifest.h
View File

@ -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_timescale (GstMssManifest * manifest);
guint64 gst_mss_manifest_get_duration (GstMssManifest * manifest); guint64 gst_mss_manifest_get_duration (GstMssManifest * manifest);
GstClockTime gst_mss_manifest_get_gst_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); gboolean gst_mss_manifest_change_bitrate (GstMssManifest *manifest, guint64 bitrate);
guint64 gst_mss_manifest_get_current_bitrate (GstMssManifest * manifest); guint64 gst_mss_manifest_get_current_bitrate (GstMssManifest * manifest);
gboolean gst_mss_manifest_is_live (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_timestamp (GstMssStream * stream);
GstClockTime gst_mss_stream_get_fragment_gst_duration (GstMssStream * stream); GstClockTime gst_mss_stream_get_fragment_gst_duration (GstMssStream * stream);
GstFlowReturn gst_mss_stream_advance_fragment (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_get_lang (GstMssStream * stream);
const gchar * gst_mss_stream_type_name (GstMssStreamType streamtype); const gchar * gst_mss_stream_type_name (GstMssStreamType streamtype);