Commit 2674486a authored by Yunfei Dong's avatar Yunfei Dong Committed by Hans Verkuil
Browse files

media: mediatek: vcodec: support stateless hevc decoder 



Add mediatek hevc decoder linux driver which use the stateless API in
MT8195.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarNathan Hebert <nhebert@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: add () around 'flag' in macro]
parent ae440c5d

drivers/media/platform/mediatek/vcodec/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ mtk-vcodec-dec-y := vdec/vdec_h264_if.o \ 
		vdec/vdec_h264_req_if.o \

		vdec/vdec_h264_req_common.o \

		vdec/vdec_h264_req_multi_if.o \

		vdec/vdec_hevc_req_multi_if.o \

		mtk_vcodec_dec_drv.o \

		vdec_drv_if.o \

		vdec_vpu_if.o \

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

+58 −1
Original line number Diff line number Diff line
@@ -107,11 +107,63 @@ static const struct mtk_stateless_control mtk_stateless_controls[] = { 
		},

		.codec_type = V4L2_PIX_FMT_VP9_FRAME,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_SPS,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_PPS,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_SCALING_MATRIX,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_DECODE_PARAMS,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_MPEG_VIDEO_HEVC_PROFILE,

			.def = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN,

			.max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10,

			.menu_skip_mask =

				BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE),

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_DECODE_MODE,

			.min = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,

			.def = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,

			.max = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

	{

		.cfg = {

			.id = V4L2_CID_STATELESS_HEVC_START_CODE,

			.min = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,

			.def = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,

			.max = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,

		},

		.codec_type = V4L2_PIX_FMT_HEVC_SLICE,

	},

};



#define NUM_CTRLS ARRAY_SIZE(mtk_stateless_controls)



static struct mtk_video_fmt mtk_video_formats[5];

static struct mtk_video_fmt mtk_video_formats[6];



static struct mtk_video_fmt default_out_format;

static struct mtk_video_fmt default_cap_format;
@@ -356,6 +408,7 @@ static void mtk_vcodec_add_formats(unsigned int fourcc, 
	case V4L2_PIX_FMT_H264_SLICE:

	case V4L2_PIX_FMT_VP8_FRAME:

	case V4L2_PIX_FMT_VP9_FRAME:

	case V4L2_PIX_FMT_HEVC_SLICE:

		mtk_video_formats[count_formats].fourcc = fourcc;

		mtk_video_formats[count_formats].type = MTK_FMT_DEC;

		mtk_video_formats[count_formats].num_planes = 1;
@@ -412,6 +465,10 @@ static void mtk_vcodec_get_supported_formats(struct mtk_vcodec_ctx *ctx) 
		mtk_vcodec_add_formats(V4L2_PIX_FMT_VP9_FRAME, ctx);

		out_format_count++;

	}

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

		mtk_vcodec_add_formats(V4L2_PIX_FMT_HEVC_SLICE, ctx);

		out_format_count++;

	}



	if (cap_format_count)

		default_cap_format = mtk_video_formats[cap_format_count - 1];

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

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ enum mtk_vdec_format_types { 
	MTK_VDEC_FORMAT_H264_SLICE = 0x100,

	MTK_VDEC_FORMAT_VP8_FRAME = 0x200,

	MTK_VDEC_FORMAT_VP9_FRAME = 0x400,

	MTK_VDEC_FORMAT_HEVC_FRAME = 0x1000,

	MTK_VCODEC_INNER_RACING = 0x20000,

};

drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c

0 → 100644
+1097 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ int vdec_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc) 
		ctx->dec_if = &vdec_vp9_slice_lat_if;

		ctx->hw_id = IS_VDEC_LAT_ARCH(hw_arch) ? MTK_VDEC_LAT0 : MTK_VDEC_CORE;

		break;

	case V4L2_PIX_FMT_HEVC_SLICE:

		ctx->dec_if = &vdec_hevc_slice_multi_if;

		ctx->hw_id = MTK_VDEC_LAT0;

		break;

	default:

		return -EINVAL;

	}