mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 20:05:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux2: Symbol hygiene cleanup

Browse source 
Rename track_dequeue_data_locked() to
gst_adaptive_demux_track_dequeue_data_locked(), since it's non-static.

Make find_stream_for_track_locked() static since it's only used in the main
gstadaptivedemux.c file.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Jan Schmidt 2023-01-03 21:15:21 +11:00 committed by GStreamer Marge Bot
parent 6bb74ed2a0
commit 5334007a0b
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-private.h
View file

@ -218,10 +218,7 @@ typedef struct
GstClockTimeDiff runningtime_buffering;
} TrackQueueItem;
GstAdaptiveDemux2Stream *find_stream_for_track_locked (GstAdaptiveDemux *
demux, GstAdaptiveDemuxTrack * track);
GstMiniObject * track_dequeue_data_locked (GstAdaptiveDemux * demux, GstAdaptiveDemuxTrack * track, gboolean check_sticky_events);
GstMiniObject * gst_adaptive_demux_track_dequeue_data_locked (GstAdaptiveDemux * demux, GstAdaptiveDemuxTrack * track, gboolean check_sticky_events);
void gst_adaptive_demux_track_flush (GstAdaptiveDemuxTrack * track);
void gst_adaptive_demux_track_drain_to (GstAdaptiveDemuxTrack * track, GstClockTime drain_running_time);
void gst_adaptive_demux_track_update_next_position (GstAdaptiveDemuxTrack * track);

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

@ -118,7 +118,7 @@ static inline GstClockTimeDiff my_segment_to_running_time (GstSegment * segment,
/* Dequeue or generate a buffer/event from the track queue and update the buffering levels
* TRACKS_LOCK hold */
GstMiniObject *
track_dequeue_data_locked (GstAdaptiveDemux * demux,
gst_adaptive_demux_track_dequeue_data_locked (GstAdaptiveDemux * demux,
GstAdaptiveDemuxTrack * track, gboolean check_sticky_events)
{
GstMiniObject *res = NULL;
@ -371,7 +371,8 @@ gst_adaptive_demux_track_drain_to (GstAdaptiveDemuxTrack * track,
* will be collected by the dequeue function, gaps will be started.
* If it's a buffer, mark the track as discont to get the flag set
* on the next output buffer */
next_mo = track_dequeue_data_locked (demux, track, FALSE);
next_mo =
gst_adaptive_demux_track_dequeue_data_locked (demux, track, FALSE);
if (GST_IS_BUFFER (next_mo)) {
track->output_discont = TRUE;
}

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

@ -1890,7 +1890,7 @@ demux_post_buffering_locked (GstAdaptiveDemux * demux)
}
/* MANIFEST_LOCK and TRACKS_LOCK hold */
GstAdaptiveDemux2Stream *
static GstAdaptiveDemux2Stream *
find_stream_for_track_locked (GstAdaptiveDemux * demux,
GstAdaptiveDemuxTrack * track)
{
@ -3484,7 +3484,8 @@ restart:
|| ((track->next_position != GST_CLOCK_STIME_NONE)
&& track->next_position <= global_output_position)
|| ((track->next_position == GST_CLOCK_STIME_NONE) && track->eos)) {
GstMiniObject *mo = track_dequeue_data_locked (demux, track, TRUE);
GstMiniObject *mo =
gst_adaptive_demux_track_dequeue_data_locked (demux, track, TRUE);
if (!mo) {
GST_DEBUG_OBJECT (demux,