Revert "msm8996: update kernel headers for AU 199"

This reverts commit 81604e3b0f106f7aee02118ae40e0c89250abc40.

4 files changed, 0 insertions, 51 deletions

diff --git a/kernel-headers/linux/v4l2-controls.h b/kernel-headers/linux/v4l2-controls.h
index 0ae366d..5bbb643 100644
--- a/kernel-headers/linux/v4l2-controls.h
+++ b/kernel-headers/linux/v4l2-controls.h
@@ -849,11 +849,6 @@ enum v4l2_mpeg_vidc_extradata {
   V4L2_MPEG_VIDC_EXTRADATA_ROI_QP = 24,
 #define V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP
   V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP = 25,
-#define V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI = 26,
-#define V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI
-  V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 27,
 };
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26)
diff --git a/kernel-headers/media/msm_vidc.h b/kernel-headers/media/msm_vidc.h
index 9a99c62..aa716c5 100644
--- a/kernel-headers/media/msm_vidc.h
+++ b/kernel-headers/media/msm_vidc.h
@@ -189,21 +189,6 @@ struct msm_vidc_roi_qp_payload {
   int mbi_info_size;
   unsigned int data[1];
 };
-struct msm_vidc_mastering_display_colour_sei_payload {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned int nDisplayPrimariesX[3];
-  unsigned int nDisplayPrimariesY[3];
-  unsigned int nWhitePointX;
-  unsigned int nWhitePointY;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned int nMaxDisplayMasteringLuminance;
-  unsigned int nMinDisplayMasteringLuminance;
-};
-struct msm_vidc_content_light_level_sei_payload {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned int nMaxContentLight;
-  unsigned int nMaxPicAverageLight;
-};
 enum msm_vidc_extradata_type {
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_NONE = 0x00000000,
@@ -226,11 +211,6 @@ enum msm_vidc_extradata_type {
   MSM_VIDC_EXTRADATA_VQZIP_SEI = 0x00000011,
   MSM_VIDC_EXTRADATA_ROI_QP = 0x00000013,
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI
-  MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI = 0x00000015,
-#define MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI
-  MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 0x00000016,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E,
 #define MSM_VIDC_EXTRADATA_OUTPUT_CROP MSM_VIDC_EXTRADATA_OUTPUT_CROP
   MSM_VIDC_EXTRADATA_OUTPUT_CROP = 0x0700000F,
diff --git a/original-kernel-headers/linux/v4l2-controls.h b/original-kernel-headers/linux/v4l2-controls.h
index d6e4eca..cefa2a7 100644
--- a/original-kernel-headers/linux/v4l2-controls.h
+++ b/original-kernel-headers/linux/v4l2-controls.h
@@ -795,12 +795,6 @@ enum v4l2_mpeg_vidc_extradata {
 #define V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP \
 	V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP
 	V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP = 25,
-#define V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI \
-	V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI
-	V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI = 26,
-#define V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI \
-	V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI
-	V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 27,
 };
 
 #define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26)
diff --git a/original-kernel-headers/media/msm_vidc.h b/original-kernel-headers/media/msm_vidc.h
index 40cd867..eaf2f5e 100644
--- a/original-kernel-headers/media/msm_vidc.h
+++ b/original-kernel-headers/media/msm_vidc.h
@@ -162,20 +162,6 @@ struct msm_vidc_roi_qp_payload {
 	unsigned int data[1];
 };
 
-struct msm_vidc_mastering_display_colour_sei_payload {
-	unsigned int nDisplayPrimariesX[3];
-	unsigned int nDisplayPrimariesY[3];
-	unsigned int nWhitePointX;
-	unsigned int nWhitePointY;
-	unsigned int nMaxDisplayMasteringLuminance;
-	unsigned int nMinDisplayMasteringLuminance;
-};
-
-struct msm_vidc_content_light_level_sei_payload {
-	unsigned int nMaxContentLight;
-	unsigned int nMaxPicAverageLight;
-};
-
 enum msm_vidc_extradata_type {
 	MSM_VIDC_EXTRADATA_NONE = 0x00000000,
 	MSM_VIDC_EXTRADATA_MB_QUANTIZATION = 0x00000001,
@@ -193,12 +179,6 @@ enum msm_vidc_extradata_type {
 	MSM_VIDC_EXTRADATA_FRAME_BITS_INFO = 0x00000010,
 	MSM_VIDC_EXTRADATA_VQZIP_SEI = 0x00000011,
 	MSM_VIDC_EXTRADATA_ROI_QP = 0x00000013,
-#define MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI \
-	MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI
-	MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI = 0x00000015,
-#define MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI \
-	MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI
-	MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 0x00000016,
 	MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E,
 #define MSM_VIDC_EXTRADATA_OUTPUT_CROP \
 	MSM_VIDC_EXTRADATA_OUTPUT_CROP