diff options
author | Kamil Debski <k.debski@samsung.com> | 2015-02-23 07:26:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-10 08:47:15 -0400 |
commit | e6c9dec3e7d68c477768e2955c7f8ed78a09bfd6 (patch) | |
tree | 7aa2636a2720968b5b88d11810c7a03eb1ff955b /drivers/media | |
parent | e4af23d33193c4da52fa84b835374e975085f8fd (diff) |
[media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
The s5p-mfc driver interprets a buffer with bytesused equal to 0 as a
special case indicating end-of-stream. After vb2: fix bytesused == 0
handling (8a75ffb) patch videobuf2 modified the value of bytesused if it
was 0. The allow_zero_bytesused flag was added to videobuf2 to keep
backward compatibility.
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 8e44a59d8ec2..9fe4d90f54a8 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c | |||
@@ -843,6 +843,13 @@ static int s5p_mfc_open(struct file *file) | |||
843 | ret = -ENOENT; | 843 | ret = -ENOENT; |
844 | goto err_queue_init; | 844 | goto err_queue_init; |
845 | } | 845 | } |
846 | /* One way to indicate end-of-stream for MFC is to set the | ||
847 | * bytesused == 0. However by default videobuf2 handles bytesused | ||
848 | * equal to 0 as a special case and changes its value to the size | ||
849 | * of the buffer. Set the allow_zero_bytesused flag so that videobuf2 | ||
850 | * will keep the value of bytesused intact. | ||
851 | */ | ||
852 | q->allow_zero_bytesused = 1; | ||
846 | q->mem_ops = &vb2_dma_contig_memops; | 853 | q->mem_ops = &vb2_dma_contig_memops; |
847 | q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; | 854 | q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; |
848 | ret = vb2_queue_init(q); | 855 | ret = vb2_queue_init(q); |