Merge "video: driver: separate i/o subscribe prop codec wise"

driver/platform/kalama/src/msm_vidc_kalama.c

@@ -2606,12 +2606,29 @@ static const u32 kalama_vdec_psc_av1[] = {
 	HFI_PROP_SIGNAL_COLOR_INFO,
 };
 
-static const u32 kalama_vdec_input_properties[] = {
+static const u32 kalama_vdec_input_properties_avc[] = {
 	HFI_PROP_NO_OUTPUT,
 	HFI_PROP_SUBFRAME_INPUT,
 };
 
-static const u32 kalama_vdec_output_properties[] = {
+static const u32 kalama_vdec_input_properties_hevc[] = {
+	HFI_PROP_NO_OUTPUT,
+	HFI_PROP_SUBFRAME_INPUT,
+};
+
+static const u32 kalama_vdec_input_properties_vp9[] = {
+	HFI_PROP_NO_OUTPUT,
+	HFI_PROP_SUBFRAME_INPUT,
+};
+
+static const u32 kalama_vdec_input_properties_av1[] = {
+	HFI_PROP_NO_OUTPUT,
+	HFI_PROP_SUBFRAME_INPUT,
+	HFI_PROP_AV1_TILE_ROWS_COLUMNS,
+	HFI_PROP_AV1_UNIFORM_TILE_SPACING,
+};
+
+static const u32 kalama_vdec_output_properties_avc[] = {
 	HFI_PROP_WORST_COMPRESSION_RATIO,
 	HFI_PROP_WORST_COMPLEXITY_FACTOR,
 	HFI_PROP_PICTURE_TYPE,
@@ -2620,6 +2637,30 @@ static const u32 kalama_vdec_output_properties[] = {
 	HFI_PROP_FENCE,
 };
 
+static const u32 kalama_vdec_output_properties_hevc[] = {
+	HFI_PROP_WORST_COMPRESSION_RATIO,
+	HFI_PROP_WORST_COMPLEXITY_FACTOR,
+	HFI_PROP_PICTURE_TYPE,
+	HFI_PROP_DPB_LIST,
+	HFI_PROP_FENCE,
+};
+
+static const u32 kalama_vdec_output_properties_vp9[] = {
+	HFI_PROP_WORST_COMPRESSION_RATIO,
+	HFI_PROP_WORST_COMPLEXITY_FACTOR,
+	HFI_PROP_PICTURE_TYPE,
+	HFI_PROP_DPB_LIST,
+	HFI_PROP_FENCE,
+};
+
+static const u32 kalama_vdec_output_properties_av1[] = {
+	HFI_PROP_WORST_COMPRESSION_RATIO,
+	HFI_PROP_WORST_COMPLEXITY_FACTOR,
+	HFI_PROP_PICTURE_TYPE,
+	HFI_PROP_DPB_LIST,
+	HFI_PROP_FENCE,
+};
+
 static const struct msm_vidc_platform_data kalama_data = {
 	/* resources dependent on other module */
 	.bw_tbl = kalama_bw_table,
@@ -2668,10 +2709,22 @@ static const struct msm_vidc_platform_data kalama_data = {
 	.psc_vp9_tbl_size = ARRAY_SIZE(kalama_vdec_psc_vp9),
 	.psc_av1_tbl = kalama_vdec_psc_av1,
 	.psc_av1_tbl_size = ARRAY_SIZE(kalama_vdec_psc_av1),
-	.dec_input_prop = kalama_vdec_input_properties,
-	.dec_input_prop_size = ARRAY_SIZE(kalama_vdec_input_properties),
-	.dec_output_prop = kalama_vdec_output_properties,
-	.dec_output_prop_size = ARRAY_SIZE(kalama_vdec_output_properties),
+	.dec_input_prop_avc = kalama_vdec_input_properties_avc,
+	.dec_input_prop_hevc = kalama_vdec_input_properties_hevc,
+	.dec_input_prop_vp9 = kalama_vdec_input_properties_vp9,
+	.dec_input_prop_av1 = kalama_vdec_input_properties_av1,
+	.dec_input_prop_size_avc = ARRAY_SIZE(kalama_vdec_input_properties_avc),
+	.dec_input_prop_size_hevc = ARRAY_SIZE(kalama_vdec_input_properties_hevc),
+	.dec_input_prop_size_vp9 = ARRAY_SIZE(kalama_vdec_input_properties_vp9),
+	.dec_input_prop_size_av1 = ARRAY_SIZE(kalama_vdec_input_properties_av1),
+	.dec_output_prop_avc = kalama_vdec_output_properties_avc,
+	.dec_output_prop_hevc = kalama_vdec_output_properties_hevc,
+	.dec_output_prop_vp9 = kalama_vdec_output_properties_vp9,
+	.dec_output_prop_av1 = kalama_vdec_output_properties_av1,
+	.dec_output_prop_size_avc = ARRAY_SIZE(kalama_vdec_output_properties_avc),
+	.dec_output_prop_size_hevc = ARRAY_SIZE(kalama_vdec_output_properties_hevc),
+	.dec_output_prop_size_vp9 = ARRAY_SIZE(kalama_vdec_output_properties_vp9),
+	.dec_output_prop_size_av1 = ARRAY_SIZE(kalama_vdec_output_properties_av1),
 };
 
 static const struct msm_vidc_platform_data kalama_data_v2 = {

driver/platform/waipio/src/waipio.c

@@ -1728,12 +1728,22 @@ static const u32 waipio_vdec_psc_vp9[] = {
 	HFI_PROP_LEVEL,
 };
 
-static const u32 waipio_vdec_input_properties[] = {
+static const u32 waipio_vdec_input_properties_avc[] = {
 	HFI_PROP_NO_OUTPUT,
 	HFI_PROP_SUBFRAME_INPUT,
 };
 
-static const u32 waipio_vdec_output_properties[] = {
+static const u32 waipio_vdec_input_properties_hevc[] = {
+	HFI_PROP_NO_OUTPUT,
+	HFI_PROP_SUBFRAME_INPUT,
+};
+
+static const u32 waipio_vdec_input_properties_vp9[] = {
+	HFI_PROP_NO_OUTPUT,
+	HFI_PROP_SUBFRAME_INPUT,
+};
+
+static const u32 waipio_vdec_output_properties_avc[] = {
 	HFI_PROP_WORST_COMPRESSION_RATIO,
 	HFI_PROP_WORST_COMPLEXITY_FACTOR,
 	HFI_PROP_PICTURE_TYPE,
@@ -1742,6 +1752,22 @@ static const u32 waipio_vdec_output_properties[] = {
 	HFI_PROP_FENCE,
 };
 
+static const u32 waipio_vdec_output_properties_hevc[] = {
+	HFI_PROP_WORST_COMPRESSION_RATIO,
+	HFI_PROP_WORST_COMPLEXITY_FACTOR,
+	HFI_PROP_PICTURE_TYPE,
+	HFI_PROP_DPB_LIST,
+	HFI_PROP_FENCE,
+};
+
+static const u32 waipio_vdec_output_properties_vp9[] = {
+	HFI_PROP_WORST_COMPRESSION_RATIO,
+	HFI_PROP_WORST_COMPLEXITY_FACTOR,
+	HFI_PROP_PICTURE_TYPE,
+	HFI_PROP_DPB_LIST,
+	HFI_PROP_FENCE,
+};
+
 static const struct msm_vidc_platform_data waipio_data = {
 	/* resources dependent on other module */
 	.bw_tbl = waipio_bw_table,
@@ -1792,10 +1818,18 @@ static const struct msm_vidc_platform_data waipio_data = {
 	.psc_hevc_tbl_size = ARRAY_SIZE(waipio_vdec_psc_hevc),
 	.psc_vp9_tbl = waipio_vdec_psc_vp9,
 	.psc_vp9_tbl_size = ARRAY_SIZE(waipio_vdec_psc_vp9),
-	.dec_input_prop = waipio_vdec_input_properties,
-	.dec_input_prop_size = ARRAY_SIZE(waipio_vdec_input_properties),
-	.dec_output_prop = waipio_vdec_output_properties,
-	.dec_output_prop_size = ARRAY_SIZE(waipio_vdec_output_properties),
+	.dec_input_prop_avc = waipio_vdec_input_properties_avc,
+	.dec_input_prop_hevc = waipio_vdec_input_properties_hevc,
+	.dec_input_prop_vp9 = waipio_vdec_input_properties_vp9,
+	.dec_input_prop_size_avc = ARRAY_SIZE(waipio_vdec_input_properties_avc),
+	.dec_input_prop_size_hevc = ARRAY_SIZE(waipio_vdec_input_properties_hevc),
+	.dec_input_prop_size_vp9 = ARRAY_SIZE(waipio_vdec_input_properties_vp9),
+	.dec_output_prop_avc = waipio_vdec_output_properties_avc,
+	.dec_output_prop_hevc = waipio_vdec_output_properties_hevc,
+	.dec_output_prop_vp9 = waipio_vdec_output_properties_vp9,
+	.dec_output_prop_size_avc = ARRAY_SIZE(waipio_vdec_output_properties_avc),
+	.dec_output_prop_size_hevc = ARRAY_SIZE(waipio_vdec_output_properties_hevc),
+	.dec_output_prop_size_vp9 = ARRAY_SIZE(waipio_vdec_output_properties_vp9),
 };
 
 static int msm_vidc_init_data(struct msm_vidc_core *core)