Merge "video: driver: update basic functionality controls"

driver/vidc/inc/msm_vidc_internal.h

@@ -108,18 +108,17 @@ enum msm_vidc_codec_type {
 	MSM_VIDC_H264              = BIT(0),
 	MSM_VIDC_HEVC              = BIT(1),
 	MSM_VIDC_VP9               = BIT(2),
-	MSM_VIDC_MPEG2             = BIT(3),
 };
 
 enum msm_vidc_colorformat_type {
 	MSM_VIDC_FMT_NONE = 0,
 	MSM_VIDC_FMT_NV12,
 	MSM_VIDC_FMT_NV21,
-	MSM_VIDC_FMT_NV12_UBWC,
-	MSM_VIDC_FMT_NV12_P010,
-	MSM_VIDC_FMT_NV12_TP10_UBWC,
+	MSM_VIDC_FMT_NV12C,
+	MSM_VIDC_FMT_P010,
+	MSM_VIDC_FMT_TP10C,
 	MSM_VIDC_FMT_RGBA8888,
-	MSM_VIDC_FMT_RGBA8888_UBWC,
+	MSM_VIDC_FMT_RGBA8888C,
 };
 
 enum msm_vidc_buffer_type {
@@ -229,47 +228,50 @@ enum msm_vidc_core_capability_type {
 enum msm_vidc_inst_capability_type {
 	INST_CAP_NONE = 0,
 	FRAME_WIDTH,
+	LOSSLESS_FRAME_WIDTH,
+	SECURE_FRAME_WIDTH,
+	HEVC_IMAGE_FRAME_WIDTH,
+	HEIC_IMAGE_FRAME_WIDTH,
 	FRAME_HEIGHT,
+	LOSSLESS_FRAME_HEIGHT,
+	SECURE_FRAME_HEIGHT,
+	HEVC_IMAGE_FRAME_HEIGHT,
+	HEIC_IMAGE_FRAME_HEIGHT,
 	PIX_FMTS,
 	MIN_BUFFERS_INPUT,
 	MIN_BUFFERS_OUTPUT,
 	MBPF,
+	LOSSLESS_MBPF,
+	BATCH_MBPF,
+	SECURE_MBPF,
 	MBPS,
+	POWER_SAVE_MBPS,
 	FRAME_RATE,
+	OPERATING_RATE,
 	SCALE_X,
 	SCALE_Y,
 	B_FRAME,
-	POWER_SAVE_MBPS,
-	BATCH_MBPF,
-	BATCH_FRAME_RATE,
-	LOSSLESS_FRAME_WIDTH,
-	LOSSLESS_FRAME_HEIGHT,
-	LOSSLESS_MBPF,
-	ALL_INTRA_FRAME_RATE,
-	HEVC_IMAGE_FRAME_WIDTH,
-	HEVC_IMAGE_FRAME_HEIGHT,
-	HEIC_IMAGE_FRAME_WIDTH,
-	HEIC_IMAGE_FRAME_HEIGHT,
 	MB_CYCLES_VSP,
 	MB_CYCLES_VPP,
 	MB_CYCLES_LP,
 	MB_CYCLES_FW,
 	MB_CYCLES_FW_VPP,
+	SECURE_MODE,
 	HFLIP,
 	VFLIP,
-	PREPEND_SPSPPS_TO_IDR,
-	REQUEST_I_FRAME,
+	ROTATION,
 	SLICE_INTERFACE,
-	FRAME_RC,
-	BITRATE_MODE,
 	HEADER_MODE,
+	PREPEND_SPSPPS_TO_IDR,
+	META_SEQ_HDR_NAL,
+	REQUEST_I_FRAME,
+	BIT_RATE,
+	BITRATE_MODE,
+	LOSSLESS,
+	FRAME_SKIP_MODE,
+	FRAME_RC_ENABLE,
 	GOP_SIZE,
 	GOP_CLOSURE,
-	BIT_RATE,
-	SECURE_FRAME_WIDTH,
-	SECURE_FRAME_HEIGHT,
-	SECURE_MBPF,
-	SECURE_MODE,
 	BLUR_TYPES,
 	BLUR_RESOLUTION,
 	CSC_CUSTOM_MATRIX,
@@ -284,28 +286,36 @@ enum msm_vidc_inst_capability_type {
 	TIME_DELTA_BASED_RC,
 	CONTENT_ADAPTIVE_CODING,
 	BITRATE_BOOST,
-	ROTATION,
 	VBV_DELAY,
 	MIN_FRAME_QP,
+	I_FRAME_MIN_QP,
+	P_FRAME_MIN_QP,
+	B_FRAME_MIN_QP,
 	MAX_FRAME_QP,
+	I_FRAME_MAX_QP,
+	P_FRAME_MAX_QP,
+	B_FRAME_MAX_QP,
 	HEVC_HIER_QP,
 	I_FRAME_QP,
 	P_FRAME_QP,
-	I_FRAME_MIN_QP,
-	I_FRAME_MAX_QP,
-	P_FRAME_MIN_QP,
-	P_FRAME_MAX_QP,
 	B_FRAME_QP,
-	B_FRAME_MIN_QP,
-	B_FRAME_MAX_QP,
-	HIER_CODING_TYPE,
-	HIER_CODING_LAYER,
 	L0_QP,
 	L1_QP,
 	L2_QP,
 	L3_QP,
 	L4_QP,
 	L5_QP,
+	HIER_LAYER_QP,
+	HIER_CODING_TYPE,
+	HIER_CODING,
+	HIER_CODING_LAYER,
+	L0_BR,
+	L1_BR,
+	L2_BR,
+	L3_BR,
+	L4_BR,
+	L5_BR,
+	ENTROPY_MODE,
 	PROFILE,
 	LEVEL,
 	HEVC_TIER,
@@ -313,22 +323,11 @@ enum msm_vidc_inst_capability_type {
 	LF_ALPHA,
 	LF_BETA,
 	LF_TC,
-	LOSSLESS,
-	L0_BR,
-	L1_BR,
-	L2_BR,
-	L3_BR,
-	L4_BR,
-	L5_BR,
 	SLICE_MAX_BYTES,
 	SLICE_MAX_MB,
 	SLICE_MODE,
-	CABAC_BITRATE,
 	MB_RC,
 	TRANSFORM_8X8,
-	ENTROPY_MODE,
-	HIER_CODING,
-	HIER_LAYER_QP,
 	CHROMA_QP_INDEX_OFFSET,
 	DISPLAY_DELAY_ENABLE,
 	DISPLAY_DELAY,
@@ -341,7 +340,6 @@ enum msm_vidc_inst_capability_type {
 	BIT_DEPTH,
 	CODEC_CONFIG,
 	META_LTR_MARK_USE,
-	META_SEQ_HDR_NAL,
 	META_DPB_MISR,
 	META_OPB_MISR,
 	META_INTERLACE,