| author | yongchun.li <yongchun.li@amlogic.com> | 2019-05-31 00:30:24 (GMT) |
|---|---|---|
| committer | Yongchun Li <yongchun.li@amlogic.com> | 2019-06-01 00:32:28 (GMT) |
| commit | e6c53468ade19b4628356ffa72eb400d39e29d80 (patch) | |
| tree | 8430b28ca8bb1c109c11f94e346dee1fa9c8ae4a | |
| parent | 7330800776b693f277829f5f085488690463d6ad (diff) | |
| download | media_modules-e6c53468ade19b4628356ffa72eb400d39e29d80.zip media_modules-e6c53468ade19b4628356ffa72eb400d39e29d80.tar.gz media_modules-e6c53468ade19b4628356ffa72eb400d39e29d80.tar.bz2 | |
media: Media.mk remove the useless and misleading defines [1/1]
PD#SWPL-8995
Problem:
1. Media definition CONFIG_AMLOGIC_MEDIA_GE2D and
CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION were defined from kernel config,
the definitions here are useless, misleading and potential casue mismatch.
2. HEVC video encoder shale use the module control defined in Media.mk
Solution:
Remove those useless definitions,and HEVC encoder use
CONFIG_AMLOGIC_MEDIA_VENC_H265 in make file intead hard code.
Verify:
U211
Change-Id: I19c691ee4953cfd2e476a2f67da92cf416197bc9
Signed-off-by: yongchun.li <yongchun.li@amlogic.com>
| -rw-r--r-- | Media.mk | 4 | ||||
| -rw-r--r-- | drivers/frame_sink/encoder/h265/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -20,9 +20,7 @@ CONFIGS := CONFIG_AMLOGIC_MEDIA_VDEC_MPEG12=m \ CONFIG_AMLOGIC_MEDIA_VDEC_AVS=m \ CONFIG_AMLOGIC_MEDIA_VDEC_AVS2=m \ CONFIG_AMLOGIC_MEDIA_VENC_H264=m \ - CONFIG_AMLOGIC_MEDIA_VENC_H265=m \ - CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y - CONFIG_AMLOGIC_MEDIA_GE2D=y + CONFIG_AMLOGIC_MEDIA_VENC_H265=m define copy-media-modules $(foreach m, $(shell find $(strip $(1)) -name "*.ko"),\ diff --git a/drivers/frame_sink/encoder/h265/Makefile b/drivers/frame_sink/encoder/h265/Makefile index e7414bf..833822c 100644 --- a/drivers/frame_sink/encoder/h265/Makefile +++ b/drivers/frame_sink/encoder/h265/Makefile @@ -1 +1 @@ -obj-m += vpu.o +obj-$(CONFIG_AMLOGIC_MEDIA_VENC_H265) += vpu.o |