Commit f0a17f75 authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: Add format to support MT21C 



Needs to use mediatek compressed mode for mt8192 decoder.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 76250b48

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c

+6 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static const struct mtk_stateless_control mtk_stateless_controls[] = { 


#define NUM_CTRLS ARRAY_SIZE(mtk_stateless_controls)



static struct mtk_video_fmt mtk_video_formats[2];

static struct mtk_video_fmt mtk_video_formats[3];

static struct mtk_codec_framesizes mtk_vdec_framesizes[1];



static struct mtk_video_fmt default_out_format;
@@ -331,6 +331,7 @@ static void mtk_vcodec_add_formats(unsigned int fourcc, 
		num_framesizes++;

		break;

	case V4L2_PIX_FMT_MM21:

	case V4L2_PIX_FMT_MT21C:

		mtk_video_formats[count_formats].fourcc = fourcc;

		mtk_video_formats[count_formats].type = MTK_FMT_FRAME;

		mtk_video_formats[count_formats].num_planes = 2;
@@ -356,6 +357,10 @@ static void mtk_vcodec_get_supported_formats(struct mtk_vcodec_ctx *ctx) 
		mtk_vcodec_add_formats(V4L2_PIX_FMT_MM21, ctx);

		cap_format_count++;

	}

	if (ctx->dev->dec_capability & MTK_VDEC_FORMAT_MT21C) {

		mtk_vcodec_add_formats(V4L2_PIX_FMT_MT21C, ctx);

		cap_format_count++;

	}

	if (ctx->dev->dec_capability & MTK_VDEC_FORMAT_H264_SLICE) {

		mtk_vcodec_add_formats(V4L2_PIX_FMT_H264_SLICE, ctx);

		out_format_count++;

drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ enum mtk_vdec_hw_arch { 
 */

enum mtk_vdec_format_types {

	MTK_VDEC_FORMAT_MM21 = 0x20,

	MTK_VDEC_FORMAT_MT21C = 0x40,

	MTK_VDEC_FORMAT_H264_SLICE = 0x100,

};