summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2014-11-24 10:33:29 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2014-11-24 10:33:29 -0500
commit3591a91067232a8daeae6c27f000d9579ca4b0c7 (patch)
treeacf369776efe5384cccad15a41178fb872344b56 /sys
parentd1acea57a2d7447b23b9feafc57d557e9583ef79 (diff)
Revert "v4l2object: allow to automatic selection of dmabuf"
Diffstat (limited to 'sys')
-rw-r--r--sys/v4l2/gstv4l2bufferpool.c2
-rw-r--r--sys/v4l2/gstv4l2object.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 99d1cbfe3..c018e1267 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -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,
max_buffers);
- gst_buffer_pool_config_set_allocator (config, pool->allocator, &params);
-
/* keep a GstVideoInfo with defaults for the when we need to copy */
gst_video_info_from_caps (&pool->caps_info, caps);
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 974624335..d70b53d6f 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -2362,12 +2362,8 @@ gst_v4l2_object_setup_pool (GstV4l2Object * v4l2object, GstCaps * caps)
goto method_not_supported;
if (v4l2object->vcap.capabilities & V4L2_CAP_STREAMING) {
- if (v4l2object->req_mode == GST_V4L2_IO_AUTO) {
- if (GST_V4L2_OBJECT_CAN_REQUEST (v4l2object, DMABUF))
- mode = GST_V4L2_IO_DMABUF;
- else
- mode = GST_V4L2_IO_MMAP;
- }
+ if (v4l2object->req_mode == GST_V4L2_IO_AUTO)
+ mode = GST_V4L2_IO_MMAP;
} else if (v4l2object->req_mode == GST_V4L2_IO_MMAP)
goto method_not_supported;