From fa55f0feafc5490503b4e259882c8bbcde40f41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 6 Dec 2007 12:29:26 +0000 Subject: gst/filter/: Sync the GObject properties with the controller even in passthrough mode to get consistent property values. Original commit message from CVS: * gst/filter/gstbpwsinc.c: (bpwsinc_transform): * gst/filter/gstlpwsinc.c: (lpwsinc_transform): Sync the GObject properties with the controller even in passthrough mode to get consistent property values. --- ChangeLog | 8 ++++++++ gst/filter/gstbpwsinc.c | 9 ++++----- gst/filter/gstlpwsinc.c | 8 ++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index af39c73f..e838659f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-06 Sebastian Dröge + + * gst/filter/gstbpwsinc.c: (bpwsinc_transform): + * gst/filter/gstlpwsinc.c: (lpwsinc_transform): + Sync the GObject properties with the controller even in passthrough + mode to get consistent property values. + 2007-12-06 Tim-Philipp Müller * gst/mpegtsparse/mpegtsparse.c: (crc_tab): @@ -21,6 +28,7 @@ * sys/dvb/dvbbasebin.c: Make sure initial pids are added properly to filter, +>>>>>>> 1.2909 2007-12-05 Andy Wingo * gst/switch/gstswitch.c (gst_switch_set_property): Don't push diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c index c11bd59a..24a89abd 100644 --- a/gst/filter/gstbpwsinc.c +++ b/gst/filter/gstbpwsinc.c @@ -590,16 +590,15 @@ bpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, gint output_samples = input_samples; gint diff; - /* don't process data in passthrough-mode */ - if (gst_base_transform_is_passthrough (base)) - return GST_FLOW_OK; - /* FIXME: subdivide GST_BUFFER_SIZE into small chunks for smooth fades */ timestamp = GST_BUFFER_TIMESTAMP (outbuf); - if (GST_CLOCK_TIME_IS_VALID (timestamp)) gst_object_sync_values (G_OBJECT (self), timestamp); + /* don't process data in passthrough-mode */ + if (gst_base_transform_is_passthrough (base)) + return GST_FLOW_OK; + if (!self->have_kernel) bpwsinc_build_kernel (self); diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c index 32de5f06..b4053714 100644 --- a/gst/filter/gstlpwsinc.c +++ b/gst/filter/gstlpwsinc.c @@ -531,15 +531,15 @@ lpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, gint output_samples = input_samples; gint diff; - /* don't process data in passthrough-mode */ - if (gst_base_transform_is_passthrough (base)) - return GST_FLOW_OK; - /* FIXME: subdivide GST_BUFFER_SIZE into small chunks for smooth fades */ timestamp = GST_BUFFER_TIMESTAMP (outbuf); if (GST_CLOCK_TIME_IS_VALID (timestamp)) gst_object_sync_values (G_OBJECT (self), timestamp); + /* don't process data in passthrough-mode */ + if (gst_base_transform_is_passthrough (base)) + return GST_FLOW_OK; + if (!self->have_kernel) lpwsinc_build_kernel (self); -- cgit v1.2.1