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

videopool: only do alignment when videometa is enabled

Browse source 
We require the videometa activated before we can implement the alignment of
buffers. Users of the bufferpool should do this manually based on the results of
the allocation query.
This commit is contained in:
Wim Taymans 2012-03-08 13:03:22 +01:00
parent 591ff74d7d
commit 8ebd13ee5e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/video/gstvideopool.c
View file

@ -142,7 +142,7 @@ struct _GstVideoBufferPoolPrivate
GstCaps *caps; GstCaps *caps;
GstVideoInfo info; GstVideoInfo info;
GstVideoAlignment video_align; GstVideoAlignment video_align;
gboolean add_metavideo; gboolean add_videometa;
gboolean need_alignment; gboolean need_alignment;
guint prefix; guint prefix;
guint align; guint align;
@ -198,7 +198,7 @@ video_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
priv->align = align; priv->align = align;
/* enable metadata based on config of the pool */ /* enable metadata based on config of the pool */
priv->add_metavideo = priv->add_videometa =
gst_buffer_pool_config_has_option (config, gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_META); GST_BUFFER_POOL_OPTION_VIDEO_META);
@ -206,13 +206,10 @@ video_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
priv->need_alignment = gst_buffer_pool_config_has_option (config, priv->need_alignment = gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
if (priv->need_alignment) { if (priv->need_alignment && priv->add_videometa) {
/* get an apply the alignment to the info */ /* get an apply the alignment to the info */
gst_buffer_pool_config_get_video_alignment (config, &priv->video_align); gst_buffer_pool_config_get_video_alignment (config, &priv->video_align);
gst_video_info_align (&info, &priv->video_align); gst_video_info_align (&info, &priv->video_align);
/* we need the video metadata too now */
priv->add_metavideo = TRUE;
} }
priv->info = info; priv->info = info;
@ -260,7 +257,7 @@ video_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
gst_memory_resize (mem, priv->prefix, info->size); gst_memory_resize (mem, priv->prefix, info->size);
gst_buffer_take_memory (*buffer, -1, mem); gst_buffer_take_memory (*buffer, -1, mem);
if (priv->add_metavideo) { if (priv->add_videometa) {
GST_DEBUG_OBJECT (pool, "adding GstVideoMeta"); GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");
gst_buffer_add_video_meta_full (*buffer, 0, GST_VIDEO_INFO_FORMAT (info), gst_buffer_add_video_meta_full (*buffer, 0, GST_VIDEO_INFO_FORMAT (info),

3
gst-libs/gst/video/gstvideopool.h
View file

@ -39,6 +39,9 @@ G_BEGIN_DECLS
* *
* A bufferpool option to enable extra padding. When a bufferpool supports this * A bufferpool option to enable extra padding. When a bufferpool supports this
* option, gst_buffer_pool_config_set_video_alignment() can be called. * option, gst_buffer_pool_config_set_video_alignment() can be called.
*
* When this option is enabled on the bufferpool,
* #GST_BUFFER_POOL_OPTION_VIDEO_META should also be enabled.
*/ */
#define GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT "GstBufferPoolOptionVideoAlignment" #define GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT "GstBufferPoolOptionVideoAlignment"