Merge "video: driver: replace V4l2 macros with availble upstream macros"

driver/platform/common/src/msm_vidc_platform_ext.c

@@ -175,7 +175,7 @@ int msm_vidc_set_ir_period(void *instance,
 	core = inst->core;
 
 	if (inst->capabilities->cap[IR_TYPE].value ==
-	    V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM) {
+	    V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM) {
 		if (inst->bufq[OUTPUT_PORT].vb2q->streaming) {
 			i_vpr_h(inst, "%s: dynamic random intra refresh not allowed\n",
 				__func__);
@@ -183,7 +183,7 @@ int msm_vidc_set_ir_period(void *instance,
 		}
 		ir_type = HFI_PROP_IR_RANDOM_PERIOD;
 	} else if (inst->capabilities->cap[IR_TYPE].value ==
-		   V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC) {
+		   V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC) {
 		ir_type = HFI_PROP_IR_CYCLIC_PERIOD;
 	} else {
 		i_vpr_e(inst, "%s: invalid ir_type %d\n",

driver/platform/kalama/src/msm_vidc_kalama.c

@@ -832,18 +832,18 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 		CAP_FLAG_OUTPUT_PORT},
 
 	{IR_TYPE, ENC, H264|HEVC,
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM,
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC,
-		BIT(V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM) |
-		BIT(V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC),
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM,
-		V4L2_CID_MPEG_VIDEO_VIDC_INTRA_REFRESH_TYPE,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC,
+		BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM) |
+		BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC),
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE,
 		0,
 		CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU},
 
 	{IR_PERIOD, ENC, H264|HEVC,
 		0, INT_MAX, 1, 0,
-		V4L2_CID_MPEG_VIDC_INTRA_REFRESH_PERIOD,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD,
 		0,
 		CAP_FLAG_INPUT_PORT | CAP_FLAG_OUTPUT_PORT |
 		CAP_FLAG_DYNAMIC_ALLOWED},

driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -902,18 +902,18 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 		CAP_FLAG_OUTPUT_PORT},
 
 	{IR_TYPE, ENC, H264|HEVC,
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM,
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC,
-		BIT(V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM) |
-		BIT(V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC),
-		V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM,
-		V4L2_CID_MPEG_VIDEO_VIDC_INTRA_REFRESH_TYPE,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC,
+		BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM) |
+		BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC),
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE,
 		0,
 		CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU},
 
 	{IR_PERIOD, ENC, H264|HEVC,
 		0, INT_MAX, 1, 0,
-		V4L2_CID_MPEG_VIDC_INTRA_REFRESH_PERIOD,
+		V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD,
 		0,
 		CAP_FLAG_INPUT_PORT | CAP_FLAG_OUTPUT_PORT |
 		CAP_FLAG_DYNAMIC_ALLOWED},

include/uapi/vidc/media/v4l2_vidc_extensions.h

@@ -81,16 +81,6 @@
 #define V4L2_CID_MPEG_VIDC_FRAME_RATE           (V4L2_CID_MPEG_VIDC_BASE + 0x5)
 #define V4L2_CID_MPEG_VIDC_OPERATING_RATE       (V4L2_CID_MPEG_VIDC_BASE + 0x6)
 
-/* Encoder Intra refresh period */
-#define V4L2_CID_MPEG_VIDC_INTRA_REFRESH_PERIOD (V4L2_CID_MPEG_VIDC_BASE + 0xB)
-/* Encoder Intra refresh type */
-#define V4L2_CID_MPEG_VIDEO_VIDC_INTRA_REFRESH_TYPE                           \
-	(V4L2_CID_MPEG_VIDC_BASE + 0xC)
-enum v4l2_mpeg_vidc_ir_type {
-	V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM = 0x0,
-	V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC = 0x1,
-};
-
 #define V4L2_CID_MPEG_VIDC_TIME_DELTA_BASED_RC  (V4L2_CID_MPEG_VIDC_BASE + 0xD)
 /* Encoder quality controls */
 #define V4L2_CID_MPEG_VIDC_CONTENT_ADAPTIVE_CODING                            \