aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/coda
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2015-07-09 06:10:14 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-07-17 10:13:22 -0400
commit58bc7edf1d9a16073761031a03291af887ccdf66 (patch)
tree18d57028dde98547eacce816b948e3d90acb3f2c /drivers/media/platform/coda
parentb05959c66e865fb9eb5b93e223da925572130d7f (diff)
[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>
Diffstat (limited to 'drivers/media/platform/coda')
-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)
1244 1244
1245 q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); 1245 q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
1246 if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { 1246 if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
1247 if (q_data_src->fourcc == V4L2_PIX_FMT_H264 || 1247 if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit) {
1248 (q_data_src->fourcc == V4L2_PIX_FMT_JPEG &&
1249 ctx->dev->devtype->product == CODA_7541)) {
1250 /* copy the buffers that were queued before streamon */ 1248 /* copy the buffers that were queued before streamon */
1251 mutex_lock(&ctx->bitstream_mutex); 1249 mutex_lock(&ctx->bitstream_mutex);
1252 coda_fill_bitstream(ctx, false); 1250 coda_fill_bitstream(ctx, false);