From: <en...@ke...> - 2006-04-28 18:55:32
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: ensonic Date: Fri Apr 28 2006 18:55:29 UTC Log message: * gst/gstbin.c: * gst/gstpipeline.c: * plugins/elements/gstcapsfilter.c: * plugins/elements/gstfakesink.c: * plugins/elements/gstfakesrc.c: * plugins/elements/gstfdsink.c: * plugins/elements/gstfdsrc.c: * plugins/elements/gstfilesink.c: * plugins/elements/gstfilesrc.c: * plugins/elements/gstidentity.c: * plugins/elements/gstqueue.c: * plugins/elements/gsttee.c: * plugins/elements/gsttypefindelement.c: (gst_type_find_element_handle_event): make GstElementDetails const Modified files: . : ChangeLog gst : gstbin.c gstpipeline.c plugins/elements: gstcapsfilter.c gstfakesink.c gstfakesrc.c gstfdsink.c gstfdsrc.c gstfilesink.c gstfilesrc.c gstidentity.c gstqueue.c gsttee.c gsttypefindelement.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2456&r2=1.2457 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.332&r2=1.333 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpipeline.c.diff?r1=1.134&r2=1.135 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstcapsfilter.c.diff?r1=1.20&r2=1.21 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfakesink.c.diff?r1=1.99&r2=1.100 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfakesrc.c.diff?r1=1.125&r2=1.126 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfdsink.c.diff?r1=1.36&r2=1.37 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfdsrc.c.diff?r1=1.59&r2=1.60 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfilesink.c.diff?r1=1.74&r2=1.75 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfilesrc.c.diff?r1=1.131&r2=1.132 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstidentity.c.diff?r1=1.100&r2=1.101 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstqueue.c.diff?r1=1.179&r2=1.180 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gsttee.c.diff?r1=1.75&r2=1.76 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gsttypefindelement.c.diff?r1=1.78&r2=1.79 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2456 retrieving revision 1.2457 diff -u -d -r1.2456 -r1.2457 --- ChangeLog 28 Apr 2006 18:48:38 -0000 1.2456 +++ ChangeLog 28 Apr 2006 18:55:16 -0000 1.2457 @@ -1,5 +1,23 @@ 2006-04-28 Stefan Kost <en...@us...> + * gst/gstbin.c: + * gst/gstpipeline.c: + * plugins/elements/gstcapsfilter.c: + * plugins/elements/gstfakesink.c: + * plugins/elements/gstfakesrc.c: + * plugins/elements/gstfdsink.c: + * plugins/elements/gstfdsrc.c: + * plugins/elements/gstfilesink.c: + * plugins/elements/gstfilesrc.c: + * plugins/elements/gstidentity.c: + * plugins/elements/gstqueue.c: + * plugins/elements/gsttee.c: + * plugins/elements/gsttypefindelement.c: + (gst_type_find_element_handle_event): + make GstElementDetails const + +2006-04-28 Stefan Kost <en...@us...> * libs/gst/base/gstbasesink.c: (gst_base_sink_event): * libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init), (gst_collect_pads_is_collected), (gst_collect_pads_event): @@ -21,8 +39,6 @@ 2006-04-28 Wim Taymans <wi...@fl...> - Patch by: Topi Paavola - * gst/gstutils.c: (push_and_ref): Added some more docs. Fix refcount issue whith gst_element_found_tags() helper Index: gstbin.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v retrieving revision 1.332 retrieving revision 1.333 diff -u -d -r1.332 -r1.333 --- gstbin.c 28 Apr 2006 13:04:07 -0000 1.332 +++ gstbin.c 28 Apr 2006 18:55:17 -0000 1.333 @@ -167,7 +167,8 @@ GST_DEBUG_CATEGORY_STATIC (bin_debug); #define GST_CAT_DEFAULT bin_debug -static GstElementDetails gst_bin_details = GST_ELEMENT_DETAILS ("Generic bin", +static const GstElementDetails gst_bin_details = +GST_ELEMENT_DETAILS ("Generic bin", "Generic/Bin", "Simple container object", "Erik Walthinsen <om...@cs...>," "Wim Taymans <wi...@fl...>"); @@ -1895,7 +1896,9 @@ /* * This function is a utility event handler for seek events. - * It will send the event to all sinks. + * It will send the event to all sinks or sources depending on the + * event-direction. + * * Applications are free to override this behaviour and * implement their own seek handler, but this will work for * pretty much all cases in practice. Index: gstpipeline.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpipeline.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- gstpipeline.c 22 Apr 2006 21:34:23 -0000 1.134 +++ gstpipeline.c 28 Apr 2006 18:55:17 -0000 1.135 @@ -90,7 +90,7 @@ GST_DEBUG_CATEGORY_STATIC (pipeline_debug); #define GST_CAT_DEFAULT pipeline_debug -static GstElementDetails gst_pipeline_details = +static const GstElementDetails gst_pipeline_details = GST_ELEMENT_DETAILS ("Pipeline object", "Complete pipeline object", Index: gstcapsfilter.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstcapsfilter.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gstcapsfilter.c 17 Jan 2006 12:14:20 -0000 1.20 +++ gstcapsfilter.c 28 Apr 2006 18:55:17 -0000 1.21 @@ -29,7 +29,7 @@ #include <gst/base/gstbasetransform.h> -static GstElementDetails gst_capsfilter_details = +static const GstElementDetails gst_capsfilter_details = GST_ELEMENT_DETAILS ("CapsFilter", "Generic", "Pass data without modification, limiting formats", Index: gstfakesink.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfakesink.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- gstfakesink.c 1 Dec 2005 12:29:34 -0000 1.99 +++ gstfakesink.c 28 Apr 2006 18:55:17 -0000 1.100 @@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_fake_sink_debug); #define GST_CAT_DEFAULT gst_fake_sink_debug -static GstElementDetails gst_fake_sink_details = +static const GstElementDetails gst_fake_sink_details = GST_ELEMENT_DETAILS ("Fake Sink", "Sink", "Black hole for data", Index: gstfakesrc.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfakesrc.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- gstfakesrc.c 20 Mar 2006 09:28:41 -0000 1.125 +++ gstfakesrc.c 28 Apr 2006 18:55:17 -0000 1.126 @@ -65,7 +65,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_fake_src_debug); #define GST_CAT_DEFAULT gst_fake_src_debug -static GstElementDetails gst_fake_src_details = +static const GstElementDetails gst_fake_src_details = GST_ELEMENT_DETAILS ("Fake Source", "Source", "Push empty (no data) buffers around", Index: gstfdsink.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfdsink.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- gstfdsink.c 28 Apr 2006 13:16:03 -0000 1.36 +++ gstfdsink.c 28 Apr 2006 18:55:17 -0000 1.37 @@ -88,7 +88,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_fd_sink__debug); #define GST_CAT_DEFAULT gst_fd_sink__debug -static GstElementDetails gst_fd_sink__details = +static const GstElementDetails gst_fd_sink__details = GST_ELEMENT_DETAILS ("Filedescriptor Sink", "Sink/File", "Write data to a file descriptor", Index: gstfdsrc.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfdsrc.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- gstfdsrc.c 8 Apr 2006 20:57:31 -0000 1.59 +++ gstfdsrc.c 28 Apr 2006 18:55:17 -0000 1.60 @@ -78,7 +78,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_fd_src_debug); #define GST_CAT_DEFAULT gst_fd_src_debug -static GstElementDetails gst_fd_src_details = +static const GstElementDetails gst_fd_src_details = GST_ELEMENT_DETAILS ("Disk Source", "Source/File", "Synchronous read from a file", Index: gstfilesink.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfilesink.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- gstfilesink.c 4 Apr 2006 15:45:36 -0000 1.74 +++ gstfilesink.c 28 Apr 2006 18:55:17 -0000 1.75 @@ -52,7 +52,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_file_sink_debug); #define GST_CAT_DEFAULT gst_file_sink_debug -static GstElementDetails gst_file_sink_details = +static const GstElementDetails gst_file_sink_details = GST_ELEMENT_DETAILS ("File Sink", "Write stream to a file", Index: gstfilesrc.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfilesrc.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- gstfilesrc.c 23 Feb 2006 10:24:13 -0000 1.131 +++ gstfilesrc.c 28 Apr 2006 18:55:17 -0000 1.132 @@ -116,7 +116,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_file_src_debug); #define GST_CAT_DEFAULT gst_file_src_debug -static GstElementDetails gst_file_src_details = +static const GstElementDetails gst_file_src_details = GST_ELEMENT_DETAILS ("File Source", "Read from arbitrary point in a file", Index: gstidentity.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstidentity.c,v retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- gstidentity.c 24 Mar 2006 10:38:20 -0000 1.100 +++ gstidentity.c 28 Apr 2006 18:55:17 -0000 1.101 @@ -45,7 +45,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_identity_debug); #define GST_CAT_DEFAULT gst_identity_debug -static GstElementDetails gst_identity_details = GST_ELEMENT_DETAILS ("Identity", +static const GstElementDetails gst_identity_details = +GST_ELEMENT_DETAILS ("Identity", "Pass data without modification", "Erik Walthinsen <om...@cs...>"); Index: gstqueue.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstqueue.c,v retrieving revision 1.179 retrieving revision 1.180 diff -u -d -r1.179 -r1.180 --- gstqueue.c 29 Mar 2006 11:02:33 -0000 1.179 +++ gstqueue.c 28 Apr 2006 18:55:17 -0000 1.180 @@ -76,7 +76,7 @@ queue->max_size.time, \ queue->queue->length) -static GstElementDetails gst_queue_details = GST_ELEMENT_DETAILS ("Queue", +static const GstElementDetails gst_queue_details = GST_ELEMENT_DETAILS ("Queue", "Simple data queue", Index: gsttee.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gsttee.c,v retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- gsttee.c 24 Mar 2006 10:38:20 -0000 1.75 +++ gsttee.c 28 Apr 2006 18:55:17 -0000 1.76 @@ -45,7 +45,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_tee_debug); #define GST_CAT_DEFAULT gst_tee_debug -static GstElementDetails gst_tee_details = +static const GstElementDetails gst_tee_details = GST_ELEMENT_DETAILS ("Tee pipe fitting", "1-to-N pipe fitting", Index: gsttypefindelement.c RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gsttypefindelement.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- gsttypefindelement.c 28 Apr 2006 13:43:03 -0000 1.78 +++ gsttypefindelement.c 28 Apr 2006 18:55:17 -0000 1.79 @@ -63,7 +63,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_type_find_element_debug); #define GST_CAT_DEFAULT gst_type_find_element_debug -static GstElementDetails gst_type_find_element_details = +static const GstElementDetails gst_type_find_element_details = GST_ELEMENT_DETAILS ("TypeFind", "Finds the media type of a stream", @@ -476,16 +476,17 @@ if (typefind->store) { caps = gst_type_find_helper_for_buffer (GST_OBJECT (typefind), typefind->store, &prob); - } - if (caps && prob >= typefind->min_probability) { - g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], - 0, prob, caps); - } else { - GST_ELEMENT_ERROR (typefind, STREAM, TYPE_NOT_FOUND, - (NULL), (NULL)); + if (caps && prob >= typefind->min_probability) { + g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], + 0, prob, caps); + } else { + GST_ELEMENT_ERROR (typefind, STREAM, TYPE_NOT_FOUND, + (NULL), (NULL)); + } + gst_caps_replace (&caps, NULL); } - gst_caps_replace (&caps, NULL); stop_typefinding (typefind); res = gst_pad_event_default (pad, event); break; |