mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegdemux/gstmpegtsdemux.*: Enable latency code, since we're definitely after 0.10.12

Browse source 
Original commit message from CVS:
* gst/mpegdemux/gstmpegtsdemux.c:
* gst/mpegdemux/gstmpegtsdemux.h:
Enable latency code, since we're definitely after 0.10.12
This commit is contained in:
David Schleef 2008-11-26 04:57:22 +00:00
parent c68ea73e3f
commit 4317cdbec0
3 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-11-25 David Schleef <ds@schleef.org>
* gst/mpegdemux/gstmpegtsdemux.c:
* gst/mpegdemux/gstmpegtsdemux.h:
Enable latency code, since we're definitely after 0.10.12
2008-11-25 Wim Taymans <wim.taymans@collabora.co.uk> 2008-11-25 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Jonathan Matthew <notverysmart at gmail dot com> Patch by: Jonathan Matthew <notverysmart at gmail dot com>

14
gst/mpegdemux/gstmpegtsdemux.c
View file

@ -192,10 +192,8 @@ static gboolean gst_fluts_demux_sink_event (GstPad * pad, GstEvent * event);
static GstFlowReturn gst_fluts_demux_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_fluts_demux_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_fluts_demux_sink_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_fluts_demux_sink_setcaps (GstPad * pad, GstCaps * caps);
#ifdef HAVE_LATENCY
static GstClock *gst_fluts_demux_provide_clock (GstElement * element); static GstClock *gst_fluts_demux_provide_clock (GstElement * element);
static gboolean gst_fluts_demux_src_pad_query (GstPad * pad, GstQuery * query); static gboolean gst_fluts_demux_src_pad_query (GstPad * pad, GstQuery * query);
#endif
static GstStateChangeReturn gst_fluts_demux_change_state (GstElement * element, static GstStateChangeReturn gst_fluts_demux_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
@ -305,9 +303,7 @@ gst_fluts_demux_class_init (GstFluTSDemuxClass * klass)
"or Blue-Ray Format ie .m2ts(192 bytes).", FALSE, G_PARAM_READWRITE)); "or Blue-Ray Format ie .m2ts(192 bytes).", FALSE, G_PARAM_READWRITE));
gstelement_class->change_state = gst_fluts_demux_change_state; gstelement_class->change_state = gst_fluts_demux_change_state;
#ifdef HAVE_LATENCY
gstelement_class->provide_clock = gst_fluts_demux_provide_clock; gstelement_class->provide_clock = gst_fluts_demux_provide_clock;
#endif
} }
static void static void
@ -382,12 +378,10 @@ gst_fluts_demux_reset (GstFluTSDemux * demux)
} }
} }
#ifdef HAVE_LATENCY
if (demux->clock) { if (demux->clock) {
g_object_unref (demux->clock); g_object_unref (demux->clock);
demux->clock = NULL; demux->clock = NULL;
} }
#endif
} }
#if 0 #if 0
@ -669,10 +663,8 @@ gst_fluts_demux_fill_stream (GstFluTSStream * stream, guint8 id,
gst_pad_use_fixed_caps (stream->pad); gst_pad_use_fixed_caps (stream->pad);
gst_pad_set_caps (stream->pad, caps); gst_pad_set_caps (stream->pad, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
#ifdef HAVE_LATENCY
gst_pad_set_query_function (stream->pad, gst_pad_set_query_function (stream->pad,
GST_DEBUG_FUNCPTR (gst_fluts_demux_src_pad_query)); GST_DEBUG_FUNCPTR (gst_fluts_demux_src_pad_query));
#endif
g_free (name); g_free (name);
return TRUE; return TRUE;
@ -740,13 +732,11 @@ gst_fluts_demux_send_new_segment (GstFluTSDemux * demux,
GST_DEBUG_OBJECT (demux, "segment PTS to (%" G_GUINT64_FORMAT ") time: %" GST_DEBUG_OBJECT (demux, "segment PTS to (%" G_GUINT64_FORMAT ") time: %"
G_GUINT64_FORMAT, base_PCR, time); G_GUINT64_FORMAT, base_PCR, time);
#ifdef HAVE_LATENCY
if (demux->clock && demux->clock_base == GST_CLOCK_TIME_NONE) { if (demux->clock && demux->clock_base == GST_CLOCK_TIME_NONE) {
demux->clock_base = gst_clock_get_time (demux->clock); demux->clock_base = gst_clock_get_time (demux->clock);
gst_clock_set_calibration (demux->clock, gst_clock_set_calibration (demux->clock,
gst_clock_get_internal_time (demux->clock), demux->clock_base, 1, 1); gst_clock_get_internal_time (demux->clock), demux->clock_base, 1, 1);
} }
#endif
gst_pad_push_event (stream->pad, gst_pad_push_event (stream->pad,
gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, time, -1, 0)); gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, time, -1, 0));
@ -1686,7 +1676,6 @@ gst_fluts_demux_parse_adaptation_field (GstFluTSStream * stream,
stream->last_PCR = pcr; stream->last_PCR = pcr;
#ifdef HAVE_LATENCY
if (demux->clock && demux->clock_base != GST_CLOCK_TIME_NONE) { if (demux->clock && demux->clock_base != GST_CLOCK_TIME_NONE) {
gdouble r_squared; gdouble r_squared;
GstFluTSStream *PMT_stream; GstFluTSStream *PMT_stream;
@ -1710,7 +1699,6 @@ gst_fluts_demux_parse_adaptation_field (GstFluTSStream * stream,
MPEGTIME_TO_GSTTIME (stream->base_PCR), &r_squared); MPEGTIME_TO_GSTTIME (stream->base_PCR), &r_squared);
} }
} }
#endif
} }
data += 6; data += 6;
} }
@ -2387,7 +2375,6 @@ gst_fluts_demux_sink_event (GstPad * pad, GstEvent * event)
return TRUE; return TRUE;
} }
#ifdef HAVE_LATENCY
static gboolean static gboolean
gst_fluts_demux_provides_clock (GstElement * element) gst_fluts_demux_provides_clock (GstElement * element)
{ {
@ -2464,7 +2451,6 @@ gst_fluts_demux_src_pad_query (GstPad * pad, GstQuery * query)
return res; return res;
} }
#endif
static FORCE_INLINE gint static FORCE_INLINE gint

6
gst/mpegdemux/gstmpegtsdemux.h
View file

@ -53,10 +53,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#if (POST_10_12)
#define HAVE_LATENCY
#endif
#define FLUTS_MIN_PES_BUFFER_SIZE 4 * 1024 #define FLUTS_MIN_PES_BUFFER_SIZE 4 * 1024
#define FLUTS_MAX_PES_BUFFER_SIZE 256 * 1024 #define FLUTS_MAX_PES_BUFFER_SIZE 256 * 1024
@ -207,11 +203,9 @@ struct _GstFluTSDemux {
gboolean need_no_more_pads; gboolean need_no_more_pads;
guint16 packetsize; guint16 packetsize;
gboolean m2ts_mode; gboolean m2ts_mode;
#ifdef HAVE_LATENCY
/* clocking */ /* clocking */
GstClock * clock; GstClock * clock;
GstClockTime clock_base; GstClockTime clock_base;
#endif
}; };
struct _GstFluTSDemuxClass { struct _GstFluTSDemuxClass {