shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media_module: fix cts test h265 hangup issue [1/1]

Browse Source 
PD#SWPL-3089

Problem:
h265 decoder hangup, cause system reboot

Solution:
skip error data to avoid decoder crash

Verify:
Verified p212

Change-Id: I8834eb9d7897a1f0d95c0d9534febf35beba0c51
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
This commit is contained in:
Hui Zhang
2018-12-31 17:53:57 +08:00
committed by Dongjin Kim
parent e74dab5457
commit 48026380b9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c
View File

@@ -1648,6 +1648,7 @@ struct hevc_state_s {
struct mutex chunks_mutex;
int need_cache_size;
u64 sc_start_time;
u32 skip_first_nal;
} /*hevc_stru_t */;
#ifdef AGAIN_HAS_THRESHOLD
@@ -8631,10 +8632,15 @@ pic_done:
hevc->lcu_size_log2 = log2i(hevc->lcu_size);
if (hevc->pic_w == 0 || hevc->pic_h == 0
|| hevc->lcu_size == 0
|| is_oversize(hevc->pic_w, hevc->pic_h)) {
|| is_oversize(hevc->pic_w, hevc->pic_h)
|| (!hevc->skip_first_nal &&
(hevc->pic_h == 96) && (hevc->pic_w == 160))) {
/* skip search next start code */
WRITE_VREG(HEVC_WAIT_FLAG, READ_VREG(HEVC_WAIT_FLAG)
& (~0x2));
if ( !hevc->skip_first_nal &&
(hevc->pic_h == 96) && (hevc->pic_w == 160))
hevc->skip_first_nal = 1;
hevc->skip_flag = 1;
WRITE_VREG(HEVC_DEC_STATUS_REG, HEVC_ACTION_DONE);
/* Interrupt Amrisc to excute */