Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95847f40 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: enable MPEG-2 ES decoding 



Hook up the MPEG-2 ES decoder.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 49b966fa

drivers/media/platform/coda/coda-common.c

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static const struct coda_codec coda7_codecs[] = { 
	CODA_CODEC(CODA7_MODE_ENCODE_MP4,  V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4,  1280, 720),

	CODA_CODEC(CODA7_MODE_ENCODE_MJPG, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_JPEG,   8192, 8192),

	CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264,   V4L2_PIX_FMT_YUV420, 1920, 1088),

	CODA_CODEC(CODA7_MODE_DECODE_MP2,  V4L2_PIX_FMT_MPEG2,  V4L2_PIX_FMT_YUV420, 1920, 1088),

	CODA_CODEC(CODA7_MODE_DECODE_MP4,  V4L2_PIX_FMT_MPEG4,  V4L2_PIX_FMT_YUV420, 1920, 1088),

	CODA_CODEC(CODA7_MODE_DECODE_MJPG, V4L2_PIX_FMT_JPEG,   V4L2_PIX_FMT_YUV420, 8192, 8192),

};
@@ -139,6 +140,7 @@ static const struct coda_codec coda9_codecs[] = { 
	CODA_CODEC(CODA9_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264,   1920, 1088),

	CODA_CODEC(CODA9_MODE_ENCODE_MP4,  V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4,  1920, 1088),

	CODA_CODEC(CODA9_MODE_DECODE_H264, V4L2_PIX_FMT_H264,   V4L2_PIX_FMT_YUV420, 1920, 1088),

	CODA_CODEC(CODA9_MODE_DECODE_MP2,  V4L2_PIX_FMT_MPEG2,  V4L2_PIX_FMT_YUV420, 1920, 1088),

	CODA_CODEC(CODA9_MODE_DECODE_MP4,  V4L2_PIX_FMT_MPEG4,  V4L2_PIX_FMT_YUV420, 1920, 1088),

};
@@ -187,6 +189,7 @@ static const struct coda_video_device coda_bit_decoder = { 
	.ops = &coda_bit_decode_ops,

	.src_formats = {

		V4L2_PIX_FMT_H264,

		V4L2_PIX_FMT_MPEG2,

		V4L2_PIX_FMT_MPEG4,

	},

	.dst_formats = {
@@ -470,6 +473,7 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec, 
		/* fallthrough */

	case V4L2_PIX_FMT_H264:

	case V4L2_PIX_FMT_MPEG4:

	case V4L2_PIX_FMT_MPEG2:

		f->fmt.pix.bytesperline = 0;

		f->fmt.pix.sizeimage = coda_estimate_sizeimage(ctx,

							f->fmt.pix.sizeimage,