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

v4l2codec: Add initial GstVideoMeta support

Browse source 
In this patch we strictly set the GstVideoMeta width/height to the coded width
and height. Further patches will add stride support and frame copying when
downstream does not support GstVideoMeta.
This commit is contained in:
Nicolas Dufresne 2020-03-11 17:45:17 -04:00
parent f6690420ce
commit 3c2d25eebf
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/v4l2codecs/gstv4l2codecpool.c
View file

@ -20,11 +20,15 @@
#include "gstv4l2codecpool.h" #include "gstv4l2codecpool.h"
#include <string.h>
struct _GstV4l2CodecPool struct _GstV4l2CodecPool
{ {
GstBufferPool parent; GstBufferPool parent;
GstAtomicQueue *queue; GstAtomicQueue *queue;
GstV4l2CodecAllocator *allocator; GstV4l2CodecAllocator *allocator;
/* Used to set GstVideoMeta */
GstVideoInfo *vinfo;
}; };
G_DEFINE_TYPE (GstV4l2CodecPool, gst_v4l2_codec_pool, GST_TYPE_BUFFER_POOL); G_DEFINE_TYPE (GstV4l2CodecPool, gst_v4l2_codec_pool, GST_TYPE_BUFFER_POOL);
@ -35,12 +39,25 @@ gst_v4l2_codec_pool_acquire_buffer (GstBufferPool * pool, GstBuffer ** buffer,
{ {
GstV4l2CodecPool *self = GST_V4L2_CODEC_POOL (pool); GstV4l2CodecPool *self = GST_V4L2_CODEC_POOL (pool);
GstBuffer *buf = gst_atomic_queue_pop (self->queue); GstBuffer *buf = gst_atomic_queue_pop (self->queue);
GstVideoMeta *vmeta;
/* A GstVideoInfo must be set before buffer can be acquired */
g_return_val_if_fail (self->vinfo, GST_FLOW_ERROR);
if (!buf) if (!buf)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
if (!gst_v4l2_codec_allocator_prepare_buffer (self->allocator, buf)) if (!gst_v4l2_codec_allocator_prepare_buffer (self->allocator, buf))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
vmeta = gst_buffer_get_video_meta (buf);
vmeta->format = GST_VIDEO_INFO_FORMAT (self->vinfo);
vmeta->width = GST_VIDEO_INFO_WIDTH (self->vinfo);
vmeta->height = GST_VIDEO_INFO_HEIGHT (self->vinfo);
vmeta->n_planes = GST_VIDEO_INFO_N_PLANES (self->vinfo);
memcpy (vmeta->offset, self->vinfo->offset, sizeof (vmeta->offset));
memcpy (vmeta->stride, self->vinfo->stride, sizeof (vmeta->stride));
*buffer = buf; *buffer = buf;
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -82,6 +99,9 @@ gst_v4l2_codec_pool_finalize (GObject * object)
gst_atomic_queue_unref (self->queue); gst_atomic_queue_unref (self->queue);
g_object_unref (self->allocator); g_object_unref (self->allocator);
if (self->vinfo)
gst_video_info_free (self->vinfo);
G_OBJECT_CLASS (gst_v4l2_codec_pool_parent_class)->finalize (object); G_OBJECT_CLASS (gst_v4l2_codec_pool_parent_class)->finalize (object);
} }
@ -99,16 +119,23 @@ gst_v4l2_codec_pool_class_init (GstV4l2CodecPoolClass * klass)
} }
GstV4l2CodecPool * GstV4l2CodecPool *
gst_v4l2_codec_pool_new (GstV4l2CodecAllocator * allocator) gst_v4l2_codec_pool_new (GstV4l2CodecAllocator * allocator,
const GstVideoInfo * vinfo)
{ {
GstV4l2CodecPool *pool = g_object_new (GST_TYPE_V4L2_CODEC_POOL, NULL); GstV4l2CodecPool *pool = g_object_new (GST_TYPE_V4L2_CODEC_POOL, NULL);
gsize pool_size; gsize pool_size;
pool->allocator = g_object_ref (allocator); pool->allocator = g_object_ref (allocator);
pool->vinfo = gst_video_info_copy (vinfo);
pool_size = gst_v4l2_codec_allocator_get_pool_size (allocator); pool_size = gst_v4l2_codec_allocator_get_pool_size (allocator);
for (gsize i = 0; i < pool_size; i++) { for (gsize i = 0; i < pool_size; i++) {
GstVideoMeta *vmeta;
GstBuffer *buffer = gst_buffer_new (); GstBuffer *buffer = gst_buffer_new ();
vmeta = gst_buffer_add_video_meta (buffer, 0, GST_VIDEO_FORMAT_NV12, 1, 1);
GST_META_FLAG_SET (vmeta, GST_META_FLAG_POOLED);
gst_atomic_queue_push (pool->queue, buffer); gst_atomic_queue_push (pool->queue, buffer);
} }

3
sys/v4l2codecs/gstv4l2codecpool.h
View file

@ -29,7 +29,8 @@
G_DECLARE_FINAL_TYPE(GstV4l2CodecPool, gst_v4l2_codec_pool, GST, G_DECLARE_FINAL_TYPE(GstV4l2CodecPool, gst_v4l2_codec_pool, GST,
V4L2_CODEC_POOL, GstBufferPool) V4L2_CODEC_POOL, GstBufferPool)
GstV4l2CodecPool *gst_v4l2_codec_pool_new (GstV4l2CodecAllocator *allocator); GstV4l2CodecPool *gst_v4l2_codec_pool_new (GstV4l2CodecAllocator *allocator,
const GstVideoInfo * vinfo);
guint32 gst_v4l2_codec_buffer_get_index (GstBuffer * buffer); guint32 gst_v4l2_codec_buffer_get_index (GstBuffer * buffer);