msm: vidc: Align HFI profile with HAL profile
Make sure HAL profile level enums are same as that of HFI
values so that there is no conversion needed.
CRs-Fixed: 2086655
Change-Id: Ibded92d45930e0514c298af40db4465465bed9af
Signed-off-by: Vaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
diff --git a/drivers/media/platform/msm/vidc/vidc_hfi_api.h b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
index f350f25..d2a59dc 100644
--- a/drivers/media/platform/msm/vidc/vidc_hfi_api.h
+++ b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
@@ -279,34 +279,27 @@
};
enum hal_mpeg2_profile {
+ HAL_UNUSED_MPEG2_PROFILE = 0x00000000,
HAL_MPEG2_PROFILE_SIMPLE = 0x00000001,
HAL_MPEG2_PROFILE_MAIN = 0x00000002,
- HAL_MPEG2_PROFILE_422 = 0x00000004,
- HAL_MPEG2_PROFILE_SNR = 0x00000008,
- HAL_MPEG2_PROFILE_SPATIAL = 0x00000010,
- HAL_MPEG2_PROFILE_HIGH = 0x00000020,
- HAL_UNUSED_MPEG2_PROFILE = 0x10000000,
};
enum hal_mpeg2_level {
+ HAL_UNUSED_MEPG2_LEVEL = 0x00000000,
HAL_MPEG2_LEVEL_LL = 0x00000001,
HAL_MPEG2_LEVEL_ML = 0x00000002,
- HAL_MPEG2_LEVEL_H14 = 0x00000004,
- HAL_MPEG2_LEVEL_HL = 0x00000008,
- HAL_UNUSED_MEPG2_LEVEL = 0x10000000,
+ HAL_MPEG2_LEVEL_HL = 0x00000004,
};
enum hal_h264_profile {
+ HAL_UNUSED_H264_PROFILE = 0x00000000,
HAL_H264_PROFILE_BASELINE = 0x00000001,
HAL_H264_PROFILE_MAIN = 0x00000002,
HAL_H264_PROFILE_HIGH = 0x00000004,
- HAL_H264_PROFILE_EXTENDED = 0x00000008,
- HAL_H264_PROFILE_HIGH10 = 0x00000010,
- HAL_H264_PROFILE_HIGH422 = 0x00000020,
- HAL_H264_PROFILE_HIGH444 = 0x00000040,
- HAL_H264_PROFILE_CONSTRAINED_BASE = 0x00000080,
- HAL_H264_PROFILE_CONSTRAINED_HIGH = 0x00000100,
- HAL_UNUSED_H264_PROFILE = 0x10000000,
+ HAL_H264_PROFILE_STEREO_HIGH = 0x00000008,
+ HAL_H264_PROFILE_MULTIVIEW_HIGH = 0x00000010,
+ HAL_H264_PROFILE_CONSTRAINED_BASE = 0x00000020,
+ HAL_H264_PROFILE_CONSTRAINED_HIGH = 0x00000040,
};
enum hal_h264_level {
@@ -331,10 +324,10 @@
};
enum hal_hevc_profile {
+ HAL_UNUSED_HEVC_PROFILE = 0x00000000,
HAL_HEVC_PROFILE_MAIN = 0x00000001,
HAL_HEVC_PROFILE_MAIN10 = 0x00000002,
HAL_HEVC_PROFILE_MAIN_STILL_PIC = 0x00000004,
- HAL_UNUSED_HEVC_PROFILE = 0x10000000,
};
enum hal_hevc_level {
@@ -373,17 +366,17 @@
HAL_UNUSED_HEVC_TIER = 0x10000000,
};
-enum hal_vpx_profile {
- HAL_VPX_PROFILE_MAIN = 0x00000001,
- HAL_VPX_PROFILE_UNUSED = 0x10000000,
+enum hal_vp8_profile {
+ HAL_VP8_PROFILE_UNUSED = 0x00000000,
+ HAL_VP8_PROFILE_MAIN = 0x00000001,
};
-enum hal_vpx_level {
- HAL_VPX_LEVEL_UNUSED = 0x00000000,
- HAL_VPX_LEVEL_VERSION_0 = 0x00000001,
- HAL_VPX_LEVEL_VERSION_1 = 0x00000002,
- HAL_VPX_LEVEL_VERSION_2 = 0x00000004,
- HAL_VPX_LEVEL_VERSION_3 = 0x00000008,
+enum hal_vp8_level {
+ HAL_VP8_LEVEL_UNUSED = 0x00000000,
+ HAL_VP8_LEVEL_VERSION_0 = 0x00000001,
+ HAL_VP8_LEVEL_VERSION_1 = 0x00000002,
+ HAL_VP8_LEVEL_VERSION_2 = 0x00000004,
+ HAL_VP8_LEVEL_VERSION_3 = 0x00000008,
};
enum hal_tme_profile {