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

media: mediatek: vcodec: separate decoder and encoder 



Move all decoder files to folder decoder.
Move all encoder files to folder encoder.
Move common files which shared for encoder and decoder to folder common.

Change include header files and Makefile to fix build error.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 183b0b4b

drivers/media/platform/mediatek/vcodec/Makefile

+3 −52
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \

				       mtk-vcodec-enc.o \

				       mtk-vcodec-common.o \

				       mtk-vcodec-dec-hw.o



mtk-vcodec-dec-y := vdec/vdec_h264_if.o \

		vdec/vdec_vp8_if.o \

		vdec/vdec_vp8_req_if.o \

		vdec/vdec_vp9_if.o \

		vdec/vdec_vp9_req_lat_if.o \

		vdec/vdec_av1_req_lat_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 \

		vdec_msg_queue.o \

		mtk_vcodec_dec.o \

		mtk_vcodec_dec_stateful.o \

		mtk_vcodec_dec_stateless.o \

		mtk_vcodec_dec_pm.o \



mtk-vcodec-dec-hw-y := mtk_vcodec_dec_hw.o



mtk-vcodec-enc-y := venc/venc_vp8_if.o \

		venc/venc_h264_if.o \

		mtk_vcodec_enc.o \

		mtk_vcodec_enc_drv.o \

		mtk_vcodec_enc_pm.o \

		venc_drv_if.o \

		venc_vpu_if.o \





mtk-vcodec-common-y := mtk_vcodec_intr.o \

		mtk_vcodec_util.o \

		mtk_vcodec_fw.o \



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_VPU),)

mtk-vcodec-common-y += mtk_vcodec_fw_vpu.o

endif



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_SCP),)

mtk-vcodec-common-y += mtk_vcodec_fw_scp.o

endif



ifneq ($(CONFIG_DEBUG_FS),)

obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dbgfs.o



mtk-vcodec-dbgfs-y := mtk_vcodec_dbgfs.o

endif
 
 No newline at end of file
 
obj-y += common/

obj-y += encoder/

obj-y += decoder/

drivers/media/platform/mediatek/vcodec/common/Makefile

0 → 100644
+21 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-common.o



mtk-vcodec-common-y := mtk_vcodec_intr.o \

		mtk_vcodec_util.o \

		mtk_vcodec_fw.o \



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_VPU),)

mtk-vcodec-common-y += mtk_vcodec_fw_vpu.o

endif



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_SCP),)

mtk-vcodec-common-y += mtk_vcodec_fw_scp.o

endif



ifneq ($(CONFIG_DEBUG_FS),)

obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dbgfs.o



mtk-vcodec-dbgfs-y := mtk_vcodec_dbgfs.o

endif
 
 No newline at end of file

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c→drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
#include <linux/debugfs.h>



#include "mtk_vcodec_dbgfs.h"

#include "mtk_vcodec_dec_drv.h"

#include "mtk_vcodec_enc_drv.h"

#include "../decoder/mtk_vcodec_dec_drv.h"

#include "../encoder/mtk_vcodec_enc_drv.h"

#include "mtk_vcodec_util.h"



static void mtk_vdec_dbgfs_get_format_type(struct mtk_vcodec_dec_ctx *ctx, char *buf,