wtay gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst/volume/ gst-plugins-base/tests/check/elements/
[email protected] Mon, 24 Nov 2008 04:03:25 -0800 (PST)
Newsgroups
gmane.comp.video.gstreamer.cvs
Message-ID
<[email protected] >
CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: wtay
Date: Mon Nov 24 2008 12:03:25 UTC
Log message:
* gst/volume/gstvolume.c: (volume_choose_func),
(volume_update_volume), (gst_volume_set_volume),
(gst_volume_get_volume), (gst_volume_set_mute),
(gst_volume_class_init), (gst_volume_init),
(volume_process_double), (volume_process_float),
(volume_process_int32), (volume_process_int32_clamp),
(volume_process_int24), (volume_process_int24_clamp),
(volume_process_int16), (volume_process_int16_clamp),
(volume_process_int8), (volume_process_int8_clamp), (volume_setup),
(volume_transform_ip), (volume_set_property),
(volume_get_property):
* gst/volume/gstvolume.h:
Cleanup volume, define and use default values.
Recalculate new volume and mute setup before processing. Fixes #561789.
* tests/check/elements/volume.c: (GST_START_TEST), (volume_suite):
Add controller unit test. Patch by: Jonathan Matthew
Fix bogus test that messed with basetransform's internal state.
Modified files:
. : ChangeLog
gst/volume : gstvolume.c gstvolume.h
tests/check/elements: volume.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4207&r2=1.4208
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/volume/gstvolume.c.diff?r1=1.102&r2=1.103
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/volume/gstvolume.h.diff?r1=1.23&r2=1.24
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/elements/volume.c.diff?r1=1.23&r2=1.24
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4207
retrieving revision 1.4208
diff -u -d -r1.4207 -r1.4208
--- ChangeLog 22 Nov 2008 14:44:25 -0000 1.4207
+++ ChangeLog 24 Nov 2008 12:03:09 -0000 1.4208
@@ -1,3 +1,24 @@
+2008-11-24 Wim Taymans <[email protected] >
+
+ * gst/volume/gstvolume.c: (volume_choose_func),
+ (volume_update_volume), (gst_volume_set_volume),
+ (gst_volume_get_volume), (gst_volume_set_mute),
+ (gst_volume_class_init), (gst_volume_init),
+ (volume_process_double), (volume_process_float),
+ (volume_process_int32), (volume_process_int32_clamp),
+ (volume_process_int24), (volume_process_int24_clamp),
+ (volume_process_int16), (volume_process_int16_clamp),
+ (volume_process_int8), (volume_process_int8_clamp), (volume_setup),
+ (volume_transform_ip), (volume_set_property),
+ (volume_get_property):
+ * gst/volume/gstvolume.h:
+ Cleanup volume, define and use default values.
+ Recalculate new volume and mute setup before processing. Fixes #561789.
+ * tests/check/elements/volume.c: (GST_START_TEST), (volume_suite):
+ Add controller unit test. Patch by: Jonathan Matthew
+ Fix bogus test that messed with basetransform's internal state.
2008-11-22 Wim Taymans <[email protected] >
* gst/videorate/gstvideorate.c:
Index: gstvolume.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/volume/gstvolume.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- gstvolume.c 5 Nov 2008 19:18:25 -0000 1.102
+++ gstvolume.c 24 Nov 2008 12:03:11 -0000 1.103
@@ -87,10 +87,12 @@
LAST_SIGNAL
};
+#define DEFAULT_PROP_MUTE FALSE
+#define DEFAULT_PROP_VOLUME 1.0
enum
{
PROP_0,
- PROP_SILENT,
PROP_MUTE,
PROP_VOLUME
@@ -158,8 +160,6 @@
const GValue * value, GParamSpec * pspec);
static void volume_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
-static void volume_update_volume (const GValue * value, gpointer data);
-static void volume_update_mute (const GValue * value, gpointer data);
static GstFlowReturn volume_transform_ip (GstBaseTransform * base,
GstBuffer * outbuf);
@@ -203,36 +203,36 @@
switch (GST_AUDIO_FILTER (this)->format.width) {
case 32:
/* only clamp if the gain is greater than 1.0
- * FIXME: real_vol_i can change while processing the buffer!
+ * FIXME: current_vol_i can change while processing the buffer!
*/
- if (this->real_vol_i32 > VOLUME_UNITY_INT32)
+ if (this->current_vol_i32 > VOLUME_UNITY_INT32)
this->process = volume_process_int32_clamp;
else
this->process = volume_process_int32;
break;
case 24:
- if (this->real_vol_i24 > VOLUME_UNITY_INT24)
+ if (this->current_vol_i24 > VOLUME_UNITY_INT24)
this->process = volume_process_int24_clamp;
this->process = volume_process_int24;
case 16:
- if (this->real_vol_i16 > VOLUME_UNITY_INT16)
+ if (this->current_vol_i16 > VOLUME_UNITY_INT16)
this->process = volume_process_int16_clamp;
this->process = volume_process_int16;
case 8:
- if (this->real_vol_i16 > VOLUME_UNITY_INT8)
+ if (this->current_vol_i16 > VOLUME_UNITY_INT8)
this->process = volume_process_int8_clamp;
this->process = volume_process_int8;
@@ -256,27 +256,43 @@
return (this->process != NULL);
}
-static void
-volume_update_real_volume (GstVolume * this)
+static gboolean
+volume_update_volume (GstVolume * this, gfloat volume, gboolean mute)
- gboolean passthrough = FALSE;
+ gboolean passthrough;
+ gboolean res;
- if (this->mute) {
- this->real_vol_f = 0.0;
- this->real_vol_i8 = this->real_vol_i16 = this->real_vol_i24 =
- this->real_vol_i32 = 0;
+ GST_DEBUG_OBJECT (this, "configure mute %d, volume %f", mute, volume);
+ if (mute) {
+ this->current_mute = TRUE;
+ this->current_volume = 0.0;
+ this->current_vol_i8 = 0;
+ this->current_vol_i16 = 0;
+ this->current_vol_i24 = 0;
+ this->current_vol_i32 = 0;
+ passthrough = FALSE;
} else {
- this->real_vol_f = this->volume_f;
- this->real_vol_i8 = this->volume_i8;
- this->real_vol_i16 = this->volume_i16;
- this->real_vol_i24 = this->volume_i24;
- this->real_vol_i32 = this->volume_i32;
- passthrough = (this->volume_i16 == VOLUME_UNITY_INT16);
+ this->current_mute = FALSE;
+ this->current_volume = volume;
+ this->current_vol_i8 = volume * VOLUME_UNITY_INT8;
+ this->current_vol_i16 = volume * VOLUME_UNITY_INT16;
+ this->current_vol_i24 = volume * VOLUME_UNITY_INT24;
+ this->current_vol_i32 = volume * VOLUME_UNITY_INT32;
+ passthrough = (this->current_vol_i16 == VOLUME_UNITY_INT16);
}
- if (this->real_vol_f != 0.0)
- this->silent_buffer = FALSE;
- this->negotiated = volume_choose_func (this);
+ GST_DEBUG_OBJECT (this, "set passthrough %d", passthrough);
gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (this), passthrough);
+ res = this->negotiated = volume_choose_func (this);
+ return res;
/* Mixer interface */
@@ -313,17 +329,9 @@
g_return_if_fail (this != NULL);
g_return_if_fail (GST_IS_VOLUME (this));
- GST_BASE_TRANSFORM_LOCK (this);
GST_OBJECT_LOCK (this);
- this->volume_f = (gfloat) volumes[0] / VOLUME_STEPS;
+ this->volume = (gfloat) volumes[0] / VOLUME_STEPS;
GST_OBJECT_UNLOCK (this);
- this->volume_i32 = this->volume_f * VOLUME_UNITY_INT32;
- this->volume_i24 = this->volume_f * VOLUME_UNITY_INT24;
- this->volume_i16 = this->volume_f * VOLUME_UNITY_INT16;
- this->volume_i8 = this->volume_f * VOLUME_UNITY_INT8;
-
- volume_update_real_volume (this);
- GST_BASE_TRANSFORM_UNLOCK (this);
static void
@@ -335,7 +343,7 @@
- volumes[0] = (gint) this->volume_f * VOLUME_STEPS;
+ volumes[0] = (gint) this->volume * VOLUME_STEPS;
@@ -347,11 +355,9 @@
+ GST_OBJECT_LOCK (this);
this->mute = mute;
+ GST_OBJECT_UNLOCK (this);
@@ -416,12 +422,12 @@
g_object_class_install_property (gobject_class, PROP_MUTE,
g_param_spec_boolean ("mute", "Mute", "mute channel",
- FALSE,
+ DEFAULT_PROP_MUTE,
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_VOLUME,
g_param_spec_double ("volume", "Volume", "volume factor",
- 0.0, VOLUME_MAX_DOUBLE, 1.0,
+ 0.0, VOLUME_MAX_DOUBLE, DEFAULT_PROP_VOLUME,
trans_class->transform_ip = GST_DEBUG_FUNCPTR (volume_transform_ip);
@@ -433,12 +439,9 @@
GstMixerTrack *track = NULL;
- this->mute = FALSE;
- this->volume_i8 = this->real_vol_i8 = VOLUME_UNITY_INT8;
- this->volume_i16 = this->real_vol_i16 = VOLUME_UNITY_INT16;
- this->volume_i24 = this->real_vol_i24 = VOLUME_UNITY_INT24;
- this->volume_i32 = this->real_vol_i32 = VOLUME_UNITY_INT32;
- this->volume_f = this->real_vol_f = 1.0;
+ this->mute = DEFAULT_PROP_MUTE;;
+ this->volume = DEFAULT_PROP_VOLUME;
this->tracklist = NULL;
this->negotiated = FALSE;
@@ -462,7 +465,7 @@
gdouble *data = (gdouble *) bytes;
guint num_samples = n_bytes / sizeof (gdouble);
- gdouble vol = this->real_vol_f;
+ gdouble vol = this->current_volume;
oil_scalarmultiply_f64_ns (data, data, &vol, num_samples);
@@ -483,7 +486,7 @@
* volume volume=1.5 ! fakesink" goes from 0m0.850s -> 0m0.717s with liboil
*/
#endif
- oil_scalarmultiply_f32_ns (data, data, &this->real_vol_f, num_samples);
+ oil_scalarmultiply_f32_ns (data, data, &this->current_volume, num_samples);
@@ -497,7 +500,9 @@
for (i = 0; i < num_samples; i++) {
/* we use bitshifting instead of dividing by UNITY_INT for speed */
val = (gint64) * data;
- val = (((gint64) this->real_vol_i32 * val) >> VOLUME_UNITY_INT32_BIT_SHIFT);
+ val =
+ (((gint64) this->current_vol_i32 *
+ val) >> VOLUME_UNITY_INT32_BIT_SHIFT);
*data++ = (gint32) val;
@@ -514,7 +519,9 @@
*data++ = (gint32) CLAMP (val, VOLUME_MIN_INT32, VOLUME_MAX_INT32);
@@ -552,7 +559,9 @@
samp = get_unaligned_i24 (data);
val = (gint32) samp;
- val = (((gint64) this->real_vol_i24 * val) >> VOLUME_UNITY_INT24_BIT_SHIFT);
+ (((gint64) this->current_vol_i24 *
+ val) >> VOLUME_UNITY_INT24_BIT_SHIFT);
samp = (guint32) val;
/* write the value back into the stream */
@@ -573,7 +582,9 @@
samp = (guint32) CLAMP (val, VOLUME_MIN_INT24, VOLUME_MAX_INT24);
@@ -595,7 +606,8 @@
val = (gint) * data;
*data++ =
- (gint16) ((this->real_vol_i16 * val) >> VOLUME_UNITY_INT16_BIT_SHIFT);
+ (gint16) ((this->current_vol_i16 *
+ val) >> VOLUME_UNITY_INT16_BIT_SHIFT);
#else
/* FIXME: need oil_scalarmultiply_s16_ns ?
@@ -606,7 +618,7 @@
* time gst-launch 2>/dev/null audiotestsrc wave=7 num-buffers=100 ! volume volume=1.5 ! fakesink
oil_scalarmult_s16 (data, 0, data, 0,
- ((gint16 *) (void *) (&this->real_vol_i)), num_samples);
+ ((gint16 *) (void *) (&this->current_vol_i)), num_samples);
@@ -626,7 +638,7 @@
- (gint16) CLAMP ((this->real_vol_i16 *
+ (gint16) CLAMP ((this->current_vol_i16 *
val) >> VOLUME_UNITY_INT16_BIT_SHIFT, VOLUME_MIN_INT16,
VOLUME_MAX_INT16);
@@ -644,7 +656,7 @@
- (gint8) ((this->real_vol_i8 * val) >> VOLUME_UNITY_INT8_BIT_SHIFT);
+ (gint8) ((this->current_vol_i8 * val) >> VOLUME_UNITY_INT8_BIT_SHIFT);
@@ -661,7 +673,7 @@
- (gint8) CLAMP ((this->real_vol_i8 *
+ (gint8) CLAMP ((this->current_vol_i8 *
val) >> VOLUME_UNITY_INT8_BIT_SHIFT, VOLUME_MIN_INT8,
VOLUME_MAX_INT8);
@@ -675,13 +687,18 @@
gboolean res;
GstVolume *this = GST_VOLUME (filter);
+ gfloat volume;
+ gboolean mute;
- if (volume_choose_func (this)) {
- res = TRUE;
- } else {
+ volume = this->volume;
+ mute = this->mute;
+ res = volume_update_volume (this, volume, mute);
+ if (!res) {
GST_ELEMENT_ERROR (this, CORE, NEGOTIATION,
("Invalid incoming format"), (NULL));
- res = FALSE;
this->negotiated = res;
@@ -697,6 +714,10 @@
GstVolume *this = GST_VOLUME (base);
GstClockTime timestamp;
+ guint8 *data;
+ guint size;
if (G_UNLIKELY (!this->negotiated))
goto not_negotiated;
@@ -714,21 +735,32 @@
if (GST_CLOCK_TIME_IS_VALID (timestamp))
gst_object_sync_values (G_OBJECT (this), timestamp);
+ /* get latest values */
+ if ((volume != this->current_volume) || (mute != this->current_mute)) {
+ /* the volume or mute was updated, update our internal state before
+ * we continue processing. */
+ volume_update_volume (this, volume, mute);
+ }
/* don't process data in passthrough-mode */
if (gst_base_transform_is_passthrough (base) ||
GST_BUFFER_FLAG_IS_SET (outbuf, GST_BUFFER_FLAG_GAP))
return GST_FLOW_OK;
- if (this->real_vol_f == 0.0) {
- this->silent_buffer = TRUE;
- memset (GST_BUFFER_DATA (outbuf), 0, GST_BUFFER_SIZE (outbuf));
- } else if (this->real_vol_f != 1.0) {
- this->process (this, GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf));
- }
+ data = GST_BUFFER_DATA (outbuf);
+ size = GST_BUFFER_SIZE (outbuf);
- if (this->silent_buffer)
+ if (this->current_volume == 0.0) {
+ memset (data, 0, size);
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_GAP);
- this->silent_buffer = FALSE;
+ } else if (this->current_volume != 1.0) {
+ this->process (this, data, size);
return GST_FLOW_OK;
@@ -742,47 +774,6 @@
-volume_update_mute (const GValue * value, gpointer data)
-{
- GstVolume *this = (GstVolume *) data;
- g_return_if_fail (GST_IS_VOLUME (this));
- GST_OBJECT_LOCK (this);
- if (G_VALUE_HOLDS_BOOLEAN (value)) {
- this->mute = g_value_get_boolean (value);
- } else if (G_VALUE_HOLDS_INT (value)) {
- this->mute = (g_value_get_int (value) == 1);
- GST_OBJECT_UNLOCK (this);
-}
-volume_update_volume (const GValue * value, gpointer data)
- this->volume_f = g_value_get_double (value);
volume_set_property (GObject * object, guint prop_id, const GValue * value,
GParamSpec * pspec)
@@ -790,10 +781,14 @@
switch (prop_id) {
case PROP_MUTE:
- volume_update_mute (value, this);
+ GST_OBJECT_LOCK (this);
+ this->mute = g_value_get_boolean (value);
+ GST_OBJECT_UNLOCK (this);
break;
case PROP_VOLUME:
- volume_update_volume (value, this);
+ this->volume = g_value_get_double (value);
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -815,7 +810,7 @@
GST_OBJECT_LOCK (this);
- g_value_set_double (value, this->volume_f);
+ g_value_set_double (value, this->volume);
GST_OBJECT_UNLOCK (this);
Index: gstvolume.h
RCS file: /cvs/gstreamer/gst-plugins-base/gst/volume/gstvolume.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gstvolume.h 5 Nov 2008 19:18:25 -0000 1.23
+++ gstvolume.h 24 Nov 2008 12:03:11 -0000 1.24
@@ -55,14 +55,17 @@
void (*process)(GstVolume*, gpointer, guint);
gboolean mute;
- gint volume_i32, real_vol_i32;
- gint volume_i24, real_vol_i24; /* the _i(nt) values get synchronized with the */
- gint volume_i16, real_vol_i16; /* the _i(nt) values get synchronized with the */
- gint volume_i8, real_vol_i8; /* the _i(nt) values get synchronized with the */
- gfloat volume_f, real_vol_f; /* _f(loat) values on each update */
+ gboolean current_mute;
+ gfloat current_volume;
+ gint current_vol_i32;
+ gint current_vol_i24; /* the _i(nt) values get synchronized with the */
+ gint current_vol_i16; /* the _i(nt) values get synchronized with the */
+ gint current_vol_i8; /* the _i(nt) values get synchronized with the */
GList *tracklist;
- gboolean silent_buffer; /* flag for silent buffers */
gboolean negotiated;
Index: volume.c
RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/volume.c,v
--- volume.c 3 Mar 2008 06:04:13 -0000 1.23
+++ volume.c 24 Nov 2008 12:03:11 -0000 1.24
@@ -1334,8 +1334,7 @@
gint16 *res;
volume = setup_volume ();
- g_object_set (G_OBJECT (volume), "volume", 2.0, NULL);
- gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (volume), TRUE);
+ g_object_set (G_OBJECT (volume), "volume", 1.0, NULL);
fail_unless (gst_element_set_state (volume,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
@@ -1401,6 +1400,58 @@
GST_END_TEST;
+GST_START_TEST (test_controller_processing)
+{
+ GstInterpolationControlSource *csource;
+ GstController *c;
+ GstElement *volume;
+ GstBuffer *inbuffer, *outbuffer;
+ GstCaps *caps;
+ gint16 in[2] = { 16384, -256 };
+ gint16 *res;
+ volume = setup_volume ();
+ c = gst_controller_new (G_OBJECT (volume), "volume", NULL);
+ fail_unless (GST_IS_CONTROLLER (c));
+ csource = gst_interpolation_control_source_new ();
+ gst_interpolation_control_source_set_interpolation_mode (csource,
+ GST_INTERPOLATE_CUBIC);
+ gst_controller_set_control_source (c, "volume", GST_CONTROL_SOURCE (csource));
+ g_object_unref (csource);
+ fail_unless (gst_element_set_state (volume,
+ GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+ "could not set to playing");
+ inbuffer = gst_buffer_new_and_alloc (4);
+ memcpy (GST_BUFFER_DATA (inbuffer), in, 4);
+ caps = gst_caps_from_string (VOLUME_CAPS_STRING_S16);
+ gst_buffer_set_caps (inbuffer, caps);
+ GST_BUFFER_TIMESTAMP (inbuffer) = 0;
+ gst_caps_unref (caps);
+ ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+ /* pushing gives away my reference ... */
+ fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+ /* ... but it ends up being collected on the global buffer list */
+ fail_unless_equals_int (g_list_length (buffers), 1);
+ fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+ fail_unless (inbuffer == outbuffer);
+ res = (gint16 *) GST_BUFFER_DATA (outbuffer);
+ GST_INFO ("expected %+5d %+5d real %+5d %+5d", in[0], in[1], res[0], res[1]);
+ fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0);
+ g_object_unref (c);
+ cleanup_volume (volume);
+}
+GST_END_TEST;
static Suite *
volume_suite (void)
@@ -1435,6 +1486,7 @@
tcase_add_test (tc_chain, test_wrong_caps);
tcase_add_test (tc_chain, test_passthrough);
tcase_add_test (tc_chain, test_controller_usability);
+ tcase_add_test (tc_chain, test_controller_processing);
return s;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/