mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux2: Remove gst_adaptive_demux2_stream_has_selected_tracks

Browse source 
Use gst_adaptive_demux2_stream_is_selected_locked() instead, which is identical

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Jan Schmidt 2022-12-27 03:46:47 +11:00 committed by GStreamer Marge Bot
parent 8d0c7d9d93
commit d3acafbb5a
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
View file

@ -2170,6 +2170,8 @@ gst_adaptive_demux2_stream_is_running (GstAdaptiveDemux2Stream * stream)
return TRUE; return TRUE;
} }
/* Returns TRUE if the stream has at least one selected track.
* Must be called with the TRACKS_LOCK held */
gboolean gboolean
gst_adaptive_demux2_stream_is_selected_locked (GstAdaptiveDemux2Stream * stream) gst_adaptive_demux2_stream_is_selected_locked (GstAdaptiveDemux2Stream * stream)
{ {

19
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
View file

@ -2363,23 +2363,6 @@ gst_adaptive_demux_handle_seek_event (GstAdaptiveDemux * demux,
return ret; return ret;
} }
/* Returns TRUE if the stream has at least one selected track */
static gboolean
gst_adaptive_demux2_stream_has_selected_tracks (GstAdaptiveDemux2Stream *
stream)
{
GList *tmp;
for (tmp = stream->tracks; tmp; tmp = tmp->next) {
GstAdaptiveDemuxTrack *track = tmp->data;
if (track->selected)
return TRUE;
}
return FALSE;
}
static gboolean static gboolean
handle_stream_selection (GstAdaptiveDemux * demux, GList * streams, handle_stream_selection (GstAdaptiveDemux * demux, GList * streams,
guint32 seqnum) guint32 seqnum)
@ -2448,7 +2431,7 @@ handle_stream_selection (GstAdaptiveDemux * demux, GList * streams,
gboolean is_running = gst_adaptive_demux2_stream_is_running (stream); gboolean is_running = gst_adaptive_demux2_stream_is_running (stream);
gboolean should_be_running = gboolean should_be_running =
gst_adaptive_demux2_stream_has_selected_tracks (stream); gst_adaptive_demux2_stream_is_selected_locked (stream);
if (!is_running && should_be_running) { if (!is_running && should_be_running) {
GstClockTime output_running_ts = demux->priv->global_output_position; GstClockTime output_running_ts = demux->priv->global_output_position;