mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove redundant push_mode struct member

Browse source
This commit is contained in:
Sebastian Dröge 2009-01-30 14:35:40 +01:00
parent 74fc2b1227
commit 2744324adc
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/asfdemux/asfpacket.c
View file

@ -127,7 +127,7 @@ gst_asf_payload_queue_for_stream (GstASFDemux * demux, AsfPayload * payload,
GST_DEBUG_OBJECT (demux, "first ts: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (demux, "first ts: %" GST_TIME_FORMAT,
GST_TIME_ARGS (payload->ts)); GST_TIME_ARGS (payload->ts));
demux->first_ts = payload->ts; demux->first_ts = payload->ts;
if (demux->push_mode) { if (demux->streaming) {
gst_segment_set_seek (&demux->segment, demux->segment.rate, gst_segment_set_seek (&demux->segment, demux->segment.rate,
GST_FORMAT_TIME, demux->segment.flags, GST_SEEK_TYPE_SET, GST_FORMAT_TIME, demux->segment.flags, GST_SEEK_TYPE_SET,
demux->first_ts, GST_SEEK_TYPE_NONE, 0, NULL); demux->first_ts, GST_SEEK_TYPE_NONE, 0, NULL);
@ -145,7 +145,7 @@ gst_asf_payload_queue_for_stream (GstASFDemux * demux, AsfPayload * payload,
} }
/* make timestamps start from 0 */ /* make timestamps start from 0 */
if (!demux->push_mode) if (!demux->streaming)
payload->ts -= demux->first_ts; payload->ts -= demux->first_ts;
/* remove any incomplete payloads that will never be completed */ /* remove any incomplete payloads that will never be completed */

4
gst/asfdemux/gstasfdemux.c
View file

@ -261,7 +261,6 @@ gst_asf_demux_activate_push (GstPad * sinkpad, gboolean active)
demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (sinkpad)); demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (sinkpad));
demux->push_mode = TRUE;
demux->state = GST_ASF_DEMUX_STATE_HEADER; demux->state = GST_ASF_DEMUX_STATE_HEADER;
demux->streaming = TRUE; demux->streaming = TRUE;
@ -274,7 +273,6 @@ gst_asf_demux_activate_pull (GstPad * pad, gboolean active)
GstASFDemux *demux; GstASFDemux *demux;
demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (pad)); demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (pad));
demux->push_mode = FALSE;
if (active) { if (active) {
demux->state = GST_ASF_DEMUX_STATE_HEADER; demux->state = GST_ASF_DEMUX_STATE_HEADER;
@ -466,7 +464,7 @@ gst_asf_demux_handle_seek_event (GstASFDemux * demux, GstEvent * event)
accurate = ((flags & GST_SEEK_FLAG_ACCURATE) == GST_SEEK_FLAG_ACCURATE); accurate = ((flags & GST_SEEK_FLAG_ACCURATE) == GST_SEEK_FLAG_ACCURATE);
keyunit_sync = ((flags & GST_SEEK_FLAG_KEY_UNIT) == GST_SEEK_FLAG_KEY_UNIT); keyunit_sync = ((flags & GST_SEEK_FLAG_KEY_UNIT) == GST_SEEK_FLAG_KEY_UNIT);
if (demux->push_mode) { if (demux->streaming) {
gst_event_ref (event); gst_event_ref (event);
return gst_pad_push_event (demux->sinkpad, event); return gst_pad_push_event (demux->sinkpad, event);
} }

1
gst/asfdemux/gstasfdemux.h
View file

@ -171,7 +171,6 @@ struct _GstASFDemux {
gboolean need_newsegment; /* do we need to send a new-segment event? */ gboolean need_newsegment; /* do we need to send a new-segment event? */
gboolean segment_running; /* if we've started the current segment */ gboolean segment_running; /* if we've started the current segment */
gboolean streaming; /* TRUE if we are operating chain-based */ gboolean streaming; /* TRUE if we are operating chain-based */
gboolean push_mode; /* are we operating in push_mode? */
/* Descrambler settings */ /* Descrambler settings */
guint8 span; guint8 span;