aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-07-18 10:22:44 (GMT)
committerKamil Debski <k.debski@samsung.com>2014-08-05 15:18:36 (GMT)
commitf45fadf88fc550b71fc2b072dc54abeeeb1d4938 (patch)
tree6ab45b842ecd611bab2db86951090a676d4bbcf9
parent651cf3f6e626ce43e34033c99d62af9a0853e91f (diff)
coda: default to h.264 decoder on invalid formats
If the user provides an invalid format, let the decoder device default to h.264. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kamil Debski <k.debski@samsung.com>
-rw-r--r--drivers/media/platform/coda.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 9493cfd..b18814eb 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -683,7 +683,7 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct coda_ctx *ctx = fh_to_ctx(priv);
- struct coda_codec *codec;
+ struct coda_codec *codec = NULL;
struct vb2_queue *src_vq;
int ret;
@@ -736,6 +736,12 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv,
/* Determine codec by encoded format, returns NULL if raw or invalid */
codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
V4L2_PIX_FMT_YUV420);
+ if (!codec && ctx->inst_type == CODA_INST_DECODER) {
+ codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
+ V4L2_PIX_FMT_YUV420);
+ if (!codec)
+ return -EINVAL;
+ }
if (!f->fmt.pix.colorspace)
f->fmt.pix.colorspace = V4L2_COLORSPACE_REC709;

Privacy Policy