From 01a059c0518082b46df9822ef25619d2b57d0c78 Mon Sep 17 00:00:00 2001 From: Zhi Zhou Date: Fri, 09 Feb 2018 22:03:49 +0000 Subject: media: tsdemux: fixed a crash bug PD#154520: media: fixed tsdemux bug. tsdemux: disable tsdemux before change the buffer to NULL{crash} Change-Id: Id4f8c470b6250b38738c5596555ab394af84299a --- diff --git a/drivers/stream_input/parser/tsdemux.c b/drivers/stream_input/parser/tsdemux.c index ec11575..600c44a 100644 --- a/drivers/stream_input/parser/tsdemux.c +++ b/drivers/stream_input/parser/tsdemux.c @@ -724,6 +724,11 @@ void tsdemux_release(void) pts_stop(PTS_TYPE_AUDIO); WRITE_RESET_REG(RESET1_REGISTER, RESET_PARSER); +#ifdef CONFIG_MULTI_DEC + SET_PARSER_REG_MASK(PARSER_ES_CONTROL, ES_VID_MAN_RD_PTR); + WRITE_PARSER_REG(PARSER_VIDEO_WP, 0); + WRITE_PARSER_REG(PARSER_VIDEO_RP, 0); +#endif /* #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6 */ /*TODO clk */ @@ -732,7 +737,6 @@ void tsdemux_release(void) */ /* #endif */ amports_switch_gate("demux", 0); - } static int limited_delay_check(struct file *file, -- cgit