mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

libvisual: Update visualizer baseclass from gst-plugins-bad

Browse source
This commit is contained in:
Sebastian Dröge 2013-05-15 11:03:58 +02:00
parent 54f728b4d5
commit 36470a4aa8
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/libvisual/gstaudiovisualizer.c
View file

@ -126,8 +126,8 @@ gst_audio_visualizer_shader_get_type (void)
if (G_UNLIKELY (shader_type == 0)) { if (G_UNLIKELY (shader_type == 0)) {
/* TODO: rename when exporting it as a library */ /* TODO: rename when exporting it as a library */
shader_type = shader_type =
g_enum_register_static ("GstAudioVisualizerShader-BaseExtVisual", g_enum_register_static
shaders); ("GstAudioVisualizerShader-BaseExtLibvisual", shaders);
} }
return shader_type; return shader_type;
} }
@ -525,7 +525,7 @@ gst_audio_visualizer_get_type (void)
/* TODO: rename when exporting it as a library */ /* TODO: rename when exporting it as a library */
_type = g_type_register_static (GST_TYPE_ELEMENT, _type = g_type_register_static (GST_TYPE_ELEMENT,
"GstAudioVisualizer-BaseExtVisual", &audio_visualizer_info, "GstAudioVisualizer-BaseExtLibvisual", &audio_visualizer_info,
G_TYPE_FLAG_ABSTRACT); G_TYPE_FLAG_ABSTRACT);
g_once_init_leave (&audio_visualizer_type, _type); g_once_init_leave (&audio_visualizer_type, _type);
} }
@ -542,8 +542,9 @@ gst_audio_visualizer_class_init (GstAudioVisualizerClass * klass)
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
GST_DEBUG_CATEGORY_INIT (audio_visualizer_debug, "audiobasevisualizer", GST_DEBUG_CATEGORY_INIT (audio_visualizer_debug,
0, "scope audio visualisation base class"); "baseaudiovisualizer-libvisual", 0,
"scope audio visualisation base class");
gobject_class->set_property = gst_audio_visualizer_set_property; gobject_class->set_property = gst_audio_visualizer_set_property;
gobject_class->get_property = gst_audio_visualizer_get_property; gobject_class->get_property = gst_audio_visualizer_get_property;
@ -705,7 +706,9 @@ gst_audio_visualizer_sink_setcaps (GstAudioVisualizer * scope, GstCaps * caps)
GST_DEBUG_OBJECT (scope, "audio: channels %d, rate %d", GST_DEBUG_OBJECT (scope, "audio: channels %d, rate %d",
GST_AUDIO_INFO_CHANNELS (&info), GST_AUDIO_INFO_RATE (&info)); GST_AUDIO_INFO_CHANNELS (&info), GST_AUDIO_INFO_RATE (&info));
gst_pad_mark_reconfigure (scope->srcpad); if (!gst_audio_visualizer_src_negotiate (scope)) {
goto not_negotiated;
}
return TRUE; return TRUE;
@ -715,6 +718,11 @@ wrong_caps:
GST_WARNING_OBJECT (scope, "could not parse caps"); GST_WARNING_OBJECT (scope, "could not parse caps");
return FALSE; return FALSE;
} }
not_negotiated:
{
GST_WARNING_OBJECT (scope, "failed to negotiate");
return FALSE;
}
} }
static gboolean static gboolean
@ -1017,7 +1025,6 @@ activate_failed:
} }
} }
static GstFlowReturn static GstFlowReturn
gst_audio_visualizer_chain (GstPad * pad, GstObject * parent, gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
GstBuffer * buffer) GstBuffer * buffer)
@ -1054,7 +1061,6 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
bps = GST_AUDIO_INFO_BPS (&scope->ainfo); bps = GST_AUDIO_INFO_BPS (&scope->ainfo);
if (bps == 0) { if (bps == 0) {
GST_ERROR_OBJECT (scope, "no BPS set");
ret = GST_FLOW_NOT_NEGOTIATED; ret = GST_FLOW_NOT_NEGOTIATED;
goto beach; goto beach;
} }
@ -1147,7 +1153,6 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
/* call class->render() vmethod */ /* call class->render() vmethod */
if (klass->render) { if (klass->render) {
if (!klass->render (scope, inbuf, &outframe)) { if (!klass->render (scope, inbuf, &outframe)) {
GST_ERROR_OBJECT (scope, "render failed");
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
} else { } else {
/* run various post processing (shading and geometric transformation) */ /* run various post processing (shading and geometric transformation) */