diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2017-01-16 19:18:07 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2017-01-16 02:38:52 -0800 |
| commit | 4b6d05be4499f141ca7770262a9f30da8d365798 (patch) | |
| tree | cda3357c730b8a25ca61abcfbd556f5274d66679 | |
| parent | 28da145c8f2ba22be9941bbeb853461538edde95 (diff) | |
| download | linux-exynos-4b6d05be4499f141ca7770262a9f30da8d365798.tar.gz linux-exynos-4b6d05be4499f141ca7770262a9f30da8d365798.tar.bz2 linux-exynos-4b6d05be4499f141ca7770262a9f30da8d365798.zip | |
Revert "Revert "[media] s4p-mfc: set allow_zero_bytesused flag for vb2_queue_init""submit/tizen/20170117.061257accepted/tizen/wearable/20170118.040348accepted/tizen/tv/20170118.040333accepted/tizen/mobile/20170118.040314accepted/tizen/ivi/20170118.040402accepted/tizen/common/20170117.174849
This reverts commit d5c117ccdde0b9a25161ea033364dbed479a1d55.
Without allow_zero_byteused flag, during decoding the last EOS buffer
with zero bytesused from userspace is not properly processed, so
stream is stuck without finishing all queued buffer.
Change-Id: I5725d3514885c104febb12adb44b13ae9b527817
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
| -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 7af9facc85d4..36d1b52f6e6f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -880,6 +880,13 @@ static int s5p_mfc_open(struct file *file) ret = -ENOENT; goto err_queue_init; } + /* One way to indicate end-of-stream for MFC is to set the + * bytesused == 0. However by default videobuf2 handles bytesused + * equal to 0 as a special case and changes its value to the size + * of the buffer. Set the allow_zero_bytesused flag so that videobuf2 + * will keep the value of bytesused intact. + */ + q->allow_zero_bytesused = 1; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; ret = vb2_queue_init(q); |