From 9a1ed4d0120ae67acb8beeb3fe92fc98087af0f7 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 8 Feb 2006 15:50:08 +0000 Subject: [PATCH] gst/tcp/gsttcpclientsrc.c: Revert Andy's newsegment change pending a more correct fix. Original commit message from CVS: * gst/tcp/gsttcpclientsrc.c: (gst_tcp_client_src_create): Revert Andy's newsegment change pending a more correct fix. --- ChangeLog | 6 ++++++ gst/tcp/gsttcpclientsrc.c | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4799d2e87..040a891fbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-08 Jan Schmidt + + * gst/tcp/gsttcpclientsrc.c: (gst_tcp_client_src_create): + Revert Andy's newsegment change pending a more correct + fix. + 2006-02-08 Thomas Vander Stichele * gst/typefind/gsttypefindfunctions.c: (q3gp_type_find), diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c index 693935599e..081a793224 100644 --- a/gst/tcp/gsttcpclientsrc.c +++ b/gst/tcp/gsttcpclientsrc.c @@ -194,7 +194,6 @@ gst_tcp_client_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) { GstTCPClientSrc *src; GstFlowReturn ret = GST_FLOW_OK; - GstBaseSrc *bsrc = GST_BASE_SRC (psrc); src = GST_TCP_CLIENT_SRC (psrc); @@ -228,21 +227,6 @@ gst_tcp_client_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) ret = gst_tcp_gdp_read_buffer (GST_ELEMENT (src), src->sock_fd, READ_SOCKET (src), outbuf); - - if (G_UNLIKELY (bsrc->segment.format != GST_FORMAT_TIME) - && G_LIKELY (ret == GST_FLOW_OK) - && G_LIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (*outbuf))) { - /* switch our format to time */ - gst_base_src_set_format (bsrc, GST_FORMAT_TIME); - gst_segment_set_newsegment (&bsrc->segment, FALSE, 1.0, - GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (*outbuf), -1, 0); - - gst_pad_push_event (bsrc->srcpad, - gst_event_new_new_segment (FALSE, - bsrc->segment.rate, bsrc->segment.format, - bsrc->segment.start, bsrc->segment.stop, bsrc->segment.time)); - } - break; default: /* need to assert as buf == NULL */