media: coda: add decoder MPEG-4 profile and level controls (23e0b8c6) · Commits · 戴 / test

drivers/media/platform/coda/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only

		coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
		coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg4.o coda-jpeg.o

		obj-$(CONFIG_VIDEO_CODA) += coda.o
		obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o

+23 −0

Original line number	Diff line number	Diff line
		@@ -1590,6 +1590,15 @@ void coda_update_profile_level_ctrls(struct coda_ctx *ctx, u8 profile_idc,
		profile = coda_h264_profile(profile_idc);
		level = coda_h264_level(level_idc);
		break;
		case V4L2_PIX_FMT_MPEG4:
		codec_name = "MPEG-4";
		profile_cid = V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE;
		level_cid = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL;
		profile_ctrl = ctx->mpeg4_profile_ctrl;
		level_ctrl = ctx->mpeg4_level_ctrl;
		profile = coda_mpeg4_profile(profile_idc);
		level = coda_mpeg4_level(level_idc);
		break;
		default:
		return;
		}
		@@ -2119,6 +2128,20 @@ static void coda_decode_ctrls(struct coda_ctx *ctx)
		&coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL, max, 0, max);
		if (ctx->h264_level_ctrl)
		ctx->h264_level_ctrl->flags \|= V4L2_CTRL_FLAG_READ_ONLY;

		ctx->mpeg4_profile_ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrls,
		&coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE,
		V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY, 0,
		V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY);
		if (ctx->mpeg4_profile_ctrl)
		ctx->mpeg4_profile_ctrl->flags \|= V4L2_CTRL_FLAG_READ_ONLY;

		ctx->mpeg4_level_ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrls,
		&coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
		V4L2_MPEG_VIDEO_MPEG4_LEVEL_5, 0,
		V4L2_MPEG_VIDEO_MPEG4_LEVEL_5);
		if (ctx->mpeg4_level_ctrl)
		ctx->mpeg4_level_ctrl->flags \|= V4L2_CTRL_FLAG_READ_ONLY;
		}

		static int coda_ctrls_setup(struct coda_ctx *ctx)

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-or-later
		/*
		* Coda multi-standard codec IP - MPEG-4 helper functions
		*
		* Copyright (C) 2019 Pengutronix, Philipp Zabel
		*/

		#include <linux/kernel.h>
		#include <linux/videodev2.h>

		#include "coda.h"

		int coda_mpeg4_profile(int profile_idc)
		{
		switch (profile_idc) {
		case 0:
		return V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE;
		case 15:
		return V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE;
		case 2:
		return V4L2_MPEG_VIDEO_MPEG4_PROFILE_CORE;
		case 1:
		return V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE_SCALABLE;
		case 11:
		return V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY;
		default:
		return -EINVAL;
		}
		}

		int coda_mpeg4_level(int level_idc)
		{
		switch (level_idc) {
		case 0:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_0;
		case 1:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_1;
		case 2:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_2;
		case 3:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_3;
		case 4:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_4;
		case 5:
		return V4L2_MPEG_VIDEO_MPEG4_LEVEL_5;
		default:
		return -EINVAL;
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,8 @@ struct coda_ctx {
		struct v4l2_ctrl_handler ctrls;
		struct v4l2_ctrl *h264_profile_ctrl;
		struct v4l2_ctrl *h264_level_ctrl;
		struct v4l2_ctrl *mpeg4_profile_ctrl;
		struct v4l2_ctrl *mpeg4_level_ctrl;
		struct v4l2_fh fh;
		int gopcounter;
		int runcounter;
		@@ -328,6 +330,9 @@ int coda_sps_parse_profile(struct coda_ctx ctx, struct vb2_buffer vb);
		int coda_h264_sps_fixup(struct coda_ctx ctx, int width, int height, char buf,
		int *size, int max_size);

		int coda_mpeg4_profile(int profile_idc);
		int coda_mpeg4_level(int level_idc);

		void coda_update_profile_level_ctrls(struct coda_ctx *ctx, u8 profile_idc,
		u8 level_idc);