diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-07-26 08:30:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 18:31:53 -0400 |
commit | f0476a83d61a8004eb535a0b65721ca405421fe8 (patch) | |
tree | 090e739691637494b9438412914ae91598ee017d /drivers/media/video/s5p-mfc/s5p_mfc_enc.c | |
parent | 6126b912c84240692e26c1b820a7097610eddf34 (diff) |
[media] V4L: Add capability flags for memory-to-memory devices
This patch adds new V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE
capability flags that are intended to be used for memory-to-memory (M2M)
devices, instead of ORed V4L2_CAP_VIDEO_CAPTURE and V4L2_CAP_VIDEO_OUTPUT.
V4L2_CAP_VIDEO_M2M flag is added at the drivers, CAPTURE and OUTPUT
capability flags are left untouched and will be removed in future,
after a transition period required for existing applications to be
adapted to check only for V4L2_CAP_VIDEO_M2M.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kamil Debski <k.debski@samsung.com>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-mfc/s5p_mfc_enc.c')
-rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index 158b78989b89..aa1c244cf66e 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c | |||
@@ -779,9 +779,14 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
779 | strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1); | 779 | strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1); |
780 | cap->bus_info[0] = 0; | 780 | cap->bus_info[0] = 0; |
781 | cap->version = KERNEL_VERSION(1, 0, 0); | 781 | cap->version = KERNEL_VERSION(1, 0, 0); |
782 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE | 782 | /* |
783 | | V4L2_CAP_VIDEO_OUTPUT_MPLANE | 783 | * This is only a mem-to-mem video device. The capture and output |
784 | | V4L2_CAP_STREAMING; | 784 | * device capability flags are left only for backward compatibility |
785 | * and are scheduled for removal. | ||
786 | */ | ||
787 | cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING | | ||
788 | V4L2_CAP_VIDEO_CAPTURE_MPLANE | | ||
789 | V4L2_CAP_VIDEO_OUTPUT_MPLANE; | ||
785 | return 0; | 790 | return 0; |
786 | } | 791 | } |
787 | 792 | ||