mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

volume: a return value of FALSE from the controller is not fatal

Browse source 
A return value of FALSE here indicates that we don't have control-values. In
0.10 we were returning the default value of the property. Now we don't fill an
array with defaults in the ControlBinding, but leave it up to the element to
handle this case.
This commit is contained in:
Stefan Sauer 2013-01-09 23:15:06 +01:00
parent 658195e6de
commit 8296b683ca
2 changed files with 67 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/volume/gstvolume.c
View file

@ -739,7 +739,8 @@ volume_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
guint nsamples = map.size / (width * channels);
GstClockTime interval = gst_util_uint64_scale_int (1, GST_SECOND, rate);
GstClockTime ts = GST_BUFFER_TIMESTAMP (outbuf);
gboolean use_mutes = FALSE;
gboolean have_mutes = FALSE;
gboolean have_volumes = FALSE;
ts = gst_segment_to_stream_time (&base->segment, GST_FORMAT_TIME, ts);
@ -753,33 +754,29 @@ volume_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
self->volumes_count = nsamples;
}
if (mute_cb) {
if (!gst_control_binding_get_value_array (mute_cb, ts, interval,
nsamples, (gpointer) self->mutes))
goto controller_failure;
if (volume_cb) {
have_volumes =
gst_control_binding_get_value_array (volume_cb, ts, interval,
nsamples, (gpointer) self->volumes);
gst_object_replace ((GstObject **) & volume_cb, NULL);
}
if (!have_volumes) {
volume_orc_memset_f64 (self->volumes, self->current_volume, nsamples);
}
if (mute_cb) {
have_mutes = gst_control_binding_get_value_array (mute_cb, ts, interval,
nsamples, (gpointer) self->mutes);
gst_object_replace ((GstObject **) & mute_cb, NULL);
use_mutes = TRUE;
}
if (have_mutes) {
volume_orc_prepare_volumes (self->volumes, self->mutes, nsamples);
} else {
g_free (self->mutes);
self->mutes = NULL;
self->mutes_count = 0;
}
if (volume_cb) {
if (!gst_control_binding_get_value_array (volume_cb, ts, interval,
nsamples, (gpointer) self->volumes))
goto controller_failure;
gst_object_replace ((GstObject **) & volume_cb, NULL);
} else {
volume_orc_memset_f64 (self->volumes, self->current_volume, nsamples);
}
if (use_mutes) {
volume_orc_prepare_volumes (self->volumes, self->mutes, nsamples);
}
self->process_controlled (self, map.data, self->volumes, channels,
map.size);
@ -807,18 +804,6 @@ not_negotiated:
("No format was negotiated"), (NULL));
return GST_FLOW_NOT_NEGOTIATED;
}
controller_failure:
{
if (mute_cb)
gst_object_unref (mute_cb);
if (volume_cb)
gst_object_unref (volume_cb);
GST_ELEMENT_ERROR (self, CORE, FAILED,
("Failed to get values from controller"), (NULL));
gst_buffer_unmap (outbuf, &map);
return GST_FLOW_ERROR;
}
}
static void

50
tests/check/elements/volume.c
View file

@ -1814,6 +1814,55 @@ GST_START_TEST (test_controller_processing)
GST_END_TEST;
GST_START_TEST (test_controller_defaults_at_ts0)
{
GstControlSource *cs;
GstTimedValueControlSource *tvcs;
GstElement *volume;
GstBuffer *inbuffer;
GstCaps *caps;
GstSegment seg;
volume = setup_volume ();
cs = gst_interpolation_control_source_new ();
g_object_set (cs, "mode", GST_INTERPOLATION_MODE_LINEAR, NULL);
gst_object_add_control_binding (GST_OBJECT_CAST (volume),
gst_direct_control_binding_new (GST_OBJECT_CAST (volume), "volume", cs));
/* make a control curve that does not start at ts=0, the element will use
* the current property value (default) until the control curve starts
*/
tvcs = (GstTimedValueControlSource *) cs;
gst_timed_value_control_source_set (tvcs, GST_SECOND / 100, 0.1);
gst_timed_value_control_source_set (tvcs, GST_SECOND, 1.0);
fail_unless (gst_element_set_state (volume,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
/* controller curve starts at sample: 441 */
inbuffer = gst_buffer_new_and_alloc (1000 * sizeof (gint16));
gst_buffer_memset (inbuffer, 0, 0, 1000 * sizeof (gint16));
caps = gst_caps_from_string (VOLUME_CAPS_STRING_S16);
gst_pad_set_caps (mysrcpad, caps);
GST_BUFFER_TIMESTAMP (inbuffer) = 0;
gst_caps_unref (caps);
gst_segment_init (&seg, GST_FORMAT_TIME);
fail_unless (gst_pad_push_event (mysrcpad,
gst_event_new_segment (&seg)) == TRUE);
/* pushing gives away my reference ... */
fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
gst_object_unref (cs);
cleanup_volume (volume);
}
GST_END_TEST;
static Suite *
volume_suite (void)
{
@ -1856,6 +1905,7 @@ volume_suite (void)
tcase_add_test (tc_chain, test_passthrough);
tcase_add_test (tc_chain, test_controller_usability);
tcase_add_test (tc_chain, test_controller_processing);
tcase_add_test (tc_chain, test_controller_defaults_at_ts0);
return s;
}