commit 0ad53f0206fe7a1caa9168a232bfbce742137381
author Vaibhav Deshu Venkatesh <vdeshuve@codeaurora.org> Mon Aug 07 13:21:47 2017 -0700
committer Vaibhav Deshu Venkatesh <vdeshuve@codeaurora.org> Wed Aug 23 15:22:00 2017 -0700
tree faf22b215a977209fedc2fbfbc22296d74f70d5c
parent 562138783fefa54462071d5d13b97cec7a53f071

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>

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

diff --git a/drivers/media/platform/msm/vidc/vidc_hfi_helper.h b/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
index 6a239b3..fec1517 100644
--- a/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
+++ b/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
@@ -83,14 +83,16 @@
 #define HFI_VIDEO_CODEC_VP9				0x00004000
 #define HFI_VIDEO_CODEC_TME				0x00008000
 
-#define HFI_PROFILE_UNKNOWN					0x00000000
+#define HFI_PROFILE_UNKNOWN				0x00000000
+#define HFI_LEVEL_UNKNOWN				0x00000000
+
 #define HFI_H264_PROFILE_BASELINE			0x00000001
 #define HFI_H264_PROFILE_MAIN				0x00000002
 #define HFI_H264_PROFILE_HIGH				0x00000004
-#define HFI_H264_PROFILE_STEREO_HIGH		0x00000008
+#define HFI_H264_PROFILE_STEREO_HIGH			0x00000008
 #define HFI_H264_PROFILE_MULTIVIEW_HIGH		0x00000010
-#define HFI_H264_PROFILE_CONSTRAINED_BASE	0x00000020
-#define HFI_H264_PROFILE_CONSTRAINED_HIGH	0x00000040
+#define HFI_H264_PROFILE_CONSTRAINED_BASE		0x00000020
+#define HFI_H264_PROFILE_CONSTRAINED_HIGH		0x00000040
 
 #define HFI_LEVEL_UNKNOWN					0x00000000
 #define HFI_H264_LEVEL_1					0x00000001
@@ -113,22 +115,17 @@
 
 #define HFI_MPEG2_PROFILE_SIMPLE			0x00000001
 #define HFI_MPEG2_PROFILE_MAIN				0x00000002
-#define HFI_MPEG2_PROFILE_422				0x00000004
-#define HFI_MPEG2_PROFILE_SNR				0x00000008
-#define HFI_MPEG2_PROFILE_SPATIAL			0x00000010
-#define HFI_MPEG2_PROFILE_HIGH				0x00000020
 
 #define HFI_MPEG2_LEVEL_LL					0x00000001
 #define HFI_MPEG2_LEVEL_ML					0x00000002
-#define HFI_MPEG2_LEVEL_H14					0x00000004
-#define HFI_MPEG2_LEVEL_HL					0x00000008
+#define HFI_MPEG2_LEVEL_HL					0x00000004
 
-#define HFI_VPX_PROFILE_MAIN			0x00000001
+#define HFI_VP8_PROFILE_MAIN			0x00000001
 
-#define HFI_VPX_LEVEL_VERSION_0			0x00000001
-#define HFI_VPX_LEVEL_VERSION_1			0x00000002
-#define HFI_VPX_LEVEL_VERSION_2			0x00000004
-#define HFI_VPX_LEVEL_VERSION_3			0x00000008
+#define HFI_VP8_LEVEL_VERSION_0			0x00000001
+#define HFI_VP8_LEVEL_VERSION_1			0x00000002
+#define HFI_VP8_LEVEL_VERSION_2			0x00000004
+#define HFI_VP8_LEVEL_VERSION_3			0x00000008
 
 #define  HFI_HEVC_PROFILE_MAIN			0x00000001
 #define  HFI_HEVC_PROFILE_MAIN10		0x00000002