diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-12-02 11:58:54 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-23 11:04:01 -0500 |
commit | 95847f4010c2e47790aa7f5064f5e3779fcec652 (patch) | |
tree | 98a1cf2bb563f8ba9a9817b95266c509c57b48c5 | |
parent | 49b966fa451c74bcb18fff415db0ae9b102fa33f (diff) |
[media] coda: enable MPEG-2 ES decoding
Hook up the MPEG-2 ES decoder.
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@osg.samsung.com>
-rw-r--r-- | drivers/media/platform/coda/coda-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 6f66a92362ee..2d782ce94a67 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c | |||
@@ -131,6 +131,7 @@ static const struct coda_codec coda7_codecs[] = { | |||
131 | CODA_CODEC(CODA7_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1280, 720), | 131 | CODA_CODEC(CODA7_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1280, 720), |
132 | CODA_CODEC(CODA7_MODE_ENCODE_MJPG, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_JPEG, 8192, 8192), | 132 | CODA_CODEC(CODA7_MODE_ENCODE_MJPG, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_JPEG, 8192, 8192), |
133 | CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1088), | 133 | CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1088), |
134 | CODA_CODEC(CODA7_MODE_DECODE_MP2, V4L2_PIX_FMT_MPEG2, V4L2_PIX_FMT_YUV420, 1920, 1088), | ||
134 | CODA_CODEC(CODA7_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1088), | 135 | CODA_CODEC(CODA7_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1088), |
135 | CODA_CODEC(CODA7_MODE_DECODE_MJPG, V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_YUV420, 8192, 8192), | 136 | CODA_CODEC(CODA7_MODE_DECODE_MJPG, V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_YUV420, 8192, 8192), |
136 | }; | 137 | }; |
@@ -139,6 +140,7 @@ static const struct coda_codec coda9_codecs[] = { | |||
139 | CODA_CODEC(CODA9_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1920, 1088), | 140 | CODA_CODEC(CODA9_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1920, 1088), |
140 | CODA_CODEC(CODA9_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1920, 1088), | 141 | CODA_CODEC(CODA9_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1920, 1088), |
141 | CODA_CODEC(CODA9_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1088), | 142 | CODA_CODEC(CODA9_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1088), |
143 | CODA_CODEC(CODA9_MODE_DECODE_MP2, V4L2_PIX_FMT_MPEG2, V4L2_PIX_FMT_YUV420, 1920, 1088), | ||
142 | CODA_CODEC(CODA9_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1088), | 144 | CODA_CODEC(CODA9_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1088), |
143 | }; | 145 | }; |
144 | 146 | ||
@@ -187,6 +189,7 @@ static const struct coda_video_device coda_bit_decoder = { | |||
187 | .ops = &coda_bit_decode_ops, | 189 | .ops = &coda_bit_decode_ops, |
188 | .src_formats = { | 190 | .src_formats = { |
189 | V4L2_PIX_FMT_H264, | 191 | V4L2_PIX_FMT_H264, |
192 | V4L2_PIX_FMT_MPEG2, | ||
190 | V4L2_PIX_FMT_MPEG4, | 193 | V4L2_PIX_FMT_MPEG4, |
191 | }, | 194 | }, |
192 | .dst_formats = { | 195 | .dst_formats = { |
@@ -470,6 +473,7 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec, | |||
470 | /* fallthrough */ | 473 | /* fallthrough */ |
471 | case V4L2_PIX_FMT_H264: | 474 | case V4L2_PIX_FMT_H264: |
472 | case V4L2_PIX_FMT_MPEG4: | 475 | case V4L2_PIX_FMT_MPEG4: |
476 | case V4L2_PIX_FMT_MPEG2: | ||
473 | f->fmt.pix.bytesperline = 0; | 477 | f->fmt.pix.bytesperline = 0; |
474 | f->fmt.pix.sizeimage = coda_estimate_sizeimage(ctx, | 478 | f->fmt.pix.sizeimage = coda_estimate_sizeimage(ctx, |
475 | f->fmt.pix.sizeimage, | 479 | f->fmt.pix.sizeimage, |