| author | Nanxin Qin <nanxin.qin@amlogic.com> | 2019-11-23 15:16:03 (GMT) |
|---|---|---|
| committer | Nanxin Qin <nanxin.qin@amlogic.com> | 2019-11-23 15:26:44 (GMT) |
| commit | febdc420bb344bb8c9f436fe03f68d32447360af (patch) | |
| tree | efae96dcef34d4dbb9d168bebc7524ef674e9148 | |
| parent | 75803959aeeed0e6e5e529078e33bbced5e00e5e (diff) | |
| download | media_modules-febdc420bb344bb8c9f436fe03f68d32447360af.zip media_modules-febdc420bb344bb8c9f436fe03f68d32447360af.tar.gz media_modules-febdc420bb344bb8c9f436fe03f68d32447360af.tar.bz2 | |
v4l: fixed build issue on the android P. [1/1]
PD#SWPL-5313
Problem:
the symbol undefined cause build fail.
Solution:
fixed build issue on the android P
Verify:
u212
Change-Id: I7a576efc202b851bf88e68769f7627f7db501a82
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
| -rw-r--r-- | drivers/frame_provider/decoder/utils/vdec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/frame_provider/decoder/utils/vdec.c b/drivers/frame_provider/decoder/utils/vdec.c index 3d3ecec..1a6f982 100644 --- a/drivers/frame_provider/decoder/utils/vdec.c +++ b/drivers/frame_provider/decoder/utils/vdec.c @@ -33,7 +33,9 @@ #include <linux/amlogic/media/vfm/vframe_provider.h> #include <linux/amlogic/media/vfm/vframe_receiver.h> #include <linux/amlogic/media/video_sink/ionvideo_ext.h> +#ifdef CONFIG_AMLOGIC_V4L_VIDEO3 #include <linux/amlogic/media/video_sink/v4lvideo_ext.h> +#endif #include <linux/amlogic/media/vfm/vfm_ext.h> /*for VDEC_DEBUG_SUPPORT*/ #include <linux/time.h> @@ -2217,9 +2219,13 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k) "vdec-map-%d", vdec->id); } else if (p->frame_base_video_path == FRAME_BASE_PATH_DI_V4LVIDEO) { +#ifdef CONFIG_AMLOGIC_V4L_VIDEO3 r = v4lvideo_assign_map(&vdec->vf_receiver_name, &vdec->vf_receiver_inst); - if (r < 0) { +#else + r = -1; +#endif + if (r < 0) { pr_err("V4lVideo frame receiver allocation failed.\n"); mutex_lock(&vdec_mutex); inited_vcodec_num--; |