Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit fc714e70 authored Aug 24, 2011 by Guennadi Liakhovetski Committed by Mauro Carvalho Chehab Nov 03, 2011

[media] V4L: vb2: prepare to support multi-size buffers



In preparation for the forthcoming VIDIOC_CREATE_BUFS ioctl add a
"const struct v4l2_format *" argument to the .queue_setup() vb2
operation.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 55093284

drivers/media/video/atmel-isi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -249,9 +249,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
		/* ------------------------------------------------------------------
		Videobuf operations
		------------------------------------------------------------------*/
		static int queue_setup(struct vb2_queue vq, unsigned int nbuffers,
		unsigned int *nplanes, unsigned int sizes[],
		void *alloc_ctxs[])
		static int queue_setup(struct vb2_queue vq, const struct v4l2_format fmt,
		unsigned int nbuffers, unsigned int nplanes,
		unsigned int sizes[], void *alloc_ctxs[])
		{
		struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
		struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/video/marvell-ccic/mcam-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,8 @@ static int mcam_read_setup(struct mcam_camera *cam)
		* Videobuf2 interface code.
		*/

		static int mcam_vb_queue_setup(struct vb2_queue vq, unsigned int nbufs,
		static int mcam_vb_queue_setup(struct vb2_queue *vq,
		const struct v4l2_format fmt, unsigned int nbufs,
		unsigned int *num_planes, unsigned int sizes[],
		void *alloc_ctxs[])
		{

drivers/media/video/mem2mem_testdev.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -738,9 +738,10 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
		* Queue operations
		*/

		static int m2mtest_queue_setup(struct vb2_queue vq, unsigned int nbuffers,
		unsigned int *nplanes, unsigned int sizes[],
		void *alloc_ctxs[])
		static int m2mtest_queue_setup(struct vb2_queue *vq,
		const struct v4l2_format *fmt,
		unsigned int nbuffers, unsigned int nplanes,
		unsigned int sizes[], void *alloc_ctxs[])
		{
		struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);
		struct m2mtest_q_data *q_data;

drivers/media/video/mx3_camera.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ static void mx3_cam_dma_done(void *arg)
		* Calculate the __buffer__ (not data) size and number of buffers.
		*/
		static int mx3_videobuf_setup(struct vb2_queue *vq,
		const struct v4l2_format *fmt,
		unsigned int count, unsigned int num_planes,
		unsigned int sizes[], void *alloc_ctxs[])
		{

drivers/media/video/pwc/pwc-if.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -744,9 +744,9 @@ static int pwc_video_mmap(struct file file, struct vm_area_struct vma)
		/***************************************************************************/
		/* Videobuf2 operations */

		static int queue_setup(struct vb2_queue vq, unsigned int nbuffers,
		unsigned int *nplanes, unsigned int sizes[],
		void *alloc_ctxs[])
		static int queue_setup(struct vb2_queue vq, const struct v4l2_format fmt,
		unsigned int nbuffers, unsigned int nplanes,
		unsigned int sizes[], void *alloc_ctxs[])
		{
		struct pwc_device *pdev = vb2_get_drv_priv(vq);