From 72bb68f1f593a27e5a14f21d87e576832ffdd19a Mon Sep 17 00:00:00 2001 From: Rongrong Zhou Date: Fri, 13 Oct 2017 16:50:06 +0800 Subject: [PATCH] media: fixed amports: fix h265 stream mode stuck issue PD#152147: decoder size r maybe overwrite by amhevc_vdec_loadmc_ex return. Change-Id: Icc87d293b1eedd557a6d2b12e7ee369d1c1cc7b4 --- .../media_modules/frame_provider/decoder/h265/vh265.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c b/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c index 1bdde61b8905..ab24935f7d15 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c @@ -9361,7 +9361,7 @@ static void run(struct vdec_s *vdec, { struct hevc_state_s *hevc = (struct hevc_state_s *)vdec->private; - int r; + int r, loadr; unsigned char check_sum = 0; run_count[hevc->index]++; @@ -9426,11 +9426,11 @@ static void run(struct vdec_s *vdec, } if (hevc->mmu_enable &&(get_cpu_type() >= MESON_CPU_MAJOR_ID_GXL)) - r = amhevc_vdec_loadmc_ex(vdec, "vh265_mc_mmu", hevc->fw->data); + loadr = amhevc_vdec_loadmc_ex(vdec, "vh265_mc_mmu", hevc->fw->data); else - r = amhevc_vdec_loadmc_ex(vdec, "vh265_mc", hevc->fw->data); + loadr = amhevc_vdec_loadmc_ex(vdec, "vh265_mc", hevc->fw->data); - if (r < 0) { + if (loadr < 0) { amhevc_disable(); hevc_print(hevc, 0, "%s: Error amvdec_loadmc fail\n",