Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added fix for adder element, to report time positions properly 

see http://bugzilla.gnome.org/show_bug.cgi?id=315457
This commit is contained in:
maroy 2005-09-07 13:53:25 +00:00
parent 514ad3c7ae
commit 7faa025d4a
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh
View File

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.4 $ # Version : $Revision: 1.5 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -71,6 +71,9 @@ if [ ! -d $plugins ]; then
# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=309218 # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=309218
# for details on the following patch # for details on the following patch
patch -p1 < ${etcdir}/adder-duration-fix.patch patch -p1 < ${etcdir}/adder-duration-fix.patch
# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=315457
# for details on the following patch
patch -p1 < ${etcdir}/adder-query.patch
# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308167 # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308167
# for details on the following patch # for details on the following patch
patch -p1 < ${etcdir}/switch-fix.patch patch -p1 < ${etcdir}/switch-fix.patch

54
livesupport/tools/gstreamer/gstreamer-0.8.10/etc/adder-query.patch Normal file
View File

@ -0,0 +1,54 @@
--- gst-plugins-0.8.10/gst/adder/gstadder.c 2005-09-07 16:24:18.000000000 +0200
+++ gst-plugins-0.8.10-livesupport/gst/adder/gstadder.c 2005-09-07 16:22:40.000000000 +0200
@@ -107,6 +107,11 @@
const GstCaps * caps);
static GstCaps *gst_adder_get_caps (GstPad * pad);
+static gboolean gst_adder_query(GstPad * pad,
+ GstQueryType type,
+ GstFormat * format,
+ gint64 * value);
+
static GstElementClass *parent_class = NULL;
/* static guint gst_adder_signals[LAST_SIGNAL] = { 0 }; */
@@ -283,6 +288,7 @@
gst_element_set_loop_function (GST_ELEMENT (adder), gst_adder_loop);
gst_pad_set_getcaps_function (adder->srcpad, gst_adder_get_caps);
gst_pad_set_link_function (adder->srcpad, gst_adder_link);
+ gst_pad_set_query_function (adder->srcpad, gst_adder_query);
adder->format = GST_ADDER_FORMAT_UNSET;
@@ -654,6 +660,31 @@
}
+static gboolean gst_adder_query(GstPad * pad,
+ GstQueryType type,
+ GstFormat * format,
+ gint64 * value)
+{
+ GstAdder * adder;
+
+ adder = GST_ADDER(gst_pad_get_parent(pad));
+ if (!GST_IS_ADDER(adder)) {
+ return FALSE;
+ }
+
+ if (pad != adder->srcpad) {
+ return gst_pad_query_default(pad, type, format, value);
+ }
+
+ if (type != GST_QUERY_POSITION || *format != GST_FORMAT_TIME) {
+ return gst_pad_query_default(pad, type, format, value);
+ }
+
+ *value = adder->timestamp;
+ return TRUE;
+}
+
+
static GstElementStateReturn
gst_adder_change_state (GstElement * element)
{