| author | shihong.zheng <shihong.zheng@amlogic.com> | 2020-07-27 06:45:45 (GMT) |
|---|---|---|
| committer | Hui Zhang <hui.zhang@amlogic.com> | 2020-07-28 02:10:53 (GMT) |
| commit | aab26b14f6b78a6f2fc8b4f48be9ab4875d50236 (patch) | |
| tree | eccdad99d893e01a7caff7436b3df8a31ef1177b | |
| parent | e1a96298f7afe491182465a139819a32182a632f (diff) | |
| download | media_modules-aab26b14f6b78a6f2fc8b4f48be9ab4875d50236.zip media_modules-aab26b14f6b78a6f2fc8b4f48be9ab4875d50236.tar.gz media_modules-aab26b14f6b78a6f2fc8b4f48be9ab4875d50236.tar.bz2 | |
amstream: fix null pointer crash in dv frame mode. [1/1]
PD#SWPL-30431
Problem:
secure dolby vision frame mode crash.
Solution:
no slave vdec in dolby vision frame mode.
so needn't set slave vdec port_flag.
Verify:
ah212
Change-Id: Ib4010e8d243be0fba773b02b0f6984ea9f9dfb67
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
| -rw-r--r-- | drivers/stream_input/amports/amstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/stream_input/amports/amstream.c b/drivers/stream_input/amports/amstream.c index bfb44b4..b204dc6 100644 --- a/drivers/stream_input/amports/amstream.c +++ b/drivers/stream_input/amports/amstream.c @@ -622,7 +622,7 @@ static int video_port_init(struct port_priv_s *priv, pr_err("vformat not set\n"); return -EPERM; } - if (vdec_dual(vdec) && vdec_secure(vdec)) { + if (vdec_dual(vdec) && vdec_secure(vdec) && (vdec->slave)) { /*copy drm flags for slave dec.*/ vdec->slave->port_flag |= PORT_FLAG_DRM; } |