| author | renjiang.han <renjiang.han@amlogic.com> | 2019-12-26 11:05:04 (GMT) |
|---|---|---|
| committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2019-12-27 08:32:20 (GMT) |
| commit | 0c40b29f2a9a378b35f528a37aa3f0b97d9fdbba (patch) | |
| tree | a1bfefdcf2e63dab372f7e33b83a9c453d043d0b | |
| parent | 02515e2a0524217240c0cdede672d6b80618867e (diff) | |
| download | media_modules-0c40b29f2a9a378b35f528a37aa3f0b97d9fdbba.zip media_modules-0c40b29f2a9a378b35f528a37aa3f0b97d9fdbba.tar.gz media_modules-0c40b29f2a9a378b35f528a37aa3f0b97d9fdbba.tar.bz2 | |
media_module: renamed first deinterlace to dimulti for pip. [1/1]
PD#SWPL-18842
Problem:
When dtv and youTube are switched, the kernel panic is
caused by the deinterlace same name.
Solution:
Renamed first deinterlace to dimulti for pip
Verify:
on S905X3-AC214
Change-Id: I8a970337f13367fbd72bd8156a131bfd2fcb8b88
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
| -rw-r--r-- | drivers/frame_provider/decoder/utils/vdec.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/drivers/frame_provider/decoder/utils/vdec.c b/drivers/frame_provider/decoder/utils/vdec.c index 2bec9b0..41e84ba 100644 --- a/drivers/frame_provider/decoder/utils/vdec.c +++ b/drivers/frame_provider/decoder/utils/vdec.c @@ -2241,14 +2241,26 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k) if (vdec->vf_receiver_inst == 0) snprintf(vdec->vfm_map_chain, VDEC_MAP_NAME_SIZE, "%s %s %s", vdec->vf_provider_name, - "deinterlace", - vdec->vf_receiver_name); - else if (vdec->vf_receiver_inst < max_di_instance) - snprintf(vdec->vfm_map_chain, VDEC_MAP_NAME_SIZE, - "%s %s%d %s", vdec->vf_provider_name, - "dimulti.", - vdec->vf_receiver_inst, + "dimulti.1", vdec->vf_receiver_name); + else if ((vdec->vf_receiver_inst < + max_di_instance) && + (vdec->vf_receiver_inst == 1)) + snprintf(vdec->vfm_map_chain, + VDEC_MAP_NAME_SIZE, + "%s %s %s", + vdec->vf_provider_name, + "deinterlace", + vdec->vf_receiver_name); + else if (vdec->vf_receiver_inst < + max_di_instance) + snprintf(vdec->vfm_map_chain, + VDEC_MAP_NAME_SIZE, + "%s %s%d %s", + vdec->vf_provider_name, + "dimulti.", + vdec->vf_receiver_inst, + vdec->vf_receiver_name); else snprintf(vdec->vfm_map_chain, VDEC_MAP_NAME_SIZE, "%s %s", vdec->vf_provider_name, |