From f9f03040091111f2f2c1fd702b63656ddf04f0ca Mon Sep 17 00:00:00 2001 From: Maheshwar Ajja Date: Fri, 26 Jun 2020 17:35:57 -0700 Subject: [PATCH] msm: vidc: use v4l2 standard h264 profile and levels Startdard v4l2 uapi header introduced h264 profile and levels and hence remove internal profile and levels to resolve compilation issues. Change-Id: I9e077066f9983b9a9e1b089457c060fd83d86860 Signed-off-by: Maheshwar Ajja --- include/uapi/vidc/media/msm_vidc_utils.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/uapi/vidc/media/msm_vidc_utils.h b/include/uapi/vidc/media/msm_vidc_utils.h index 63894f8fb219..2e4f351c4927 100644 --- a/include/uapi/vidc/media/msm_vidc_utils.h +++ b/include/uapi/vidc/media/msm_vidc_utils.h @@ -72,18 +72,6 @@ enum v4l2_mpeg_vidc_video_bitrate_mode { V4L2_MPEG_VIDEO_BITRATE_MODE_MBR_VFR, V4L2_MPEG_VIDEO_BITRATE_MODE_CQ, }; - -enum v4l2_mpeg_vidc_video_h264_profile { - V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH = - V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH + 1, -}; - -enum v4l2_mpeg_vidc_video_h264_level { - V4L2_MPEG_VIDEO_H264_LEVEL_5_2 = V4L2_MPEG_VIDEO_H264_LEVEL_5_1 + 1, - V4L2_MPEG_VIDEO_H264_LEVEL_6_0, - V4L2_MPEG_VIDEO_H264_LEVEL_6_1, - V4L2_MPEG_VIDEO_H264_LEVEL_6_2, -}; /* missing v4l2 entries end */ /* vendor controls start */