diff options
| author | Junghak Sung <jh1009.sung@samsung.com> | 2015-09-22 09:30:30 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-10-01 08:04:43 -0400 |
| commit | 2d7007153f0c9b1dd00c01894df7d26ddc32b79f (patch) | |
| tree | 8320f9d22f45dd7dcea64088b50ff706bb0082b2 /include/media/davinci/vpbe_display.h | |
| parent | c139990e842d550db2f59bd4f5993bba90f140e0 (diff) | |
[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>
Diffstat (limited to 'include/media/davinci/vpbe_display.h')
| -rw-r--r-- | include/media/davinci/vpbe_display.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/davinci/vpbe_display.h b/include/media/davinci/vpbe_display.h index fa0247ad815f..e14a9370b67e 100644 --- a/include/media/davinci/vpbe_display.h +++ b/include/media/davinci/vpbe_display.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
| 18 | #include <media/v4l2-common.h> | 18 | #include <media/v4l2-common.h> |
| 19 | #include <media/v4l2-fh.h> | 19 | #include <media/v4l2-fh.h> |
| 20 | #include <media/videobuf2-v4l2.h> | ||
| 20 | #include <media/videobuf2-dma-contig.h> | 21 | #include <media/videobuf2-dma-contig.h> |
| 21 | #include <media/davinci/vpbe_types.h> | 22 | #include <media/davinci/vpbe_types.h> |
| 22 | #include <media/davinci/vpbe_osd.h> | 23 | #include <media/davinci/vpbe_osd.h> |
| @@ -64,7 +65,7 @@ struct display_layer_info { | |||
| 64 | }; | 65 | }; |
| 65 | 66 | ||
| 66 | struct vpbe_disp_buffer { | 67 | struct vpbe_disp_buffer { |
| 67 | struct vb2_buffer vb; | 68 | struct vb2_v4l2_buffer vb; |
| 68 | struct list_head list; | 69 | struct list_head list; |
| 69 | }; | 70 | }; |
| 70 | 71 | ||