mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 18:14:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegdemux: refactor segment sending

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-10-11 11:51:50 +02:00
parent aca6237b3e
commit 20cd96f5c3
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gst/mpegdemux/gstmpegdemux.c
View file

@ -501,23 +501,10 @@ unknown_stream:
} }
} }
static GstFlowReturn static inline void
gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream, gst_flups_demux_send_segment (GstFluPSDemux * demux, GstFluPSStream * stream,
GstBuffer * buf) GstClockTime pts)
{ {
GstFlowReturn result;
GstClockTime pts = GST_CLOCK_TIME_NONE, dts = GST_CLOCK_TIME_NONE;
guint size;
if (stream == NULL)
goto no_stream;
/* timestamps */
if (G_UNLIKELY (demux->next_pts != G_MAXUINT64))
pts = MPEGTIME_TO_GSTTIME (demux->next_pts);
if (G_UNLIKELY (demux->next_dts != G_MAXUINT64))
dts = MPEGTIME_TO_GSTTIME (demux->next_dts);
/* discont */ /* discont */
if (G_UNLIKELY (stream->need_segment)) { if (G_UNLIKELY (stream->need_segment)) {
guint64 time, start, stop; guint64 time, start, stop;
@ -575,6 +562,26 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
stream->need_segment = FALSE; stream->need_segment = FALSE;
} }
}
static GstFlowReturn
gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
GstBuffer * buf)
{
GstFlowReturn result;
GstClockTime pts = GST_CLOCK_TIME_NONE, dts = GST_CLOCK_TIME_NONE;
guint size;
if (stream == NULL)
goto no_stream;
/* timestamps */
if (G_UNLIKELY (demux->next_pts != G_MAXUINT64))
pts = MPEGTIME_TO_GSTTIME (demux->next_pts);
if (G_UNLIKELY (demux->next_dts != G_MAXUINT64))
dts = MPEGTIME_TO_GSTTIME (demux->next_dts);
gst_flups_demux_send_segment (demux, stream, pts);
/* OK, sent new segment now prepare the buffer for sending */ /* OK, sent new segment now prepare the buffer for sending */
GST_BUFFER_PTS (buf) = pts; GST_BUFFER_PTS (buf) = pts;