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.
This commit is contained in:
Jan Schmidt 2006-02-08 15:50:08 +00:00
parent ad30e9a138
commit 9a1ed4d012
2 changed files with 6 additions and 16 deletions

View file

@ -1,3 +1,9 @@
2006-02-08 Jan Schmidt <thaytan@mad.scientist.com>
* 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 <thomas at apestaart dot org> 2006-02-08 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/typefind/gsttypefindfunctions.c: (q3gp_type_find), * gst/typefind/gsttypefindfunctions.c: (q3gp_type_find),

View file

@ -194,7 +194,6 @@ gst_tcp_client_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
{ {
GstTCPClientSrc *src; GstTCPClientSrc *src;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstBaseSrc *bsrc = GST_BASE_SRC (psrc);
src = GST_TCP_CLIENT_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, ret = gst_tcp_gdp_read_buffer (GST_ELEMENT (src), src->sock_fd,
READ_SOCKET (src), outbuf); 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; break;
default: default:
/* need to assert as buf == NULL */ /* need to assert as buf == NULL */