2015-09-22 21:30:29 +08:00
|
|
|
/*
|
|
|
|
|
* videobuf2-v4l2.h - V4L2 driver helper framework
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2010 Samsung Electronics
|
|
|
|
|
*
|
|
|
|
|
* Author: Pawel Osciak <pawel@osciak.com>
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation.
|
|
|
|
|
*/
|
|
|
|
|
#ifndef _MEDIA_VIDEOBUF2_V4L2_H
|
|
|
|
|
#define _MEDIA_VIDEOBUF2_V4L2_H
|
|
|
|
|
|
[media] media: videobuf2: Restructure vb2_buffer
Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.
Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
<snip>
unsigned int bytesused;
unsigned int length;
union {
unsigned int offset;
unsigned long userptr;
int fd;
} m;
unsigned int data_offset;
}
Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
<snip>
unsigned int index;
unsigned int type;
unsigned int memory;
unsigned int num_planes;
struct vb2_plane planes[VIDEO_MAX_PLANES];
<snip>
};
v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
struct vb2_buffer vb2_buf;
__u32 flags;
__u32 field;
struct timeval timestamp;
struct v4l2_timecode timecode;
__u32 sequence;
};
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
2015-09-22 21:30:30 +08:00
|
|
|
#include <linux/videodev2.h>
|
2015-09-22 21:30:29 +08:00
|
|
|
#include <media/videobuf2-core.h>
|
|
|
|
|
|
[media] media: videobuf2: Restructure vb2_buffer
Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.
Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
<snip>
unsigned int bytesused;
unsigned int length;
union {
unsigned int offset;
unsigned long userptr;
int fd;
} m;
unsigned int data_offset;
}
Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
<snip>
unsigned int index;
unsigned int type;
unsigned int memory;
unsigned int num_planes;
struct vb2_plane planes[VIDEO_MAX_PLANES];
<snip>
};
v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
struct vb2_buffer vb2_buf;
__u32 flags;
__u32 field;
struct timeval timestamp;
struct v4l2_timecode timecode;
__u32 sequence;
};
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
2015-09-22 21:30:30 +08:00
|
|
|
/**
|
|
|
|
|
* struct vb2_v4l2_buffer - video buffer information for v4l2
|
|
|
|
|
* @vb2_buf: video buffer 2
|
|
|
|
|
* @flags: buffer informational flags
|
|
|
|
|
* @field: enum v4l2_field; field order of the image in the buffer
|
|
|
|
|
* @timestamp: frame timestamp
|
|
|
|
|
* @timecode: frame timecode
|
|
|
|
|
* @sequence: sequence count of this frame
|
|
|
|
|
* Should contain enough information to be able to cover all the fields
|
|
|
|
|
* of struct v4l2_buffer at videodev2.h
|
|
|
|
|
*/
|
|
|
|
|
struct vb2_v4l2_buffer {
|
|
|
|
|
struct vb2_buffer vb2_buf;
|
|
|
|
|
|
|
|
|
|
__u32 flags;
|
|
|
|
|
__u32 field;
|
|
|
|
|
struct timeval timestamp;
|
|
|
|
|
struct v4l2_timecode timecode;
|
|
|
|
|
__u32 sequence;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
|
|
|
|
|
*/
|
|
|
|
|
#define to_vb2_v4l2_buffer(vb) \
|
|
|
|
|
(container_of(vb, struct vb2_v4l2_buffer, vb2_buf))
|
|
|
|
|
|
2015-09-22 21:30:29 +08:00
|
|
|
#endif /* _MEDIA_VIDEOBUF2_V4L2_H */
|