From 3a030be0418038c960cc0e3fb3a1ba3adf751f74 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Fri, 28 Aug 2020 15:59:11 +0800 Subject: [PATCH] vmh264: fix DCAC dma memory pollution issue [1/1] PD#SWPL-32462 Problem: memory pullotion by DCAC dma Solution: add DCAC dma address range check to void oversize ucode gerrit id: 122592 ucode commit id: b99eca ucode change id: I038ee Verify: u212 Change-Id: I038ee5769324539ae55876b9572f6ed795f164f7 Signed-off-by: Hui Zhang --- .../decoder/h264_multi/vmh264.c | 6 +++--- firmware/video_ucode.bin | Bin 1459200 -> 1459200 bytes 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 firmware/video_ucode.bin diff --git a/drivers/frame_provider/decoder/h264_multi/vmh264.c b/drivers/frame_provider/decoder/h264_multi/vmh264.c index ebe3915..2edfd87 100644 --- a/drivers/frame_provider/decoder/h264_multi/vmh264.c +++ b/drivers/frame_provider/decoder/h264_multi/vmh264.c @@ -387,9 +387,9 @@ static inline bool close_to(int a, int b, int m) #define DEFAULT_MEM_SIZE (32*1024*1024) #define AVIL_DPB_BUFF_SIZE 0x01ec2000 -#define DEF_BUF_START_ADDR 0x01000000 -#define mem_sps_base 0x011c3c00 -#define mem_pps_base 0x011cbc00 +#define DEF_BUF_START_ADDR 0x00000000 +#define mem_sps_base 0x01c3c00 +#define mem_pps_base 0x01cbc00 /*#define V_BUF_ADDR_OFFSET (0x13e000)*/ u32 V_BUF_ADDR_OFFSET = 0x200000; #define DCAC_READ_MARGIN (64 * 1024) diff --git a/firmware/video_ucode.bin b/firmware/video_ucode.bin old mode 100644 new mode 100755 index 6e1289c105fa73dd5344526c93d21d5fcc73c1a9..b5c53a60db5b9d20a4523da50bdbba804f8c8f00 GIT binary patch delta 17403 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 Demoxs delta 17203 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