Merge "video: driver: move DPB_TAG_LIST to input meta port"

driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -1870,7 +1870,7 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 
 	{META_DPB_TAG_LIST, DEC, CODECS_ALL,
 		MSM_VIDC_META_DISABLE,
-		MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
+		MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT,
 		0, MSM_VIDC_META_DISABLE,
 		V4L2_CID_MPEG_VIDC_METADATA_DPB_TAG_LIST,
 		HFI_PROP_DPB_TAG_LIST,
@@ -1935,14 +1935,6 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 		1, DEFAULT_COMPLEXITY,
 		V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY},
 
-	{META_MAX_NUM_REORDER_FRAMES, DEC, HEVC | H264,
-		MSM_VIDC_META_DISABLE,
-		MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
-		0, MSM_VIDC_META_DISABLE,
-		V4L2_CID_MPEG_VIDC_METADATA_MAX_NUM_REORDER_FRAMES,
-		HFI_PROP_MAX_NUM_REORDER_FRAMES,
-		CAP_FLAG_BITMASK | CAP_FLAG_META},
-
 	{DELIVERY_MODE, ENC, HEVC,
 		0, 1, 1, 0,
 		V4L2_CID_MPEG_VIDC_HEVC_ENCODE_DELIVERY_MODE,

driver/vidc/src/msm_vidc_driver.c

@@ -1021,12 +1021,6 @@ bool msm_vidc_allow_metadata_subscription(struct msm_vidc_inst *inst, u32 cap_id
 				is_allowed = false;
 			}
 			break;
-		default:
-			is_allowed = true;
-			break;
-		}
-	} else if (port == OUTPUT_PORT) {
-		switch (cap_id) {
 		case META_DPB_TAG_LIST:
 			if (!is_ubwc_colorformat(inst->capabilities->cap[PIX_FMTS].value)) {
 				i_vpr_h(inst,
@@ -1039,6 +1033,8 @@ bool msm_vidc_allow_metadata_subscription(struct msm_vidc_inst *inst, u32 cap_id
 			is_allowed = true;
 			break;
 		}
+	} else if (port == OUTPUT_PORT) {
+		is_allowed = true;
 	} else {
 		i_vpr_e(inst, "%s: invalid port %d\n", __func__, port);
 		is_allowed = false;