summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel2015-07-09 12:10:14 +0200
committerMauro Carvalho Chehab2015-07-17 16:13:22 +0200
commit58bc7edf1d9a16073761031a03291af887ccdf66 (patch)
tree18d57028dde98547eacce816b948e3d90acb3f2c
parent[media] coda: fix mvcol buffer for MPEG4 decoding (diff)
downloadkernel-qcow2-linux-58bc7edf1d9a16073761031a03291af887ccdf66.tar.gz
kernel-qcow2-linux-58bc7edf1d9a16073761031a03291af887ccdf66.tar.xz
kernel-qcow2-linux-58bc7edf1d9a16073761031a03291af887ccdf66.zip
[media] coda: fix bitstream preloading for MPEG4 decoding
All decoder instances using the BIT processor should preload buffers into the bitstream ring buffer, including MPEG4 decoding. Fix this by explicitly stating the above condition instead of listing all relevant input formats. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/platform/coda/coda-common.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 58f65486de33..3259ea61cd9b 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1244,9 +1244,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
- if (q_data_src->fourcc == V4L2_PIX_FMT_H264 ||
- (q_data_src->fourcc == V4L2_PIX_FMT_JPEG &&
- ctx->dev->devtype->product == CODA_7541)) {
+ if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit) {
/* copy the buffers that were queued before streamon */
mutex_lock(&ctx->bitstream_mutex);
coda_fill_bitstream(ctx, false);