Commit a13f509b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: media/v4l2-mem2mem.h: rename 'videobuf' to 'vb2' 



It is confusing to refer to vb2 structures with 'videobuf', since
that typically is used to refer to the old videobuf version 1
framework.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 3e947c36

drivers/media/v4l2-core/v4l2-mem2mem.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Memory-to-memory device framework for Video for Linux 2 and videobuf.

 * Memory-to-memory device framework for Video for Linux 2 and vb2.

 *

 * Helper functions for devices that use videobuf buffers for both their

 * Helper functions for devices that use vb2 buffers for both their

 * source and destination.

 *

 * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
@@ -21,7 +21,7 @@ 
#include <media/v4l2-fh.h>

#include <media/v4l2-event.h>



MODULE_DESCRIPTION("Mem to mem device framework for videobuf");

MODULE_DESCRIPTION("Mem to mem device framework for vb2");

MODULE_AUTHOR("Pawel Osciak, <pawel@osciak.com>");

MODULE_LICENSE("GPL");

include/media/v4l2-mem2mem.h

+6 −6
Original line number Diff line number Diff line
@@ -486,10 +486,10 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, 
 * @vma: pointer to struct &vm_area_struct

 *

 * Call from driver's mmap() function. Will handle mmap() for both queues

 * seamlessly for videobuffer, which will receive normal per-queue offsets and

 * proper videobuf queue pointers. The differentiation is made outside videobuf

 * by adding a predefined offset to buffers from one of the queues and

 * subtracting it before passing it back to videobuf. Only drivers (and

 * seamlessly for the video buffer, which will receive normal per-queue offsets

 * and proper vb2 queue pointers. The differentiation is made outside

 * vb2 by adding a predefined offset to buffers from one of the queues

 * and subtracting it before passing it back to vb2. Only drivers (and

 * thus applications) receive modified offsets.

 */

int v4l2_m2m_mmap(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
@@ -544,7 +544,7 @@ void v4l2_m2m_release(struct v4l2_m2m_dev *m2m_dev); 
 * @m2m_dev: opaque pointer to the internal data to handle M2M context

 * @drv_priv: driver's instance private data

 * @queue_init: a callback for queue type-specific initialization function

 *	to be used for initializing videobuf_queues

 *	to be used for initializing vb2_queues

 *

 * Usually called from driver's ``open()`` function.

 */
@@ -579,7 +579,7 @@ void v4l2_m2m_ctx_release(struct v4l2_m2m_ctx *m2m_ctx); 
 * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx

 * @vbuf: pointer to struct &vb2_v4l2_buffer

 *

 * Call from videobuf_queue_ops->ops->buf_queue, videobuf_queue_ops callback.

 * Call from vb2_queue_ops->ops->buf_queue, vb2_queue_ops callback.

 */

void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx,

			struct vb2_v4l2_buffer *vbuf);