summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/coda.h
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2013-05-23 15:42:58 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-09 00:43:50 +0200
commitb96904e50a70618e2c3d44d267706728ca741a4c (patch)
tree31c5f9943131a3a7a299f66afc277ce27f76f3e1 /drivers/media/platform/coda.h
parent[media] coda: simplify parameter buffer setup code (diff)
downloadlinux-b96904e50a70618e2c3d44d267706728ca741a4c.tar.xz
linux-b96904e50a70618e2c3d44d267706728ca741a4c.zip
[media] coda: per-product list of codecs instead of list of formats
This patch adds a list of supported codecs per device type which is used to determine the allowed pixel formats and maximum frame sizes depending on the possible codecs. It allows frame sizes larger than 720 x 576 on CODA7 and adds support for the YVU420 (planar YUV 4:2:0 with switched Cb and Cr) format. Other uncompressed formats that could be added in the future are the chroma interleaved NV12 and NV21 formats and the multiplanar variants YUV420M, YVU420M, NV12M, and NV21M. Further, rawstreamon is renamed to streamon_out and compstreamon is renamed to streamon_cap in preparation for decoding support. The maximum encoded frame buffer size is increased to 1 MiB. Instead of tracking inst_type and codec across S_FMT calls, set the codec and inst_type in start_streaming. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/coda.h')
-rw-r--r--drivers/media/platform/coda.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/coda.h b/drivers/media/platform/coda.h
index 3c350acd5faa..ace0bf0a3b9c 100644
--- a/drivers/media/platform/coda.h
+++ b/drivers/media/platform/coda.h
@@ -113,7 +113,8 @@
#define CODADX6_PICWIDTH_OFFSET 10
#define CODADX6_PICWIDTH_MASK 0x3ff
#define CODA_PICHEIGHT_OFFSET 0
-#define CODA_PICHEIGHT_MASK 0x3ff
+#define CODADX6_PICHEIGHT_MASK 0x3ff
+#define CODA7_PICHEIGHT_MASK 0xffff
#define CODA_CMD_ENC_SEQ_SRC_F_RATE 0x194
#define CODA_CMD_ENC_SEQ_MP4_PARA 0x198
#define CODA_MP4PARAM_VERID_OFFSET 6