mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "v4l2object: allow to automatic selection of dmabuf"

Browse source 
This reverts commit e6c2ad5571.
This commit is contained in:
Nicolas Dufresne 2014-11-24 10:33:29 -05:00
parent d1acea57a2
commit 3591a91067
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/v4l2/gstv4l2bufferpool.c
View file

@ -517,8 +517,6 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
gst_buffer_pool_config_set_params (config, caps, size, min_buffers, gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
max_buffers); max_buffers);
gst_buffer_pool_config_set_allocator (config, pool->allocator, &params);
/* keep a GstVideoInfo with defaults for the when we need to copy */ /* keep a GstVideoInfo with defaults for the when we need to copy */
gst_video_info_from_caps (&pool->caps_info, caps); gst_video_info_from_caps (&pool->caps_info, caps);

8
sys/v4l2/gstv4l2object.c
View file

@ -2362,12 +2362,8 @@ gst_v4l2_object_setup_pool (GstV4l2Object * v4l2object, GstCaps * caps)
goto method_not_supported; goto method_not_supported;
if (v4l2object->vcap.capabilities & V4L2_CAP_STREAMING) { if (v4l2object->vcap.capabilities & V4L2_CAP_STREAMING) {
if (v4l2object->req_mode == GST_V4L2_IO_AUTO) { if (v4l2object->req_mode == GST_V4L2_IO_AUTO)
if (GST_V4L2_OBJECT_CAN_REQUEST (v4l2object, DMABUF)) mode = GST_V4L2_IO_MMAP;
mode = GST_V4L2_IO_DMABUF;
else
mode = GST_V4L2_IO_MMAP;
}
} else if (v4l2object->req_mode == GST_V4L2_IO_MMAP) } else if (v4l2object->req_mode == GST_V4L2_IO_MMAP)
goto method_not_supported; goto method_not_supported;