Quellcode durchsuchen

video: driver: Prepare dependency list without parent

Resolve upstream compilation issue.

Change-Id: Id0b08d0fc66291a415c966c90b804f9017790ef8
Signed-off-by: Ankush Mitra <[email protected]>
Ankush Mitra vor 2 Jahren
Ursprung
Commit
da842a9f2f
1 geänderte Dateien mit 0 neuen und 82 gelöschten Zeilen
  1. 0 82
      driver/platform/kalama/src/kalama.c

+ 0 - 82
driver/platform/kalama/src/kalama.c

@@ -1225,87 +1225,71 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 
 static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kalama[] = {
 	/* {cap, domain, codec,
-	 *      parents,
 	 *      children,
 	 *      adjust, set}
 	 */
 
 	{PIX_FMTS, ENC, H264,
-		{0},
 		{0}},
 
 	{PIX_FMTS, ENC, HEVC,
-		{0},
 		{PROFILE, MIN_FRAME_QP, MAX_FRAME_QP, I_FRAME_QP, P_FRAME_QP,
 			B_FRAME_QP, MIN_QUALITY, BLUR_TYPES}},
 
 	{PIX_FMTS, DEC, HEVC,
-		{0},
 		{PROFILE}},
 
 	{FRAME_RATE, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_q16},
 
 	{HFLIP, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_flip},
 
 	{VFLIP, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_flip},
 
 	{ROTATION, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_rotation},
 
 	{SUPER_FRAME, ENC, H264|HEVC,
-		{0},
 		{INPUT_BUF_HOST_MAX_COUNT, OUTPUT_BUF_HOST_MAX_COUNT},
 		NULL,
 		NULL},
 
 	{HEADER_MODE, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_header_mode},
 
 	{WITHOUT_STARTCODE, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_nal_length},
 
 	{REQUEST_I_FRAME, ENC, H264|HEVC,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_req_sync_frame},
 
 	{BIT_RATE, ENC, H264,
-		{ENH_LAYER_COUNT, BITRATE_MODE, ENTROPY_MODE,
-			ALL_INTRA, LOWLATENCY_MODE},
 		{PEAK_BITRATE},
 		msm_vidc_adjust_bitrate,
 		msm_vidc_set_bitrate},
 
 	{BIT_RATE, ENC, HEVC,
-		{ENH_LAYER_COUNT, BITRATE_MODE, ALL_INTRA, LOWLATENCY_MODE},
 		{PEAK_BITRATE},
 		msm_vidc_adjust_bitrate,
 		msm_vidc_set_bitrate},
 
 	{BITRATE_MODE, ENC, H264,
-		{0},
 		{LTR_COUNT, I_FRAME_QP, P_FRAME_QP,
 			B_FRAME_QP, ENH_LAYER_COUNT, BIT_RATE,
 			MIN_QUALITY, VBV_DELAY,
@@ -1315,7 +1299,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
 		msm_vidc_set_u32_enum},
 
 	{BITRATE_MODE, ENC, HEVC,
-		{0},
 		{LTR_COUNT, I_FRAME_QP, P_FRAME_QP,
 			B_FRAME_QP, CONSTANT_QUALITY, ENH_LAYER_COUNT,
 			BIT_RATE, MIN_QUALITY, VBV_DELAY,
@@ -1325,387 +1308,322 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
 		msm_vidc_set_u32_enum},
 
 	{CONSTANT_QUALITY, ENC, HEVC,
-		{BITRATE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_constant_quality},
 
 	{GOP_SIZE, ENC, CODECS_ALL,
-		{ENH_LAYER_COUNT},
 		{ALL_INTRA},
 		msm_vidc_adjust_gop_size,
 		msm_vidc_set_gop_size},
 
 	{B_FRAME, ENC, H264|HEVC,
-		{ENH_LAYER_COUNT},
 		{ALL_INTRA},
 		msm_vidc_adjust_b_frame,
 		msm_vidc_set_u32},
 
 	{BLUR_TYPES, ENC, H264|HEVC,
-		{PIX_FMTS, BITRATE_MODE, MIN_QUALITY},
 		{0},
 		msm_vidc_adjust_blur_type,
 		msm_vidc_set_u32_enum},
 
 	{LOWLATENCY_MODE, ENC, H264 | HEVC,
-		{BITRATE_MODE, DELIVERY_MODE},
 		{STAGE, BIT_RATE},
 		msm_vidc_adjust_enc_lowlatency_mode,
 		NULL},
 
 	{LOWLATENCY_MODE, DEC, H264|HEVC|VP9,
-		{0},
 		{STAGE},
 		msm_vidc_adjust_dec_lowlatency_mode,
 		NULL},
 
 	{LTR_COUNT, ENC, H264|HEVC,
-		{BITRATE_MODE, ALL_INTRA},
 		{0},
 		msm_vidc_adjust_ltr_count,
 		msm_vidc_set_u32},
 
 	{USE_LTR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_use_ltr,
 		msm_vidc_set_use_and_mark_ltr},
 
 	{MARK_LTR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_mark_ltr,
 		msm_vidc_set_use_and_mark_ltr},
 
 	{AU_DELIMITER, ENC, H264|HEVC,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32},
 
 	{CONTENT_ADAPTIVE_CODING, ENC, H264|HEVC,
-		{BITRATE_MODE, LAYER_ENABLE, LAYER_TYPE},
 		{REQUEST_PREPROCESS},
 		msm_vidc_adjust_brs,
 		msm_vidc_set_vbr_related_properties},
 
 	{REQUEST_PREPROCESS, ENC, H264|HEVC,
-		{CONTENT_ADAPTIVE_CODING},
 		{0},
 		msm_vidc_adjust_preprocess,
 		msm_vidc_set_preprocess},
 
 	{MIN_QUALITY, ENC, H264,
-		{BITRATE_MODE, ENH_LAYER_COUNT},
 		{BLUR_TYPES},
 		msm_vidc_adjust_min_quality,
 		msm_vidc_set_u32},
 
 	{MIN_QUALITY, ENC, HEVC,
-		{BITRATE_MODE, PIX_FMTS, ENH_LAYER_COUNT},
 		{BLUR_TYPES},
 		msm_vidc_adjust_min_quality,
 		msm_vidc_set_u32},
 
 	{VBV_DELAY, ENC, H264|HEVC,
-		{BITRATE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_cbr_related_properties},
 
 	{PEAK_BITRATE, ENC, H264|HEVC,
-		{BITRATE_MODE, BIT_RATE},
 		{0},
 		msm_vidc_adjust_peak_bitrate,
 		msm_vidc_set_cbr_related_properties},
 
 	{MIN_FRAME_QP, ENC, H264,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_min_qp},
 
 	{MIN_FRAME_QP, ENC, HEVC,
-		{PIX_FMTS},
 		{0},
 		msm_vidc_adjust_hevc_min_qp,
 		msm_vidc_set_min_qp},
 
 	{MAX_FRAME_QP, ENC, H264,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_max_qp},
 
 	{MAX_FRAME_QP, ENC, HEVC,
-		{PIX_FMTS},
 		{0},
 		msm_vidc_adjust_hevc_max_qp,
 		msm_vidc_set_max_qp},
 
 	{I_FRAME_QP, ENC, HEVC,
-		{PIX_FMTS, BITRATE_MODE},
 		{0},
 		msm_vidc_adjust_hevc_i_frame_qp,
 		msm_vidc_set_frame_qp},
 
 	{I_FRAME_QP, ENC, H264,
-		{BITRATE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_frame_qp},
 
 	{P_FRAME_QP, ENC, HEVC,
-		{PIX_FMTS, BITRATE_MODE},
 		{0},
 		msm_vidc_adjust_hevc_p_frame_qp,
 		msm_vidc_set_frame_qp},
 
 	{P_FRAME_QP, ENC, H264,
-		{BITRATE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_frame_qp},
 
 	{B_FRAME_QP, ENC, HEVC,
-		{PIX_FMTS, BITRATE_MODE},
 		{0},
 		msm_vidc_adjust_hevc_b_frame_qp,
 		msm_vidc_set_frame_qp},
 
 	{B_FRAME_QP, ENC, H264,
-		{BITRATE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_frame_qp},
 
 	{LAYER_TYPE, ENC, H264,
-		{0},
 		{CONTENT_ADAPTIVE_CODING}},
 
 	{LAYER_ENABLE, ENC, H264|HEVC,
-		{0},
 		{CONTENT_ADAPTIVE_CODING}},
 
 	{ENH_LAYER_COUNT, ENC, H264|HEVC,
-		{BITRATE_MODE},
 		{GOP_SIZE, B_FRAME, BIT_RATE, MIN_QUALITY},
 		msm_vidc_adjust_layer_count,
 		msm_vidc_set_layer_count_and_type},
 
 	{L0_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{L1_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{L2_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{L3_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{L4_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{L5_BR, ENC, H264|HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_dynamic_layer_bitrate,
 		msm_vidc_set_dynamic_layer_bitrate},
 
 	{ENTROPY_MODE, ENC, H264,
-		{PROFILE},
 		{BIT_RATE},
 		msm_vidc_adjust_entropy_mode,
 		msm_vidc_set_u32},
 
 	{PROFILE, ENC, H264,
-		{0},
 		{ENTROPY_MODE, TRANSFORM_8X8},
 		NULL,
 		msm_vidc_set_u32_enum},
 
 	{PROFILE, DEC, H264,
-		{0},
 		{ENTROPY_MODE},
 		NULL,
 		msm_vidc_set_u32_enum},
 
 	{PROFILE, ENC|DEC, HEVC,
-		{PIX_FMTS},
 		{0},
 		msm_vidc_adjust_profile,
 		msm_vidc_set_u32_enum},
 
 	{PROFILE, DEC, VP9,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32_enum},
 
 	{LEVEL, DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32_enum},
 
 	{LEVEL, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_level},
 
 	{HEVC_TIER, ENC|DEC, HEVC,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32_enum},
 
 	{LF_MODE, ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_deblock_mode},
 
 	{SLICE_MODE, ENC, H264|HEVC,
-		{BITRATE_MODE, ALL_INTRA},
 		{STAGE, DELIVERY_MODE},
 		msm_vidc_adjust_slice_count,
 		msm_vidc_set_slice_count},
 
 	{TRANSFORM_8X8, ENC, H264,
-		{PROFILE},
 		{0},
 		msm_vidc_adjust_transform_8x8,
 		msm_vidc_set_u32},
 
 	{CHROMA_QP_INDEX_OFFSET, ENC, HEVC,
-		{0},
 		{0},
 		msm_vidc_adjust_chroma_qp_index_offset,
 		msm_vidc_set_chroma_qp_index_offset},
 
 	{DISPLAY_DELAY_ENABLE, DEC, H264|HEVC|VP9,
-		{0},
 		{OUTPUT_ORDER},
 		NULL,
 		NULL},
 
 	{DISPLAY_DELAY, DEC, H264|HEVC|VP9,
-		{0},
 		{OUTPUT_ORDER},
 		NULL,
 		NULL},
 
 	{OUTPUT_ORDER, DEC, H264|HEVC|VP9,
-		{THUMBNAIL_MODE, DISPLAY_DELAY, DISPLAY_DELAY_ENABLE},
 		{0},
 		msm_vidc_adjust_output_order,
 		msm_vidc_set_u32},
 
 	{INPUT_BUF_HOST_MAX_COUNT, ENC|DEC, CODECS_ALL,
-		{0},
 		{0},
 		msm_vidc_adjust_input_buf_host_max_count,
 		msm_vidc_set_u32},
 
 	{INPUT_BUF_HOST_MAX_COUNT, ENC, H264|HEVC,
-		{SUPER_FRAME},
 		{0},
 		msm_vidc_adjust_input_buf_host_max_count,
 		msm_vidc_set_u32},
 
 	{OUTPUT_BUF_HOST_MAX_COUNT, ENC|DEC, CODECS_ALL,
-		{0},
 		{0},
 		msm_vidc_adjust_output_buf_host_max_count,
 		msm_vidc_set_u32},
 
 	{OUTPUT_BUF_HOST_MAX_COUNT, ENC, H264|HEVC,
-		{SUPER_FRAME, DELIVERY_MODE},
 		{0},
 		msm_vidc_adjust_output_buf_host_max_count,
 		msm_vidc_set_u32},
 
 	{CONCEAL_COLOR_8BIT, DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32_packed},
 
 	{CONCEAL_COLOR_10BIT, DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32_packed},
 
 	{STAGE, ENC | DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_stage},
 
 	{STAGE, ENC, H264|HEVC,
-		{LOWLATENCY_MODE, SLICE_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_stage},
 
 	{STAGE, DEC, H264|HEVC|VP9,
-		{LOWLATENCY_MODE},
 		{0},
 		NULL,
 		msm_vidc_set_stage},
 
 	{PIPE, DEC|ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_pipe},
 
 	{THUMBNAIL_MODE, DEC, CODECS_ALL,
-		{0},
 		{OUTPUT_ORDER},
 		NULL,
 		msm_vidc_set_u32},
 
 	{RAP_FRAME, DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		msm_vidc_set_u32},
 
 	{FIRMWARE_PRIORITY_OFFSET, DEC | ENC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		NULL},
 
 	{DPB_LIST, DEC, CODECS_ALL,
-		{0},
 		{0},
 		NULL,
 		NULL},
 
 	{ALL_INTRA, ENC, H264|HEVC,
-		{GOP_SIZE, B_FRAME},
 		{LTR_COUNT, SLICE_MODE, BIT_RATE},
 		msm_vidc_adjust_all_intra,
 		NULL},