mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-01 04:10:41 +00:00
visualizer: improve allocation
Based on patch by Matthew Waters Add private data Add decide_allocation vmethod Refactor bufferpool negotiation Fixes https://bugzilla.gnome.org/show_bug.cgi?id=681719
This commit is contained in:
Wim Taymans
parent
0ac034db91
commit
ef8e17f993
|
|
@ -87,6 +87,12 @@ static gboolean gst_audio_visualizer_sink_query (GstPad * pad,
|
|||
static GstStateChangeReturn gst_audio_visualizer_change_state (GstElement *
|
||||
element, GstStateChange transition);
|
||||
|
||||
static gboolean gst_audio_visualizer_do_bufferpool (GstAudioVisualizer * scope,
|
||||
GstCaps * outcaps);
|
||||
|
||||
static gboolean
|
||||
default_decide_allocation (GstAudioVisualizer * scope, GstQuery * query);
|
||||
|
||||
/* shading functions */
|
||||
|
||||
#define GST_TYPE_AUDIO_VISUALIZER_SHADER (gst_audio_visualizer_shader_get_type())
|
||||
|
|
@ -484,6 +490,20 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
|
|||
|
||||
/* base class */
|
||||
|
||||
#define GST_AUDIO_VISUALIZER_GET_PRIVATE(obj) \
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_AUDIO_VISUALIZER, GstAudioVisualizerPrivate))
|
||||
|
||||
struct _GstAudioVisualizerPrivate
|
||||
{
|
||||
gboolean negotiated;
|
||||
|
||||
GstBufferPool *pool;
|
||||
gboolean pool_active;
|
||||
GstAllocator *allocator;
|
||||
GstAllocationParams params;
|
||||
GstQuery *query;
|
||||
};
|
||||
|
||||
GType
|
||||
gst_audio_visualizer_get_type (void)
|
||||
{
|
||||
|
|
@ -518,6 +538,8 @@ gst_audio_visualizer_class_init (GstAudioVisualizerClass * klass)
|
|||
GObjectClass *gobject_class = (GObjectClass *) klass;
|
||||
GstElementClass *element_class = (GstElementClass *) klass;
|
||||
|
||||
g_type_class_add_private (klass, sizeof (GstAudioVisualizerPrivate));
|
||||
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
|
||||
GST_DEBUG_CATEGORY_INIT (audio_visualizer_debug, "audiobasevisualizer",
|
||||
|
|
@ -530,6 +552,8 @@ gst_audio_visualizer_class_init (GstAudioVisualizerClass * klass)
|
|||
element_class->change_state =
|
||||
GST_DEBUG_FUNCPTR (gst_audio_visualizer_change_state);
|
||||
|
||||
klass->decide_allocation = GST_DEBUG_FUNCPTR (default_decide_allocation);
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_SHADER,
|
||||
g_param_spec_enum ("shader", "shader type",
|
||||
"Shader function to apply on each frame",
|
||||
|
|
@ -548,6 +572,8 @@ gst_audio_visualizer_init (GstAudioVisualizer * scope,
|
|||
{
|
||||
GstPadTemplate *pad_template;
|
||||
|
||||
scope->priv = GST_AUDIO_VISUALIZER_GET_PRIVATE (scope);
|
||||
|
||||
/* create the sink and src pads */
|
||||
pad_template =
|
||||
gst_element_class_get_pad_template (GST_ELEMENT_CLASS (g_class), "sink");
|
||||
|
|
@ -670,7 +696,6 @@ static gboolean
|
|||
gst_audio_visualizer_sink_setcaps (GstAudioVisualizer * scope, GstCaps * caps)
|
||||
{
|
||||
GstAudioInfo info;
|
||||
gboolean res = TRUE;
|
||||
|
||||
if (!gst_audio_info_from_caps (&info, caps))
|
||||
goto wrong_caps;
|
||||
|
|
@ -680,15 +705,15 @@ gst_audio_visualizer_sink_setcaps (GstAudioVisualizer * scope, GstCaps * caps)
|
|||
GST_DEBUG_OBJECT (scope, "audio: channels %d, rate %d",
|
||||
GST_AUDIO_INFO_CHANNELS (&info), GST_AUDIO_INFO_RATE (&info));
|
||||
|
||||
done:
|
||||
return res;
|
||||
gst_pad_mark_reconfigure (scope->srcpad);
|
||||
|
||||
return TRUE;
|
||||
|
||||
/* Errors */
|
||||
wrong_caps:
|
||||
{
|
||||
GST_WARNING_OBJECT (scope, "could not parse caps");
|
||||
res = FALSE;
|
||||
goto done;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -730,7 +755,10 @@ gst_audio_visualizer_src_setcaps (GstAudioVisualizer * scope, GstCaps * caps)
|
|||
GST_DEBUG_OBJECT (scope, "blocks: spf %u, req_spf %u",
|
||||
scope->spf, scope->req_spf);
|
||||
|
||||
res = gst_pad_set_caps (scope->srcpad, caps);
|
||||
gst_pad_set_caps (scope->srcpad, caps);
|
||||
|
||||
/* find a pool for the negotiated caps now */
|
||||
res = gst_audio_visualizer_do_bufferpool (scope, caps);
|
||||
|
||||
return res;
|
||||
|
||||
|
|
@ -748,10 +776,7 @@ gst_audio_visualizer_src_negotiate (GstAudioVisualizer * scope)
|
|||
GstCaps *othercaps, *target;
|
||||
GstStructure *structure;
|
||||
GstCaps *templ;
|
||||
GstQuery *query;
|
||||
GstBufferPool *pool;
|
||||
GstStructure *config;
|
||||
guint size, min, max;
|
||||
gboolean ret;
|
||||
|
||||
templ = gst_pad_get_pad_template_caps (scope->srcpad);
|
||||
|
||||
|
|
@ -782,23 +807,151 @@ gst_audio_visualizer_src_negotiate (GstAudioVisualizer * scope)
|
|||
|
||||
GST_DEBUG_OBJECT (scope, "final caps are %" GST_PTR_FORMAT, target);
|
||||
|
||||
gst_audio_visualizer_src_setcaps (scope, target);
|
||||
ret = gst_audio_visualizer_src_setcaps (scope, target);
|
||||
|
||||
/* try to get a bufferpool now */
|
||||
return ret;
|
||||
|
||||
no_format:
|
||||
{
|
||||
gst_caps_unref (target);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* takes ownership of the pool, allocator and query */
|
||||
static gboolean
|
||||
gst_audio_visualizer_set_allocation (GstAudioVisualizer * scope,
|
||||
GstBufferPool * pool, GstAllocator * allocator,
|
||||
GstAllocationParams * params, GstQuery * query)
|
||||
{
|
||||
GstAllocator *oldalloc;
|
||||
GstBufferPool *oldpool;
|
||||
GstQuery *oldquery;
|
||||
GstAudioVisualizerPrivate *priv = scope->priv;
|
||||
|
||||
GST_OBJECT_LOCK (scope);
|
||||
oldpool = priv->pool;
|
||||
priv->pool = pool;
|
||||
priv->pool_active = FALSE;
|
||||
|
||||
oldalloc = priv->allocator;
|
||||
priv->allocator = allocator;
|
||||
|
||||
oldquery = priv->query;
|
||||
priv->query = query;
|
||||
|
||||
if (params)
|
||||
priv->params = *params;
|
||||
else
|
||||
gst_allocation_params_init (&priv->params);
|
||||
GST_OBJECT_UNLOCK (scope);
|
||||
|
||||
if (oldpool) {
|
||||
GST_DEBUG_OBJECT (scope, "deactivating old pool %p", oldpool);
|
||||
gst_buffer_pool_set_active (oldpool, FALSE);
|
||||
gst_object_unref (oldpool);
|
||||
}
|
||||
if (oldalloc) {
|
||||
gst_object_unref (oldalloc);
|
||||
}
|
||||
if (oldquery) {
|
||||
gst_query_unref (oldquery);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gst_audio_visualizer_do_bufferpool (GstAudioVisualizer * scope,
|
||||
GstCaps * outcaps)
|
||||
{
|
||||
GstQuery *query;
|
||||
gboolean result = TRUE;
|
||||
GstBufferPool *pool = NULL;
|
||||
GstAudioVisualizerClass *klass;
|
||||
GstAllocator *allocator;
|
||||
GstAllocationParams params;
|
||||
|
||||
/* not passthrough, we need to allocate */
|
||||
/* find a pool for the negotiated caps now */
|
||||
query = gst_query_new_allocation (target, TRUE);
|
||||
GST_DEBUG_OBJECT (scope, "doing allocation query");
|
||||
query = gst_query_new_allocation (outcaps, TRUE);
|
||||
|
||||
if (!gst_pad_peer_query (scope->srcpad, query)) {
|
||||
/* not a problem, we use the query defaults */
|
||||
GST_DEBUG_OBJECT (scope, "allocation query failed");
|
||||
}
|
||||
|
||||
klass = GST_AUDIO_VISUALIZER_GET_CLASS (scope);
|
||||
|
||||
GST_DEBUG_OBJECT (scope, "calling decide_allocation");
|
||||
g_assert (klass->decide_allocation != NULL);
|
||||
result = klass->decide_allocation (scope, query);
|
||||
|
||||
GST_DEBUG_OBJECT (scope, "ALLOCATION (%d) params: %" GST_PTR_FORMAT, result,
|
||||
query);
|
||||
|
||||
if (!result)
|
||||
goto no_decide_allocation;
|
||||
|
||||
/* we got configuration from our peer or the decide_allocation method,
|
||||
* parse them */
|
||||
if (gst_query_get_n_allocation_params (query) > 0) {
|
||||
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
|
||||
} else {
|
||||
allocator = NULL;
|
||||
gst_allocation_params_init (¶ms);
|
||||
}
|
||||
|
||||
if (gst_query_get_n_allocation_pools (query) > 0)
|
||||
gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL);
|
||||
|
||||
/* now store */
|
||||
result =
|
||||
gst_audio_visualizer_set_allocation (scope, pool, allocator, ¶ms,
|
||||
query);
|
||||
|
||||
return result;
|
||||
|
||||
/* Errors */
|
||||
no_decide_allocation:
|
||||
{
|
||||
GST_WARNING_OBJECT (scope, "Subclass failed to decide allocation");
|
||||
gst_query_unref (query);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
default_decide_allocation (GstAudioVisualizer * scope, GstQuery * query)
|
||||
{
|
||||
GstCaps *outcaps;
|
||||
GstBufferPool *pool;
|
||||
guint size, min, max;
|
||||
GstAllocator *allocator;
|
||||
GstAllocationParams params;
|
||||
GstStructure *config;
|
||||
gboolean update_allocator;
|
||||
|
||||
gst_query_parse_allocation (query, &outcaps, NULL);
|
||||
|
||||
/* we got configuration from our peer or the decide_allocation method,
|
||||
* parse them */
|
||||
if (gst_query_get_n_allocation_params (query) > 0) {
|
||||
/* try the allocator */
|
||||
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
|
||||
update_allocator = TRUE;
|
||||
} else {
|
||||
allocator = NULL;
|
||||
gst_allocation_params_init (¶ms);
|
||||
update_allocator = FALSE;
|
||||
}
|
||||
|
||||
if (gst_query_get_n_allocation_pools (query) > 0) {
|
||||
/* we got configuration from our peer, parse them */
|
||||
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
|
||||
} else {
|
||||
pool = NULL;
|
||||
size = 0;
|
||||
size = GST_VIDEO_INFO_SIZE (&scope->vinfo);
|
||||
min = max = 0;
|
||||
}
|
||||
|
||||
|
|
@ -808,47 +961,57 @@ gst_audio_visualizer_src_negotiate (GstAudioVisualizer * scope)
|
|||
}
|
||||
|
||||
config = gst_buffer_pool_get_config (pool);
|
||||
gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
|
||||
gst_buffer_pool_config_set_allocator (config, allocator, ¶ms);
|
||||
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
|
||||
gst_buffer_pool_config_set_params (config, target, size, min, max);
|
||||
gst_buffer_pool_set_config (pool, config);
|
||||
|
||||
if (scope->pool) {
|
||||
gst_buffer_pool_set_active (scope->pool, FALSE);
|
||||
gst_object_unref (scope->pool);
|
||||
if (update_allocator)
|
||||
gst_query_set_nth_allocation_param (query, 0, allocator, ¶ms);
|
||||
else
|
||||
gst_query_add_allocation_param (query, allocator, ¶ms);
|
||||
|
||||
if (allocator)
|
||||
gst_object_unref (allocator);
|
||||
|
||||
if (pool) {
|
||||
gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
|
||||
gst_object_unref (pool);
|
||||
}
|
||||
scope->pool = pool;
|
||||
|
||||
/* and activate */
|
||||
gst_buffer_pool_set_active (pool, TRUE);
|
||||
|
||||
gst_caps_unref (target);
|
||||
|
||||
return TRUE;
|
||||
|
||||
no_format:
|
||||
{
|
||||
GST_ERROR_OBJECT (scope, "no format");
|
||||
gst_caps_unref (target);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* make sure we are negotiated */
|
||||
static GstFlowReturn
|
||||
gst_audio_visualizer_ensure_negotiated (GstAudioVisualizer * scope)
|
||||
default_prepare_output_buffer (GstAudioVisualizer * scope, GstBuffer ** outbuf)
|
||||
{
|
||||
gboolean reconfigure;
|
||||
GstAudioVisualizerPrivate *priv;
|
||||
|
||||
reconfigure = gst_pad_check_reconfigure (scope->srcpad);
|
||||
priv = scope->priv;
|
||||
|
||||
/* we don't know an output format yet, pick one */
|
||||
if (reconfigure || !gst_pad_has_current_caps (scope->srcpad)) {
|
||||
if (!gst_audio_visualizer_src_negotiate (scope))
|
||||
return GST_FLOW_NOT_NEGOTIATED;
|
||||
g_assert (priv->pool != NULL);
|
||||
|
||||
/* we can't reuse the input buffer */
|
||||
if (!priv->pool_active) {
|
||||
GST_DEBUG_OBJECT (scope, "setting pool %p active", priv->pool);
|
||||
if (!gst_buffer_pool_set_active (priv->pool, TRUE))
|
||||
goto activate_failed;
|
||||
priv->pool_active = TRUE;
|
||||
}
|
||||
GST_DEBUG_OBJECT (scope, "using pool alloc");
|
||||
|
||||
return gst_buffer_pool_acquire_buffer (priv->pool, outbuf, NULL);
|
||||
|
||||
/* ERRORS */
|
||||
activate_failed:
|
||||
{
|
||||
GST_ELEMENT_ERROR (scope, RESOURCE, SETTINGS,
|
||||
("failed to activate bufferpool"), ("failed to activate bufferpool"));
|
||||
return GST_FLOW_ERROR;
|
||||
}
|
||||
return GST_FLOW_OK;
|
||||
}
|
||||
|
||||
|
||||
static GstFlowReturn
|
||||
gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
|
||||
GstBuffer * buffer)
|
||||
|
|
@ -873,11 +1036,13 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
|
|||
}
|
||||
|
||||
/* Make sure have an output format */
|
||||
ret = gst_audio_visualizer_ensure_negotiated (scope);
|
||||
if (ret != GST_FLOW_OK) {
|
||||
gst_buffer_unref (buffer);
|
||||
goto beach;
|
||||
if (gst_pad_check_reconfigure (scope->srcpad)) {
|
||||
if (!gst_audio_visualizer_src_negotiate (scope)) {
|
||||
gst_pad_mark_reconfigure (scope->srcpad);
|
||||
goto not_negotiated;
|
||||
}
|
||||
}
|
||||
|
||||
channels = GST_AUDIO_INFO_CHANNELS (&scope->ainfo);
|
||||
rate = GST_AUDIO_INFO_RATE (&scope->ainfo);
|
||||
bps = GST_AUDIO_INFO_BPS (&scope->ainfo);
|
||||
|
|
@ -936,7 +1101,7 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
|
|||
}
|
||||
|
||||
g_mutex_unlock (&scope->config_lock);
|
||||
ret = gst_buffer_pool_acquire_buffer (scope->pool, &outbuf, NULL);
|
||||
ret = default_prepare_output_buffer (scope, &outbuf);
|
||||
g_mutex_lock (&scope->config_lock);
|
||||
/* recheck as the value could have changed */
|
||||
sbpf = scope->req_spf * channels * sizeof (gint16);
|
||||
|
|
@ -1013,6 +1178,13 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
|
|||
|
||||
beach:
|
||||
return ret;
|
||||
|
||||
/* ERRORS */
|
||||
not_negotiated:
|
||||
{
|
||||
GST_DEBUG_OBJECT (scope, "Failed to renegotiate");
|
||||
return GST_FLOW_NOT_NEGOTIATED;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
|
@ -1197,10 +1369,7 @@ gst_audio_visualizer_change_state (GstElement * element,
|
|||
|
||||
switch (transition) {
|
||||
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
||||
if (scope->pool) {
|
||||
gst_buffer_pool_set_active (scope->pool, FALSE);
|
||||
gst_object_replace ((GstObject **) & scope->pool, NULL);
|
||||
}
|
||||
gst_audio_visualizer_set_allocation (scope, NULL, NULL, NULL, NULL);
|
||||
break;
|
||||
case GST_STATE_CHANGE_READY_TO_NULL:
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ G_BEGIN_DECLS
|
|||
#define GST_TYPE_AUDIO_VISUALIZER (gst_audio_visualizer_get_type())
|
||||
#define GST_AUDIO_VISUALIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizer))
|
||||
#define GST_AUDIO_VISUALIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
||||
#define GST_AUDIO_VISUALIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
||||
#define GST_IS_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_VISUALIZER))
|
||||
#define GST_IS_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_VISUALIZER))
|
||||
typedef struct _GstAudioVisualizer GstAudioVisualizer;
|
||||
typedef struct _GstAudioVisualizerClass GstAudioVisualizerClass;
|
||||
typedef struct _GstAudioVisualizerPrivate GstAudioVisualizerPrivate;
|
||||
|
||||
typedef void (*GstAudioVisualizerShaderFunc)(GstAudioVisualizer *scope, const GstVideoFrame *s, GstVideoFrame *d);
|
||||
|
||||
|
|
@ -74,7 +76,6 @@ struct _GstAudioVisualizer
|
|||
/* pads */
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
GstBufferPool *pool;
|
||||
GstAdapter *adapter;
|
||||
GstBuffer *inbuf;
|
||||
GstBuffer *tempbuf;
|
||||
|
|
@ -102,6 +103,9 @@ struct _GstAudioVisualizer
|
|||
GstClockTime earliest_time;
|
||||
|
||||
GstSegment segment;
|
||||
|
||||
/* <private> */
|
||||
GstAudioVisualizerPrivate *priv;
|
||||
};
|
||||
|
||||
struct _GstAudioVisualizerClass
|
||||
|
|
@ -113,6 +117,8 @@ struct _GstAudioVisualizerClass
|
|||
|
||||
/* virtual function for rendering a frame */
|
||||
gboolean (*render) (GstAudioVisualizer * scope, GstBuffer * audio, GstVideoFrame * video);
|
||||
|
||||
gboolean (*decide_allocation) (GstAudioVisualizer * scope, GstQuery *query);
|
||||
};
|
||||
|
||||
GType gst_audio_visualizer_get_type (void);
|
||||
|
|
|
|||
Loading…
Reference in a new issue