iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: mtk-vcodec: Clean redundant encoder format definition

Browse Source 
The supported capture/output formats don't depend on models,
clean redundant definitions and naming with type instead.

Signed-off-by: Irui Wang <irui.wang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Irui Wang 2021-06-30 10:52:45 +02:00 committed by Mauro Carvalho Chehab
parent 4461a723ab
commit 97e6e701f3
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
View File

@ -26,7 +26,7 @@
module_param(mtk_v4l2_dbg_level, int, S_IRUGO | S_IWUSR); module_param(mtk_v4l2_dbg_level, int, S_IRUGO | S_IWUSR);
module_param(mtk_vcodec_dbg, bool, S_IRUGO | S_IWUSR); module_param(mtk_vcodec_dbg, bool, S_IRUGO | S_IWUSR);
static const struct mtk_video_fmt mtk_video_formats_output_mt8173[] = { static const struct mtk_video_fmt mtk_video_formats_output[] = {
{ {
.fourcc = V4L2_PIX_FMT_NV12M, .fourcc = V4L2_PIX_FMT_NV12M,
.type = MTK_FMT_FRAME, .type = MTK_FMT_FRAME,
@ -49,7 +49,7 @@ static const struct mtk_video_fmt mtk_video_formats_output_mt8173[] = {
}, },
}; };
static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_avc[] = { static const struct mtk_video_fmt mtk_video_formats_capture_h264[] = {
{ {
.fourcc = V4L2_PIX_FMT_H264, .fourcc = V4L2_PIX_FMT_H264,
.type = MTK_FMT_ENC, .type = MTK_FMT_ENC,
@ -57,7 +57,7 @@ static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_avc[] = {
}, },
}; };
static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_vp8[] = { static const struct mtk_video_fmt mtk_video_formats_capture_vp8[] = {
{ {
.fourcc = V4L2_PIX_FMT_VP8, .fourcc = V4L2_PIX_FMT_VP8,
.type = MTK_FMT_ENC, .type = MTK_FMT_ENC,
@ -65,14 +65,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_vp8[] = {
}, },
}; };
static const struct mtk_video_fmt mtk_video_formats_capture_mt8183[] = {
{
.fourcc = V4L2_PIX_FMT_H264,
.type = MTK_FMT_ENC,
.num_planes = 1,
},
};
/* Wake up context wait_queue */ /* Wake up context wait_queue */
static void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason) static void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason)
{ {
@ -392,10 +384,10 @@ err_enc_pm:
static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = { static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = {
.chip = MTK_MT8173, .chip = MTK_MT8173,
.capture_formats = mtk_video_formats_capture_mt8173_avc, .capture_formats = mtk_video_formats_capture_h264,
.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8173_avc), .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_h264),
.output_formats = mtk_video_formats_output_mt8173, .output_formats = mtk_video_formats_output,
.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), .num_output_formats = ARRAY_SIZE(mtk_video_formats_output),
.min_bitrate = 1, .min_bitrate = 1,
.max_bitrate = 4000000, .max_bitrate = 4000000,
.core_id = VENC_SYS, .core_id = VENC_SYS,
@ -403,10 +395,10 @@ static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = {
static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = { static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = {
.chip = MTK_MT8173, .chip = MTK_MT8173,
.capture_formats = mtk_video_formats_capture_mt8173_vp8, .capture_formats = mtk_video_formats_capture_vp8,
.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8173_vp8), .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_vp8),
.output_formats = mtk_video_formats_output_mt8173, .output_formats = mtk_video_formats_output,
.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), .num_output_formats = ARRAY_SIZE(mtk_video_formats_output),
.min_bitrate = 64, .min_bitrate = 64,
.max_bitrate = 4000000, .max_bitrate = 4000000,
.core_id = VENC_LT_SYS, .core_id = VENC_LT_SYS,
@ -415,11 +407,10 @@ static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = {
static const struct mtk_vcodec_enc_pdata mt8183_pdata = { static const struct mtk_vcodec_enc_pdata mt8183_pdata = {
.chip = MTK_MT8183, .chip = MTK_MT8183,
.uses_ext = true, .uses_ext = true,
.capture_formats = mtk_video_formats_capture_mt8183, .capture_formats = mtk_video_formats_capture_h264,
.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8183), .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_h264),
/* MT8183 supports the same output formats as MT8173 */ .output_formats = mtk_video_formats_output,
.output_formats = mtk_video_formats_output_mt8173, .num_output_formats = ARRAY_SIZE(mtk_video_formats_output),
.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173),
.min_bitrate = 64, .min_bitrate = 64,
.max_bitrate = 40000000, .max_bitrate = 40000000,
.core_id = VENC_SYS, .core_id = VENC_SYS,
@ -428,16 +419,15 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = {
static const struct mtk_vcodec_enc_pdata mt8192_pdata = { static const struct mtk_vcodec_enc_pdata mt8192_pdata = {
.chip = MTK_MT8192, .chip = MTK_MT8192,
.uses_ext = true, .uses_ext = true,
/* MT8192 supports the same capture formats as MT8183 */ .capture_formats = mtk_video_formats_capture_h264,
.capture_formats = mtk_video_formats_capture_mt8183, .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_h264),
.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8183), .output_formats = mtk_video_formats_output,
/* MT8192 supports the same output formats as MT8173 */ .num_output_formats = ARRAY_SIZE(mtk_video_formats_output),
.output_formats = mtk_video_formats_output_mt8173,
.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173),
.min_bitrate = 64, .min_bitrate = 64,
.max_bitrate = 100000000, .max_bitrate = 100000000,
.core_id = VENC_SYS, .core_id = VENC_SYS,
}; };
static const struct of_device_id mtk_vcodec_enc_match[] = { static const struct of_device_id mtk_vcodec_enc_match[] = {
{.compatible = "mediatek,mt8173-vcodec-enc", {.compatible = "mediatek,mt8173-vcodec-enc",
.data = &mt8173_avc_pdata}, .data = &mt8173_avc_pdata},