From: Benjamin O. <co...@pd...> - 2004-02-04 22:15:07
|
CVS Root: /home/cvs/gstreamer Module: gstreamer Changes by: company Date: Wed Feb 04 2004 14:16:42 PST Log message: 2004-02-04 Benjamin Otte <in...@pu...> * gst/autoplug/gstspideridentity.c: (gst_spider_identity_sink_loop_type_finding): use get_allowed_caps, not get_caps (fixes #132519) * gst/elements/gsttypefind.c: (stop_typefinding): use correct order when sending buffers and seeking Modified files: . : ChangeLog gst/autoplug : gstspideridentity.c gst/elements : gsttypefind.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.201&r2=1.202 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/autoplug/gstspideridentity.c.diff?r1=1.55&r2=1.56 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gsttypefind.c.diff?r1=1.17&r2=1.18 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -u -d -r1.201 -r1.202 --- ChangeLog 4 Feb 2004 21:35:39 -0000 1.201 +++ ChangeLog 4 Feb 2004 22:16:30 -0000 1.202 @@ -1,3 +1,11 @@ +2004-02-04 Benjamin Otte <in...@pu...> + + * gst/autoplug/gstspideridentity.c: + (gst_spider_identity_sink_loop_type_finding): + use get_allowed_caps, not get_caps (fixes #132519) + * gst/elements/gsttypefind.c: (stop_typefinding): + use correct order when sending buffers and seeking + 2004-02-04 Thomas Vander Stichele <thomas at apestaart dot org> * configure.ac: Index: gstspideridentity.c =================================================================== RCS file: /home/cvs/gstreamer/gstreamer/gst/autoplug/gstspideridentity.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- gstspideridentity.c 31 Jan 2004 19:30:31 -0000 1.55 +++ gstspideridentity.c 4 Feb 2004 22:16:30 -0000 1.56 @@ -471,8 +471,8 @@ find.buffer = GST_BUFFER (data); /* maybe there are already valid caps now? */ - find.caps = gst_pad_get_caps (ident->sink); - if (! gst_caps_is_empty (find.caps) && !gst_caps_is_any (find.caps)) { + find.caps = gst_pad_get_allowed_caps (ident->sink); + if (!gst_caps_is_empty (find.caps) && !gst_caps_is_any (find.caps)) { goto plug; } else { gst_caps_free (find.caps); Index: gsttypefind.c =================================================================== RCS file: /home/cvs/gstreamer/gstreamer/gst/elements/gsttypefind.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- gsttypefind.c 3 Feb 2004 22:13:13 -0000 1.17 +++ gsttypefind.c 4 Feb 2004 22:16:30 -0000 1.18 @@ -336,16 +336,17 @@ GstBuffer *buffer; guint size = gst_buffer_store_get_size (typefind->store, 0); - GST_LOG_OBJECT (typefind, "seeking back to current position %u", size); - if (!gst_pad_send_event (GST_PAD_PEER (typefind->sink), - gst_event_new_seek (GST_SEEK_METHOD_SET | GST_FORMAT_BYTES, size))) { - GST_WARNING_OBJECT (typefind, "could not seek to required position %u, hope for the best", size); - } if (size && (buffer = gst_buffer_store_get_buffer (typefind->store, 0, size))) { + GST_LOG_OBJECT (typefind, "pushing cached data (%u bytes)", size); gst_pad_push (typefind->src, GST_DATA (buffer)); } else { size = 0; } + GST_LOG_OBJECT (typefind, "seeking back to current position %u", size); + if (!gst_pad_send_event (GST_PAD_PEER (typefind->sink), + gst_event_new_seek (GST_SEEK_METHOD_SET | GST_FORMAT_BYTES, size))) { + GST_WARNING_OBJECT (typefind, "could not seek to required position %u, hope for the best", size); + } } gst_buffer_store_clear (typefind->store); } |