summaryrefslogtreecommitdiff
authorShen Liu <shen.liu@amlogic.com>2020-10-09 11:45:06 (GMT)
committer Shen Liu <shen.liu@amlogic.com>2020-10-15 03:26:20 (GMT)
commit0a1a585619d831adedc34b6dde51ae81e39f3403 (patch)
treee4983fcb0d2a9eecc2705f7b542951d027649836
parent23ebf7a29d5c8c08ad34cc56881a5ed940f3ef23 (diff)
downloadmedia_modules-0a1a585619d831adedc34b6dde51ae81e39f3403.zip
media_modules-0a1a585619d831adedc34b6dde51ae81e39f3403.tar.gz
media_modules-0a1a585619d831adedc34b6dde51ae81e39f3403.tar.bz2
media_modules: dvb unable to play h265 in single mode.
PD#OTT-13483 Problem: h265's ucode loading failed. Solution: when hevc dmc is disabled, it need to be enabled before ucode load. single mode missed it. Verify: franklin Change-Id: I9d92fc90aeb12950211855dcf6f4b8d6644d148d Signed-off-by: Shen Liu <shen.liu@amlogic.com>
Diffstat
-rw-r--r--drivers/frame_provider/decoder/utils/vdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/frame_provider/decoder/utils/vdec.c b/drivers/frame_provider/decoder/utils/vdec.c
index d8912f8..1886192 100644
--- a/drivers/frame_provider/decoder/utils/vdec.c
+++ b/drivers/frame_provider/decoder/utils/vdec.c
@@ -1827,8 +1827,7 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k)
mutex_lock(&vdec_mutex);
inited_vcodec_num++;
mutex_unlock(&vdec_mutex);
- if (vdec_single(vdec))
- vdec_enable_DMC(vdec);
+
vdec_input_set_type(&vdec->input, vdec->type,
(vdec->format == VFORMAT_HEVC ||
@@ -1836,6 +1835,8 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k)
vdec->format == VFORMAT_VP9) ?
VDEC_INPUT_TARGET_HEVC :
VDEC_INPUT_TARGET_VLD);
+ if (vdec_single(vdec))
+ vdec_enable_DMC(vdec);
p->cma_dev = vdec_core->cma_dev;
p->get_canvas = get_canvas;