From 99cccf72d8b67e8030f36e4f805ffc0d7bee2f72 Mon Sep 17 00:00:00 2001 From: Megha Byahatti Date: Wed, 19 Jul 2023 22:34:13 +0530 Subject: [PATCH] video: driver: fix alignment and blank line warning - Fix Alignment should match open parenthesis and Please use a blank line after Change-Id: I5155f3037ab3b65a0456a18eb8c98b54760204f9 Signed-off-by: Megha Byahatti --- .../platform/common/inc/msm_vidc_platform.h | 137 ++-- .../common/inc/msm_vidc_platform_ext.h | 6 +- .../platform/common/inc/perf_static_model.h | 4 +- .../platform/common/src/msm_vidc_platform.c | 601 +++++++++--------- .../common/src/msm_vidc_platform_ext.c | 35 +- 5 files changed, 353 insertions(+), 430 deletions(-) diff --git a/driver/platform/common/inc/msm_vidc_platform.h b/driver/platform/common/inc/msm_vidc_platform.h index e6e1e19464..f8632e7c52 100644 --- a/driver/platform/common/inc/msm_vidc_platform.h +++ b/driver/platform/common/inc/msm_vidc_platform.h @@ -161,10 +161,8 @@ struct msm_platform_inst_cap_dependency { enum msm_vidc_domain_type domain; enum msm_vidc_codec_type codec; enum msm_vidc_inst_capability_type children[MAX_CAP_CHILDREN]; - int (*adjust)(void *inst, - struct v4l2_ctrl *ctrl); - int (*set)(void *inst, - enum msm_vidc_inst_capability_type cap_id); + int (*adjust)(void *inst, struct v4l2_ctrl *ctrl); + int (*set)(void *inst, enum msm_vidc_inst_capability_type cap_id); }; struct msm_vidc_compat_handle { @@ -282,24 +280,22 @@ int msm_vidc_init_platform(struct msm_vidc_core *core); /* control framework support functions */ -enum msm_vidc_inst_capability_type msm_vidc_get_cap_id( - struct msm_vidc_inst *inst, u32 id); +enum msm_vidc_inst_capability_type msm_vidc_get_cap_id(struct msm_vidc_inst *inst, u32 id); int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap, - s32 adjusted_val, const char *func); -bool is_parent_available(struct msm_vidc_inst *inst, - u32 cap_id, u32 check_parent, const char *func); + s32 adjusted_val, const char *func); +bool is_parent_available(struct msm_vidc_inst *inst, u32 cap_id, + u32 check_parent, const char *func); int msm_vidc_get_parent_value(struct msm_vidc_inst *inst, u32 cap, u32 parent, - s32 *value, const char *func); + s32 *value, const char *func); u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id); + enum msm_vidc_inst_capability_type cap_id); int msm_vidc_v4l2_menu_to_hfi(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 *value); + enum msm_vidc_inst_capability_type cap_id, u32 *value); int msm_vidc_v4l2_to_hfi_enum(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 *value); + enum msm_vidc_inst_capability_type cap_id, u32 *value); int msm_vidc_packetize_control(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 payload_type, - void *hfi_val, u32 payload_size, const char *func); - + enum msm_vidc_inst_capability_type cap_id, u32 payload_type, + void *hfi_val, u32 payload_size, const char *func); int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_layer_bitrate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_bitrate_mode(void *instance, struct v4l2_ctrl *ctrl); @@ -313,8 +309,7 @@ int msm_vidc_adjust_output_order(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_input_buf_host_max_count(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_output_buf_host_max_count(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_transform_8x8(void *instance, struct v4l2_ctrl *ctrl); -int msm_vidc_adjust_chroma_qp_index_offset(void *instance, - struct v4l2_ctrl *ctrl); +int msm_vidc_adjust_chroma_qp_index_offset(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_gop_size(void *instance, struct v4l2_ctrl *ctrl); @@ -336,8 +331,7 @@ int msm_vidc_adjust_session_priority(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_roi_info(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_all_intra(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_outbuf_fence_type(void *instance, struct v4l2_ctrl *ctrl); -int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance, - struct v4l2_ctrl *ctrl); +int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_slice_mode(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_preprocess(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_eva_stats(void *instance, struct v4l2_ctrl *ctrl); @@ -345,74 +339,39 @@ int msm_vidc_adjust_sei_mastering_disp(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_sei_cll(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_hdr10plus(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_transcoding_stats(void *instance, struct v4l2_ctrl *ctrl); - -int msm_vidc_set_header_mode(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_deblock_mode(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_min_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_max_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_frame_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_req_sync_frame(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_chroma_qp_index_offset(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_slice_count(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_layer_count_and_type(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_gop_size(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_bitrate(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_layer_bitrate(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_u32(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_u32_packed(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_u32_enum(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_constant_quality(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_vbr_related_properties( - void *instance, enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_cbr_related_properties(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_use_and_mark_ltr(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_nal_length(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_session_priority(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_flip(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_rotation(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_blur_resolution(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_stage(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_pipe(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_csc_custom_matrix(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_level(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_preprocess(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_reserve_duration(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_q16(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_vui_timing_info(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_outbuf_fence_type(void *instance, - enum msm_vidc_inst_capability_type cap_id); -int msm_vidc_set_outbuf_fence_direction(void *instance, - enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_header_mode(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_deblock_mode(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_min_qp(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_max_qp(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_frame_qp(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_req_sync_frame(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_chroma_qp_index_offset(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_slice_count(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_layer_count_and_type(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_gop_size(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_bitrate(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_layer_bitrate(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_u32(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_u32_packed(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_u32_enum(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_constant_quality(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_vbr_related_properties(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_cbr_related_properties(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_use_and_mark_ltr(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_nal_length(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_session_priority(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_flip(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_rotation(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_blur_resolution(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_stage(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_pipe(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_csc_custom_matrix(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_level(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_preprocess(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_reserve_duration(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_q16(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_vui_timing_info(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_outbuf_fence_type(void *instance, enum msm_vidc_inst_capability_type cap_id); +int msm_vidc_set_outbuf_fence_direction(void *instance, enum msm_vidc_inst_capability_type cap_id); #endif // _MSM_VIDC_PLATFORM_H_ diff --git a/driver/platform/common/inc/msm_vidc_platform_ext.h b/driver/platform/common/inc/msm_vidc_platform_ext.h index b91255f21b..ecb8c38736 100644 --- a/driver/platform/common/inc/msm_vidc_platform_ext.h +++ b/driver/platform/common/inc/msm_vidc_platform_ext.h @@ -42,6 +42,7 @@ enum v4l2_mpeg_vidc_blur_types { VIDC_BLUR_EXTERNAL = 0x1, VIDC_BLUR_ADAPTIVE = 0x2, }; + /* (blur width) << 16 | (blur height) */ #define V4L2_CID_MPEG_VIDC_VIDEO_BLUR_RESOLUTION \ (V4L2_CID_MPEG_VIDC_BASE + 0x11) @@ -163,6 +164,7 @@ enum v4l2_mpeg_vidc_av1_tier { V4L2_MPEG_VIDC_AV1_TIER_MAIN = 0, V4L2_MPEG_VIDC_AV1_TIER_HIGH = 1, }; + /* Decoder Timestamp Reorder control */ #define V4L2_CID_MPEG_VIDC_TS_REORDER (V4L2_CID_MPEG_VIDC_BASE + 0x34) /* AV1 Decoder Film Grain */ @@ -258,9 +260,9 @@ int msm_vidc_adjust_dec_frame_rate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_operating_rate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_delivery_mode(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_set_ir_period(void *instance, - enum msm_vidc_inst_capability_type cap_id); + enum msm_vidc_inst_capability_type cap_id); int msm_vidc_set_signal_color_info(void *instance, - enum msm_vidc_inst_capability_type cap_id); + enum msm_vidc_inst_capability_type cap_id); int msm_vidc_adjust_csc(void *instance, struct v4l2_ctrl *ctrl); #endif diff --git a/driver/platform/common/inc/perf_static_model.h b/driver/platform/common/inc/perf_static_model.h index 66f7c027e6..1983609e04 100644 --- a/driver/platform/common/inc/perf_static_model.h +++ b/driver/platform/common/inc/perf_static_model.h @@ -230,8 +230,8 @@ struct api_calculation_bw_output { }; int msm_vidc_calculate_frequency(struct api_calculation_input codec_input, - struct api_calculation_freq_output *codec_output); + struct api_calculation_freq_output *codec_output); int msm_vidc_calculate_bandwidth(struct api_calculation_input codec_input, - struct api_calculation_bw_output *codec_output); + struct api_calculation_bw_output *codec_output); #endif /*_PERF_STATIC_MODEL_H_ */ diff --git a/driver/platform/common/src/msm_vidc_platform.c b/driver/platform/common/src/msm_vidc_platform.c index 504cbe7c76..31cbd87ef7 100644 --- a/driver/platform/common/src/msm_vidc_platform.c +++ b/driver/platform/common/src/msm_vidc_platform.c @@ -337,7 +337,7 @@ int msm_vidc_init_platform(struct msm_vidc_core *core) d_vpr_h("%s()\n", __func__); platform = devm_kzalloc(&core->pdev->dev, - sizeof(struct msm_vidc_platform), GFP_KERNEL); + sizeof(struct msm_vidc_platform), GFP_KERNEL); if (!platform) { d_vpr_e("%s: failed to alloc memory for platform\n", __func__); return -ENOMEM; @@ -363,8 +363,7 @@ int msm_vidc_init_platform(struct msm_vidc_core *core) /****************** control framework utility functions **********************/ -enum msm_vidc_inst_capability_type msm_vidc_get_cap_id( - struct msm_vidc_inst *inst, u32 id) +enum msm_vidc_inst_capability_type msm_vidc_get_cap_id(struct msm_vidc_inst *inst, u32 id) { enum msm_vidc_inst_capability_type i = INST_CAP_NONE + 1; @@ -382,7 +381,7 @@ enum msm_vidc_inst_capability_type msm_vidc_get_cap_id( } int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap_id, - s32 adjusted_val, const char *func) + s32 adjusted_val, const char *func) { int prev_value = 0; @@ -390,7 +389,7 @@ int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap_id, if (is_meta_cap(inst, cap_id)) { if (adjusted_val & MSM_VIDC_META_ENABLE && - adjusted_val & MSM_VIDC_META_DYN_ENABLE) { + adjusted_val & MSM_VIDC_META_DYN_ENABLE) { i_vpr_e(inst, "%s: %s cannot be enabled both statically and dynamically", __func__, cap_name(cap_id)); @@ -401,7 +400,7 @@ int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap_id, * control multiple times. */ if (adjusted_val & MSM_VIDC_META_ENABLE || - adjusted_val & MSM_VIDC_META_DYN_ENABLE) { + adjusted_val & MSM_VIDC_META_DYN_ENABLE) { /* enable metadata */ inst->capabilities[cap_id].value |= adjusted_val; } else { @@ -423,7 +422,7 @@ int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap_id, } bool is_parent_available(struct msm_vidc_inst *inst, - u32 cap_id, u32 check_parent, const char *func) + u32 cap_id, u32 check_parent, const char *func) { int i = 0; u32 cap_child; @@ -432,7 +431,7 @@ bool is_parent_available(struct msm_vidc_inst *inst, return false; while (i < MAX_CAP_CHILDREN && - inst->capabilities[check_parent].children[i]) { + inst->capabilities[check_parent].children[i]) { cap_child = inst->capabilities[check_parent].children[i]; if (cap_child == cap_id) return true; @@ -446,7 +445,7 @@ bool is_parent_available(struct msm_vidc_inst *inst, } int msm_vidc_get_parent_value(struct msm_vidc_inst *inst, - u32 cap_id, u32 parent, s32 *value, const char *func) + u32 cap_id, u32 parent, s32 *value, const char *func) { int rc = 0; @@ -470,10 +469,10 @@ int msm_vidc_get_parent_value(struct msm_vidc_inst *inst, } u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { if (inst->capabilities[cap_id].flags & CAP_FLAG_INPUT_PORT && - inst->capabilities[cap_id].flags & CAP_FLAG_OUTPUT_PORT) { + inst->capabilities[cap_id].flags & CAP_FLAG_OUTPUT_PORT) { if (inst->bufq[OUTPUT_PORT].vb2q->streaming) return get_hfi_port(inst, INPUT_PORT); else @@ -489,7 +488,7 @@ u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst, } int msm_vidc_v4l2_menu_to_hfi(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 *value) + enum msm_vidc_inst_capability_type cap_id, u32 *value) { switch (cap_id) { case ENTROPY_MODE: @@ -521,7 +520,7 @@ set_default: } int msm_vidc_v4l2_to_hfi_enum(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 *value) + enum msm_vidc_inst_capability_type cap_id, u32 *value) { switch (cap_id) { case BITRATE_MODE: @@ -628,8 +627,8 @@ set_default: } int msm_vidc_packetize_control(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id, u32 payload_type, - void *hfi_val, u32 payload_size, const char *func) + enum msm_vidc_inst_capability_type cap_id, u32 payload_type, + void *hfi_val, u32 payload_size, const char *func) { int rc = 0; u64 payload = 0; @@ -651,12 +650,12 @@ int msm_vidc_packetize_control(struct msm_vidc_inst *inst, cap_name(cap_id), inst->capabilities[cap_id].value, payload); rc = venus_hfi_session_property(inst, - inst->capabilities[cap_id].hfi_id, - HFI_HOST_FLAGS_NONE, - msm_vidc_get_port_info(inst, cap_id), - payload_type, - hfi_val, - payload_size); + inst->capabilities[cap_id].hfi_id, + HFI_HOST_FLAGS_NONE, + msm_vidc_get_port_info(inst, cap_id), + payload_type, + hfi_val, + payload_size); if (rc) { i_vpr_e(inst, "%s: failed to set cap[%d] %s to fw\n", func, cap_id, cap_name(cap_id)); @@ -687,16 +686,14 @@ int msm_vidc_adjust_entropy_mode(void *instance, struct v4l2_ctrl *ctrl) return 0; } - if (msm_vidc_get_parent_value(inst, ENTROPY_MODE, - PROFILE, &profile, __func__)) + if (msm_vidc_get_parent_value(inst, ENTROPY_MODE, PROFILE, &profile, __func__)) return -EINVAL; if (profile == V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE || - profile == V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) + profile == V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) adjusted_value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC; - msm_vidc_update_cap_value(inst, ENTROPY_MODE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, ENTROPY_MODE, adjusted_value, __func__); return 0; } @@ -712,8 +709,8 @@ int msm_vidc_adjust_bitrate_mode(void *instance, struct v4l2_ctrl *ctrl) frame_rc = inst->capabilities[FRAME_RC_ENABLE].value; frame_skip = inst->capabilities[FRAME_SKIP_MODE].value; - if (lossless || (msm_vidc_lossless_encode && - inst->codec == MSM_VIDC_HEVC)) { + if (lossless || + (msm_vidc_lossless_encode && inst->codec == MSM_VIDC_HEVC)) { hfi_value = HFI_RC_LOSSLESS; goto update; } @@ -755,7 +752,7 @@ int msm_vidc_adjust_profile(void *instance, struct v4l2_ctrl *ctrl) * Otherwise it would be a database error that should be fixed. */ if (msm_vidc_get_parent_value(inst, PROFILE, PIX_FMTS, - &pix_fmt, __func__)) + &pix_fmt, __func__)) return -EINVAL; /* 10 bit profile for 10 bit color format */ @@ -772,8 +769,7 @@ int msm_vidc_adjust_profile(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN; } - msm_vidc_update_cap_value(inst, PROFILE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, PROFILE, adjusted_value, __func__); return 0; } @@ -789,12 +785,12 @@ int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[LTR_COUNT].value; if (msm_vidc_get_parent_value(inst, LTR_COUNT, BITRATE_MODE, - &rc_type, __func__)) + &rc_type, __func__)) return -EINVAL; if ((rc_type != HFI_RC_OFF && - rc_type != HFI_RC_CBR_CFR && - rc_type != HFI_RC_CBR_VFR)) { + rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR)) { adjusted_value = 0; i_vpr_h(inst, "%s: ltr count unsupported, rc_type: %#x\n", @@ -804,7 +800,7 @@ int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl) if (is_valid_cap(inst, ALL_INTRA)) { if (msm_vidc_get_parent_value(inst, LTR_COUNT, - ALL_INTRA, &all_intra, __func__)) + ALL_INTRA, &all_intra, __func__)) return -EINVAL; if (all_intra) { adjusted_value = 0; @@ -813,19 +809,19 @@ int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl) } if (!msm_vidc_get_parent_value(inst, LTR_COUNT, PIX_FMTS, - &pix_fmts, __func__)) { + &pix_fmts, __func__)) { if (is_10bit_colorformat(pix_fmts)) adjusted_value = 0; } if (!msm_vidc_get_parent_value(inst, LTR_COUNT, ENH_LAYER_COUNT, - &enh_layer_count, __func__) && + &enh_layer_count, __func__) && !msm_vidc_get_parent_value(inst, LTR_COUNT, LAYER_TYPE, - &layer_type, __func__)) { + &layer_type, __func__)) { if (layer_type == HFI_HIER_P_SLIDING_WINDOW) { SLIDING_WINDOW_REF_FRAMES(inst->codec, - inst->capabilities[ENH_LAYER_COUNT].value + 1, - adjusted_value, num_ref_frames); + inst->capabilities[ENH_LAYER_COUNT].value + 1, + adjusted_value, num_ref_frames); if (num_ref_frames > MAX_ENCODING_REFERNCE_FRAMES) { /* * reduce ltr count to avoid num ref @@ -847,7 +843,7 @@ int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl) } exit: - msm_vidc_update_cap_value(inst, LTR_COUNT, adjusted_value, __func__); + msm_vidc_update_cap_value(inst, LTR_COUNT, adjusted_value, __func__); return 0; } @@ -870,7 +866,7 @@ int msm_vidc_adjust_use_ltr(void *instance, struct v4l2_ctrl *ctrl) return 0; if (adjusted_value <= 0 || - adjusted_value > ((1 << ltr_count) - 1)) { + adjusted_value > ((1 << ltr_count) - 1)) { /* * USE_LTR is bitmask value, hence should be * > 0 and <= (2 ^ LTR_COUNT) - 1 @@ -881,8 +877,7 @@ int msm_vidc_adjust_use_ltr(void *instance, struct v4l2_ctrl *ctrl) } /* USE_LTR value is a bitmask value */ - msm_vidc_update_cap_value(inst, USE_LTR, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, USE_LTR, adjusted_value, __func__); return 0; } @@ -905,15 +900,14 @@ int msm_vidc_adjust_mark_ltr(void *instance, struct v4l2_ctrl *ctrl) return 0; if (adjusted_value < 0 || - adjusted_value > (ltr_count - 1)) { + adjusted_value > (ltr_count - 1)) { /* MARK_LTR value should be >= 0 and <= (LTR_COUNT - 1) */ i_vpr_e(inst, "%s: invalid value %d\n", __func__, adjusted_value); return 0; } - msm_vidc_update_cap_value(inst, MARK_LTR, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, MARK_LTR, adjusted_value, __func__); return 0; } @@ -927,16 +921,13 @@ int msm_vidc_adjust_delta_based_rc(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[TIME_DELTA_BASED_RC].value; - if (msm_vidc_get_parent_value(inst, TIME_DELTA_BASED_RC, - BITRATE_MODE, &rc_type, __func__)) + if (msm_vidc_get_parent_value(inst, TIME_DELTA_BASED_RC, BITRATE_MODE, &rc_type, __func__)) return -EINVAL; - if (rc_type == HFI_RC_OFF || - rc_type == HFI_RC_CQ) + if (rc_type == HFI_RC_OFF || rc_type == HFI_RC_CQ) adjusted_value = 0; - msm_vidc_update_cap_value(inst, TIME_DELTA_BASED_RC, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, TIME_DELTA_BASED_RC, adjusted_value, __func__); return 0; } @@ -952,9 +943,9 @@ int msm_vidc_adjust_output_order(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[OUTPUT_ORDER].value; if (msm_vidc_get_parent_value(inst, OUTPUT_ORDER, DISPLAY_DELAY, - &display_delay, __func__) || + &display_delay, __func__) || msm_vidc_get_parent_value(inst, OUTPUT_ORDER, DISPLAY_DELAY_ENABLE, - &display_delay_enable, __func__)) + &display_delay_enable, __func__)) return -EINVAL; if (display_delay_enable && !display_delay) @@ -962,15 +953,14 @@ int msm_vidc_adjust_output_order(void *instance, struct v4l2_ctrl *ctrl) if (is_valid_cap(inst, THUMBNAIL_MODE)) { if (msm_vidc_get_parent_value(inst, OUTPUT_ORDER, THUMBNAIL_MODE, - &tn_mode, __func__)) + &tn_mode, __func__)) return -EINVAL; if (tn_mode == 1) adjusted_value = 1; } - msm_vidc_update_cap_value(inst, OUTPUT_ORDER, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, OUTPUT_ORDER, adjusted_value, __func__); return 0; } @@ -987,8 +977,7 @@ int msm_vidc_adjust_input_buf_host_max_count(void *instance, struct v4l2_ctrl *c if (msm_vidc_is_super_buffer(inst) || is_image_session(inst)) adjusted_value = DEFAULT_MAX_HOST_BURST_BUF_COUNT; - msm_vidc_update_cap_value(inst, INPUT_BUF_HOST_MAX_COUNT, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, INPUT_BUF_HOST_MAX_COUNT, adjusted_value, __func__); return 0; } @@ -1003,11 +992,10 @@ int msm_vidc_adjust_output_buf_host_max_count(void *instance, struct v4l2_ctrl * inst->capabilities[OUTPUT_BUF_HOST_MAX_COUNT].value; if (msm_vidc_is_super_buffer(inst) || is_image_session(inst) || - is_enc_slice_delivery_mode(inst)) + is_enc_slice_delivery_mode(inst)) adjusted_value = DEFAULT_MAX_HOST_BURST_BUF_COUNT; - msm_vidc_update_cap_value(inst, OUTPUT_BUF_HOST_MAX_COUNT, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, OUTPUT_BUF_HOST_MAX_COUNT, adjusted_value, __func__); return 0; } @@ -1029,21 +1017,19 @@ int msm_vidc_adjust_transform_8x8(void *instance, struct v4l2_ctrl *ctrl) } if (msm_vidc_get_parent_value(inst, TRANSFORM_8X8, - PROFILE, &profile, __func__)) + PROFILE, &profile, __func__)) return -EINVAL; if (profile != V4L2_MPEG_VIDEO_H264_PROFILE_HIGH && - profile != V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) + profile != V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) adjusted_value = 0; - msm_vidc_update_cap_value(inst, TRANSFORM_8X8, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, TRANSFORM_8X8, adjusted_value, __func__); return 0; } -int msm_vidc_adjust_chroma_qp_index_offset(void *instance, - struct v4l2_ctrl *ctrl) +int msm_vidc_adjust_chroma_qp_index_offset(void *instance, struct v4l2_ctrl *ctrl) { s32 adjusted_value; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -1054,8 +1040,7 @@ int msm_vidc_adjust_chroma_qp_index_offset(void *instance, if (adjusted_value != MIN_CHROMA_QP_OFFSET) adjusted_value = MAX_CHROMA_QP_OFFSET; - msm_vidc_update_cap_value(inst, CHROMA_QP_INDEX_OFFSET, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, CHROMA_QP_INDEX_OFFSET, adjusted_value, __func__); return 0; } @@ -1121,9 +1106,9 @@ int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl) bitrate = inst->capabilities[BIT_RATE].value; if (msm_vidc_get_parent_value(inst, SLICE_MODE, - BITRATE_MODE, &rc_type, __func__) || - msm_vidc_get_parent_value(inst, SLICE_MODE, - ENH_LAYER_COUNT, &enh_layer_count, __func__)) + BITRATE_MODE, &rc_type, __func__) || + msm_vidc_get_parent_value(inst, SLICE_MODE, + ENH_LAYER_COUNT, &enh_layer_count, __func__)) return -EINVAL; if (enh_layer_count && msm_vidc_check_all_layer_bitrate_set(inst)) @@ -1131,10 +1116,8 @@ int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl) fps = inst->capabilities[FRAME_RATE].value >> 16; if (fps > MAX_SLICES_FRAME_RATE || - (rc_type != HFI_RC_OFF && - rc_type != HFI_RC_CBR_CFR && - rc_type != HFI_RC_CBR_VFR && - rc_type != HFI_RC_VBR_CFR)) { + (rc_type != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR && rc_type != HFI_RC_VBR_CFR)) { adjusted_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE; update_cap = SLICE_MODE; i_vpr_h(inst, @@ -1145,14 +1128,13 @@ int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl) if (is_valid_cap(inst, ALL_INTRA)) { if (msm_vidc_get_parent_value(inst, SLICE_MODE, - ALL_INTRA, &all_intra, __func__)) + ALL_INTRA, &all_intra, __func__)) return -EINVAL; if (all_intra == 1) { adjusted_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE; update_cap = SLICE_MODE; - i_vpr_h(inst, - "%s: slice unsupported, all_intra %d\n", __func__, all_intra); + i_vpr_h(inst, "%s: slice unsupported, all_intra %d\n", __func__, all_intra); goto exit; } } @@ -1178,7 +1160,7 @@ int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl) * - width and height <= 1920 */ if (output_width < min_width || output_height < min_height || - output_width > max_width || output_height > max_width) { + output_width > max_width || output_height > max_width) { adjusted_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE; update_cap = SLICE_MODE; i_vpr_h(inst, @@ -1217,14 +1199,12 @@ int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = slice_val; exit: - msm_vidc_update_cap_value(inst, update_cap, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, update_cap, adjusted_value, __func__); return 0; } -static int msm_vidc_adjust_static_layer_count_and_type(struct msm_vidc_inst *inst, - s32 layer_count) +static int msm_vidc_adjust_static_layer_count_and_type(struct msm_vidc_inst *inst, s32 layer_count) { bool hb_requested = false; @@ -1269,7 +1249,7 @@ static int msm_vidc_adjust_static_layer_count_and_type(struct msm_vidc_inst *ins /* HP requested */ inst->hfi_layer_type = HFI_HIER_P_SLIDING_WINDOW; if (inst->codec == MSM_VIDC_H264 && - inst->hfi_rc_type == HFI_RC_VBR_CFR) + inst->hfi_rc_type == HFI_RC_VBR_CFR) inst->hfi_layer_type = HFI_HIER_P_HYBRID_LTR; } @@ -1296,8 +1276,7 @@ static int msm_vidc_adjust_static_layer_count_and_type(struct msm_vidc_inst *ins } exit: - msm_vidc_update_cap_value(inst, ENH_LAYER_COUNT, - layer_count, __func__); + msm_vidc_update_cap_value(inst, ENH_LAYER_COUNT, layer_count, __func__); inst->capabilities[ENH_LAYER_COUNT].max = layer_count; return 0; } @@ -1313,17 +1292,16 @@ int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[ENH_LAYER_COUNT].value; if (!is_parent_available(inst, ENH_LAYER_COUNT, - BITRATE_MODE, __func__)) + BITRATE_MODE, __func__)) return -EINVAL; if (!inst->bufq[OUTPUT_PORT].vb2q->streaming) { - rc = msm_vidc_adjust_static_layer_count_and_type(inst, - client_layer_count); + rc = msm_vidc_adjust_static_layer_count_and_type(inst, client_layer_count); if (rc) goto exit; } else { if (inst->hfi_rc_type == HFI_RC_CBR_CFR || - inst->hfi_rc_type == HFI_RC_CBR_VFR) { + inst->hfi_rc_type == HFI_RC_CBR_VFR) { i_vpr_h(inst, "%s: ignoring dynamic layer count change for CBR mode\n", __func__); @@ -1331,7 +1309,7 @@ int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl) } if (inst->hfi_layer_type == HFI_HIER_P_HYBRID_LTR || - inst->hfi_layer_type == HFI_HIER_P_SLIDING_WINDOW) { + inst->hfi_layer_type == HFI_HIER_P_SLIDING_WINDOW) { /* dynamic layer count change is only supported for HP */ if (client_layer_count > inst->capabilities[ENH_LAYER_COUNT].max) @@ -1339,7 +1317,7 @@ int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[ENH_LAYER_COUNT].max; msm_vidc_update_cap_value(inst, ENH_LAYER_COUNT, - client_layer_count, __func__); + client_layer_count, __func__); } } @@ -1356,7 +1334,7 @@ int msm_vidc_adjust_gop_size(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[GOP_SIZE].value; if (msm_vidc_get_parent_value(inst, GOP_SIZE, - ENH_LAYER_COUNT, &enh_layer_count, __func__)) + ENH_LAYER_COUNT, &enh_layer_count, __func__)) return -EINVAL; if (!enh_layer_count) @@ -1390,7 +1368,7 @@ int msm_vidc_adjust_b_frame(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[B_FRAME].value; if (msm_vidc_get_parent_value(inst, B_FRAME, - ENH_LAYER_COUNT, &enh_layer_count, __func__)) + ENH_LAYER_COUNT, &enh_layer_count, __func__)) return -EINVAL; if (!enh_layer_count || inst->hfi_layer_type != HFI_HIER_B) { @@ -1436,7 +1414,7 @@ int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl) return 0; if (msm_vidc_get_parent_value(inst, BIT_RATE, - ENH_LAYER_COUNT, &enh_layer_count, __func__)) + ENH_LAYER_COUNT, &enh_layer_count, __func__)) return -EINVAL; /* get max bit rate for current session config*/ @@ -1480,15 +1458,15 @@ int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl) * and add to FW_LIST to set new values to firmware. */ msm_vidc_update_cap_value(inst, cap_id, - (cap_value - decrement_in_value), __func__); + (cap_value - decrement_in_value), + __func__); } } i_vpr_h(inst, "%s: update BIT_RATE with cumulative bitrate\n", __func__); - msm_vidc_update_cap_value(inst, BIT_RATE, - cumulative_bitrate, __func__); + msm_vidc_update_cap_value(inst, BIT_RATE, cumulative_bitrate, __func__); } return rc; @@ -1563,7 +1541,7 @@ int msm_vidc_adjust_layer_bitrate(void *instance, struct v4l2_ctrl *ctrl) "%s: update BIT_RATE with cumulative bitrate\n", __func__); msm_vidc_update_cap_value(inst, BIT_RATE, - msm_vidc_get_cumulative_bitrate(inst), __func__); + msm_vidc_get_cumulative_bitrate(inst), __func__); return rc; } @@ -1578,15 +1556,15 @@ int msm_vidc_adjust_peak_bitrate(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[PEAK_BITRATE].value; if (msm_vidc_get_parent_value(inst, PEAK_BITRATE, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; if (rc_type != HFI_RC_CBR_CFR && - rc_type != HFI_RC_CBR_VFR) + rc_type != HFI_RC_CBR_VFR) return 0; if (msm_vidc_get_parent_value(inst, PEAK_BITRATE, - BIT_RATE, &bitrate, __func__)) + BIT_RATE, &bitrate, __func__)) return -EINVAL; /* Peak Bitrate should be larger than or equal to avg bitrate */ @@ -1598,17 +1576,16 @@ int msm_vidc_adjust_peak_bitrate(void *instance, struct v4l2_ctrl *ctrl) } msm_vidc_update_cap_value(inst, PEAK_BITRATE, - adjusted_value, __func__); + adjusted_value, __func__); return 0; } static int msm_vidc_adjust_hevc_qp(struct msm_vidc_inst *inst, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { s32 pix_fmt = -1; - if (!(inst->codec == MSM_VIDC_HEVC || inst->codec == MSM_VIDC_HEIC)) { i_vpr_e(inst, "%s: incorrect cap[%d] %s entry in database, fix database\n", @@ -1617,7 +1594,7 @@ static int msm_vidc_adjust_hevc_qp(struct msm_vidc_inst *inst, } if (msm_vidc_get_parent_value(inst, cap_id, - PIX_FMTS, &pix_fmt, __func__)) + PIX_FMTS, &pix_fmt, __func__)) return -EINVAL; if (pix_fmt == MSM_VIDC_FMT_P010 || pix_fmt == MSM_VIDC_FMT_TP10C) @@ -1646,7 +1623,7 @@ int msm_vidc_adjust_hevc_min_qp(void *instance, struct v4l2_ctrl *ctrl) if (ctrl) msm_vidc_update_cap_value(inst, MIN_FRAME_QP, - ctrl->val, __func__); + ctrl->val, __func__); rc = msm_vidc_adjust_hevc_qp(inst, MIN_FRAME_QP); @@ -1660,8 +1637,7 @@ int msm_vidc_adjust_hevc_max_qp(void *instance, struct v4l2_ctrl *ctrl) struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; if (ctrl) - msm_vidc_update_cap_value(inst, MAX_FRAME_QP, - ctrl->val, __func__); + msm_vidc_update_cap_value(inst, MAX_FRAME_QP, ctrl->val, __func__); rc = msm_vidc_adjust_hevc_qp(inst, MAX_FRAME_QP); @@ -1675,8 +1651,7 @@ int msm_vidc_adjust_hevc_i_frame_qp(void *instance, struct v4l2_ctrl *ctrl) struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; if (ctrl) - msm_vidc_update_cap_value(inst, I_FRAME_QP, - ctrl->val, __func__); + msm_vidc_update_cap_value(inst, I_FRAME_QP, ctrl->val, __func__); rc = msm_vidc_adjust_hevc_qp(inst, I_FRAME_QP); if (rc) @@ -1692,8 +1667,7 @@ int msm_vidc_adjust_hevc_p_frame_qp(void *instance, struct v4l2_ctrl *ctrl) struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; if (ctrl) - msm_vidc_update_cap_value(inst, P_FRAME_QP, - ctrl->val, __func__); + msm_vidc_update_cap_value(inst, P_FRAME_QP, ctrl->val, __func__); rc = msm_vidc_adjust_hevc_qp(inst, P_FRAME_QP); if (rc) @@ -1709,8 +1683,7 @@ int msm_vidc_adjust_hevc_b_frame_qp(void *instance, struct v4l2_ctrl *ctrl) struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; if (ctrl) - msm_vidc_update_cap_value(inst, B_FRAME_QP, - ctrl->val, __func__); + msm_vidc_update_cap_value(inst, B_FRAME_QP, ctrl->val, __func__); rc = msm_vidc_adjust_hevc_qp(inst, B_FRAME_QP); if (rc) @@ -1733,9 +1706,9 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl) return 0; if (msm_vidc_get_parent_value(inst, BLUR_TYPES, BITRATE_MODE, - &rc_type, __func__) || - msm_vidc_get_parent_value(inst, BLUR_TYPES, MIN_QUALITY, - &min_quality, __func__)) + &rc_type, __func__) || + msm_vidc_get_parent_value(inst, BLUR_TYPES, MIN_QUALITY, + &min_quality, __func__)) return -EINVAL; if (adjusted_value == MSM_VIDC_BLUR_EXTERNAL) { @@ -1744,7 +1717,7 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl) } else if (adjusted_value == MSM_VIDC_BLUR_ADAPTIVE) { if (is_valid_cap(inst, META_ROI_INFO)) { if (msm_vidc_get_parent_value(inst, BLUR_TYPES, - META_ROI_INFO, &roi_enable, __func__)) + META_ROI_INFO, &roi_enable, __func__)) return -EINVAL; if (is_meta_tx_inp_enabled(inst, META_ROI_INFO)) { adjusted_value = MSM_VIDC_BLUR_NONE; @@ -1753,16 +1726,16 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl) } if (is_scaling_enabled(inst) || min_quality || - (rc_type != HFI_RC_VBR_CFR && - rc_type != HFI_RC_CBR_CFR && - rc_type != HFI_RC_CBR_VFR)) { + (rc_type != HFI_RC_VBR_CFR && + rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR)) { adjusted_value = MSM_VIDC_BLUR_NONE; goto exit; } if (inst->codec == MSM_VIDC_HEVC) { if (msm_vidc_get_parent_value(inst, BLUR_TYPES, PIX_FMTS, - &pix_fmts, __func__)) + &pix_fmts, __func__)) return -EINVAL; if (is_10bit_colorformat(pix_fmts)) adjusted_value = MSM_VIDC_BLUR_NONE; @@ -1770,8 +1743,7 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl) } exit: - msm_vidc_update_cap_value(inst, BLUR_TYPES, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, BLUR_TYPES, adjusted_value, __func__); return 0; } @@ -1787,9 +1759,9 @@ int msm_vidc_adjust_all_intra(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = inst->capabilities[ALL_INTRA].value; if (msm_vidc_get_parent_value(inst, ALL_INTRA, GOP_SIZE, - &gop_size, __func__) || - msm_vidc_get_parent_value(inst, ALL_INTRA, B_FRAME, - &bframe, __func__)) + &gop_size, __func__) || + msm_vidc_get_parent_value(inst, ALL_INTRA, B_FRAME, + &bframe, __func__)) return -EINVAL; width = inst->crop.width; @@ -1810,8 +1782,7 @@ int msm_vidc_adjust_all_intra(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = 1; exit: - msm_vidc_update_cap_value(inst, ALL_INTRA, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, ALL_INTRA, adjusted_value, __func__); return 0; } @@ -1826,14 +1797,14 @@ int msm_vidc_adjust_blur_resolution(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[BLUR_RESOLUTION].value; if (msm_vidc_get_parent_value(inst, BLUR_RESOLUTION, BLUR_TYPES, - &blur_type, __func__)) + &blur_type, __func__)) return -EINVAL; if (blur_type != MSM_VIDC_BLUR_EXTERNAL) return 0; msm_vidc_update_cap_value(inst, BLUR_RESOLUTION, - adjusted_value, __func__); + adjusted_value, __func__); return 0; } @@ -1852,11 +1823,11 @@ int msm_vidc_adjust_brs(void *instance, struct v4l2_ctrl *ctrl) return 0; if (msm_vidc_get_parent_value(inst, CONTENT_ADAPTIVE_CODING, - BITRATE_MODE, &rc_type, __func__) || - msm_vidc_get_parent_value(inst, CONTENT_ADAPTIVE_CODING, - LAYER_ENABLE, &layer_enabled, __func__) || - msm_vidc_get_parent_value(inst, CONTENT_ADAPTIVE_CODING, - LAYER_TYPE, &layer_type, __func__)) + BITRATE_MODE, &rc_type, __func__) || + msm_vidc_get_parent_value(inst, CONTENT_ADAPTIVE_CODING, + LAYER_ENABLE, &layer_enabled, __func__) || + msm_vidc_get_parent_value(inst, CONTENT_ADAPTIVE_CODING, + LAYER_TYPE, &layer_type, __func__)) return -EINVAL; /* @@ -1887,7 +1858,7 @@ int msm_vidc_adjust_brs(void *instance, struct v4l2_ctrl *ctrl) adjust: msm_vidc_update_cap_value(inst, CONTENT_ADAPTIVE_CODING, - adjusted_value, __func__); + adjusted_value, __func__); return 0; } @@ -1906,9 +1877,9 @@ int msm_vidc_adjust_bitrate_boost(void *instance, struct v4l2_ctrl *ctrl) return 0; if (msm_vidc_get_parent_value(inst, BITRATE_BOOST, - MIN_QUALITY, &min_quality, __func__) || - msm_vidc_get_parent_value(inst, BITRATE_BOOST, - BITRATE_MODE, &rc_type, __func__)) + MIN_QUALITY, &min_quality, __func__) || + msm_vidc_get_parent_value(inst, BITRATE_BOOST, + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; /* @@ -1937,8 +1908,7 @@ int msm_vidc_adjust_bitrate_boost(void *instance, struct v4l2_ctrl *ctrl) } adjust: - msm_vidc_update_cap_value(inst, BITRATE_BOOST, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, BITRATE_BOOST, adjusted_value, __func__); return 0; } @@ -1964,9 +1934,9 @@ int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl) return 0; if (msm_vidc_get_parent_value(inst, MIN_QUALITY, - BITRATE_MODE, &rc_type, __func__) || - msm_vidc_get_parent_value(inst, MIN_QUALITY, - ENH_LAYER_COUNT, &enh_layer_count, __func__)) + BITRATE_MODE, &rc_type, __func__) || + msm_vidc_get_parent_value(inst, MIN_QUALITY, + ENH_LAYER_COUNT, &enh_layer_count, __func__)) return -EINVAL; /* @@ -1994,7 +1964,7 @@ int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl) */ if (inst->codec == MSM_VIDC_HEVC) { if (msm_vidc_get_parent_value(inst, MIN_QUALITY, - PIX_FMTS, &pix_fmts, __func__)) + PIX_FMTS, &pix_fmts, __func__)) return -EINVAL; if (is_10bit_colorformat(pix_fmts)) { @@ -2022,7 +1992,7 @@ int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl) if (is_valid_cap(inst, META_ROI_INFO)) { if (msm_vidc_get_parent_value(inst, MIN_QUALITY, - META_ROI_INFO, &roi_enable, __func__)) + META_ROI_INFO, &roi_enable, __func__)) return -EINVAL; if (is_meta_tx_inp_enabled(inst, META_ROI_INFO)) { i_vpr_h(inst, @@ -2045,8 +2015,7 @@ int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = MAX_SUPPORTED_MIN_QUALITY; update_and_exit: - msm_vidc_update_cap_value(inst, MIN_QUALITY, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, MIN_QUALITY, adjusted_value, __func__); return 0; } @@ -2075,9 +2044,9 @@ int msm_vidc_adjust_preprocess(void *instance, struct v4l2_ctrl *ctrl) */ if (is_valid_cap(inst, CONTENT_ADAPTIVE_CODING)) { if (msm_vidc_get_parent_value(inst, - REQUEST_PREPROCESS, - CONTENT_ADAPTIVE_CODING, - &brs, __func__)) + REQUEST_PREPROCESS, + CONTENT_ADAPTIVE_CODING, + &brs, __func__)) return -EINVAL; if (brs == 0) { /* preprocess not required as BRS not enabled */ @@ -2091,14 +2060,13 @@ int msm_vidc_adjust_preprocess(void *instance, struct v4l2_ctrl *ctrl) } if (res_is_less_than_or_equal_to(width, height, 3840, 2160) && - max_fps <= 60) + max_fps <= 60) adjusted_value = 1; else adjusted_value = 0; update_preprocess: - msm_vidc_update_cap_value(inst, REQUEST_PREPROCESS, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, REQUEST_PREPROCESS, adjusted_value, __func__); return 0; } @@ -2113,16 +2081,15 @@ int msm_vidc_adjust_enc_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[LOWLATENCY_MODE].value; if (msm_vidc_get_parent_value(inst, LOWLATENCY_MODE, BITRATE_MODE, - &rc_type, __func__)) + &rc_type, __func__)) return -EINVAL; if (rc_type == HFI_RC_CBR_CFR || - rc_type == HFI_RC_CBR_VFR || - is_enc_slice_delivery_mode(inst)) + rc_type == HFI_RC_CBR_VFR || + is_enc_slice_delivery_mode(inst)) adjusted_value = 1; - msm_vidc_update_cap_value(inst, LOWLATENCY_MODE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, LOWLATENCY_MODE, adjusted_value, __func__); return 0; } @@ -2138,16 +2105,15 @@ int msm_vidc_adjust_dec_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl) if (is_valid_cap(inst, META_OUTBUF_FENCE)) { if (msm_vidc_get_parent_value(inst, LOWLATENCY_MODE, META_OUTBUF_FENCE, - &outbuf_fence, __func__)) + &outbuf_fence, __func__)) return -EINVAL; /* enable lowlatency if outbuf fence is enabled */ if (outbuf_fence & MSM_VIDC_META_ENABLE && - outbuf_fence & MSM_VIDC_META_RX_INPUT) + outbuf_fence & MSM_VIDC_META_RX_INPUT) adjusted_value = 1; } - msm_vidc_update_cap_value(inst, LOWLATENCY_MODE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, LOWLATENCY_MODE, adjusted_value, __func__); return 0; } @@ -2195,20 +2161,19 @@ int msm_vidc_adjust_roi_info(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[META_ROI_INFO].value; if (msm_vidc_get_parent_value(inst, META_ROI_INFO, BITRATE_MODE, - &rc_type, __func__)) + &rc_type, __func__)) return -EINVAL; if (msm_vidc_get_parent_value(inst, META_ROI_INFO, PIX_FMTS, - &pix_fmt, __func__)) + &pix_fmt, __func__)) return -EINVAL; - if ((rc_type != HFI_RC_VBR_CFR && rc_type != HFI_RC_CBR_CFR - && rc_type != HFI_RC_CBR_VFR) || !is_8bit_colorformat(pix_fmt) - || is_scaling_enabled(inst) || is_rotation_90_or_270(inst)) + if ((rc_type != HFI_RC_VBR_CFR && rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR) || !is_8bit_colorformat(pix_fmt) || + is_scaling_enabled(inst) || is_rotation_90_or_270(inst)) adjusted_value = 0; - msm_vidc_update_cap_value(inst, META_ROI_INFO, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, META_ROI_INFO, adjusted_value, __func__); return 0; } @@ -2227,7 +2192,7 @@ int msm_vidc_adjust_dec_outbuf_fence_type(void *instance, struct v4l2_ctrl *ctrl capability[OUTBUF_FENCE_TYPE].value; if (msm_vidc_get_parent_value(inst, OUTBUF_FENCE_TYPE, - META_OUTBUF_FENCE, &meta_outbuf_fence, __func__)) + META_OUTBUF_FENCE, &meta_outbuf_fence, __func__)) return -EINVAL; if (is_meta_rx_inp_enabled(inst, META_OUTBUF_FENCE)) { @@ -2239,8 +2204,7 @@ int msm_vidc_adjust_dec_outbuf_fence_type(void *instance, struct v4l2_ctrl *ctrl adjusted_value = MSM_VIDC_FENCE_NONE; } - msm_vidc_update_cap_value(inst, OUTBUF_FENCE_TYPE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, OUTBUF_FENCE_TYPE, adjusted_value, __func__); return 0; } @@ -2259,7 +2223,7 @@ int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance, struct v4l2_ctrl capability[OUTBUF_FENCE_DIRECTION].value; if (msm_vidc_get_parent_value(inst, OUTBUF_FENCE_DIRECTION, - META_OUTBUF_FENCE, &meta_outbuf_fence, __func__)) + META_OUTBUF_FENCE, &meta_outbuf_fence, __func__)) return -EINVAL; if (is_meta_rx_inp_enabled(inst, META_OUTBUF_FENCE)) @@ -2267,8 +2231,7 @@ int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance, struct v4l2_ctrl else adjusted_value = MSM_VIDC_FENCE_DIR_NONE; - msm_vidc_update_cap_value(inst, OUTBUF_FENCE_DIRECTION, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, OUTBUF_FENCE_DIRECTION, adjusted_value, __func__); return 0; } @@ -2284,19 +2247,18 @@ int msm_vidc_adjust_dec_slice_mode(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[SLICE_DECODE].value; if (msm_vidc_get_parent_value(inst, SLICE_DECODE, LOWLATENCY_MODE, - &low_latency, __func__) || + &low_latency, __func__) || msm_vidc_get_parent_value(inst, SLICE_DECODE, OUTPUT_ORDER, - &picture_order, __func__) || + &picture_order, __func__) || msm_vidc_get_parent_value(inst, SLICE_DECODE, META_OUTBUF_FENCE, - &outbuf_fence, __func__)) + &outbuf_fence, __func__)) return -EINVAL; if (!low_latency || !picture_order || !is_meta_rx_inp_enabled(inst, META_OUTBUF_FENCE)) adjusted_value = 0; - msm_vidc_update_cap_value(inst, SLICE_DECODE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, SLICE_DECODE, adjusted_value, __func__); return 0; } @@ -2310,7 +2272,7 @@ int msm_vidc_adjust_eva_stats(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[META_EVA_STATS].value; if (msm_vidc_get_parent_value(inst, META_EVA_STATS, BITRATE_MODE, - &rc_type, __func__)) + &rc_type, __func__)) return -EINVAL; /* disable Eva stats metadata for CQ rate control */ @@ -2319,8 +2281,7 @@ int msm_vidc_adjust_eva_stats(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = 0; } - msm_vidc_update_cap_value(inst, META_EVA_STATS, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, META_EVA_STATS, adjusted_value, __func__); return 0; } @@ -2334,7 +2295,7 @@ int msm_vidc_adjust_sei_mastering_disp(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[META_SEI_MASTERING_DISP].value; if (msm_vidc_get_parent_value(inst, META_SEI_MASTERING_DISP, PROFILE, - &profile, __func__)) + &profile, __func__)) return -EINVAL; if (inst->codec != MSM_VIDC_HEVC && inst->codec != MSM_VIDC_HEIC) { @@ -2343,16 +2304,16 @@ int msm_vidc_adjust_sei_mastering_disp(void *instance, struct v4l2_ctrl *ctrl) } if ((inst->codec == MSM_VIDC_HEVC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || - (inst->codec == MSM_VIDC_HEIC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || + (inst->codec == MSM_VIDC_HEIC && + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { adjusted_value = 0; goto adjust; } adjust: msm_vidc_update_cap_value(inst, META_SEI_MASTERING_DISP, - adjusted_value, __func__); + adjusted_value, __func__); return 0; } @@ -2365,7 +2326,7 @@ int msm_vidc_adjust_sei_cll(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[META_SEI_CLL].value; if (msm_vidc_get_parent_value(inst, META_SEI_CLL, PROFILE, - &profile, __func__)) + &profile, __func__)) return -EINVAL; if (inst->codec != MSM_VIDC_HEVC && inst->codec != MSM_VIDC_HEIC) { @@ -2374,9 +2335,9 @@ int msm_vidc_adjust_sei_cll(void *instance, struct v4l2_ctrl *ctrl) } if ((inst->codec == MSM_VIDC_HEVC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || - (inst->codec == MSM_VIDC_HEIC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || + (inst->codec == MSM_VIDC_HEIC && + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { adjusted_value = 0; goto adjust; } @@ -2395,7 +2356,7 @@ int msm_vidc_adjust_hdr10plus(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[META_HDR10PLUS].value; if (msm_vidc_get_parent_value(inst, META_HDR10PLUS, PROFILE, - &profile, __func__)) + &profile, __func__)) return -EINVAL; if (inst->codec != MSM_VIDC_HEVC && inst->codec != MSM_VIDC_HEIC) { @@ -2404,9 +2365,9 @@ int msm_vidc_adjust_hdr10plus(void *instance, struct v4l2_ctrl *ctrl) } if ((inst->codec == MSM_VIDC_HEVC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || - (inst->codec == MSM_VIDC_HEIC && - profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) || + (inst->codec == MSM_VIDC_HEIC && + profile != V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE)) { adjusted_value = 0; goto adjust; } @@ -2428,7 +2389,7 @@ int msm_vidc_adjust_transcoding_stats(void *instance, struct v4l2_ctrl *ctrl) inst->capabilities[META_TRANSCODING_STAT_INFO].value; if (msm_vidc_get_parent_value(inst, META_TRANSCODING_STAT_INFO, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; /* @@ -2455,7 +2416,7 @@ int msm_vidc_adjust_transcoding_stats(void *instance, struct v4l2_ctrl *ctrl) width = f->fmt.pix_mp.width; height = f->fmt.pix_mp.height; if (res_is_greater_than(width, height, - MAX_TRANSCODING_STATS_WIDTH, MAX_TRANSCODING_STATS_HEIGHT)) { + MAX_TRANSCODING_STATS_WIDTH, MAX_TRANSCODING_STATS_HEIGHT)) { i_vpr_h(inst, "%s: unsupported res, wxh %ux%u\n", __func__, width, height); adjusted_value = 0; @@ -2464,7 +2425,7 @@ int msm_vidc_adjust_transcoding_stats(void *instance, struct v4l2_ctrl *ctrl) exit: msm_vidc_update_cap_value(inst, META_TRANSCODING_STAT_INFO, - adjusted_value, __func__); + adjusted_value, __func__); return 0; } @@ -2474,7 +2435,7 @@ exit: /************************* Control Set functions *****************************/ int msm_vidc_set_header_mode(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2496,7 +2457,7 @@ int msm_vidc_set_header_mode(void *instance, hfi_value |= HFI_SEQ_HEADER_METADATA; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2504,7 +2465,7 @@ int msm_vidc_set_header_mode(void *instance, } int msm_vidc_set_deblock_mode(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2520,7 +2481,7 @@ int msm_vidc_set_deblock_mode(void *instance, hfi_value = (alpha << 16) | (beta << 8) | lf_mode; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2528,7 +2489,7 @@ int msm_vidc_set_deblock_mode(void *instance, } int msm_vidc_set_constant_quality(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2536,7 +2497,7 @@ int msm_vidc_set_constant_quality(void *instance, s32 rc_type = -1; if (msm_vidc_get_parent_value(inst, cap_id, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; if (rc_type != HFI_RC_CQ) @@ -2545,7 +2506,7 @@ int msm_vidc_set_constant_quality(void *instance, hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2553,7 +2514,7 @@ int msm_vidc_set_constant_quality(void *instance, } int msm_vidc_set_vbr_related_properties(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2561,7 +2522,7 @@ int msm_vidc_set_vbr_related_properties(void *instance, s32 rc_type = -1; if (msm_vidc_get_parent_value(inst, cap_id, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; if (rc_type != HFI_RC_VBR_CFR) @@ -2570,7 +2531,7 @@ int msm_vidc_set_vbr_related_properties(void *instance, hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2578,7 +2539,7 @@ int msm_vidc_set_vbr_related_properties(void *instance, } int msm_vidc_set_cbr_related_properties(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2586,17 +2547,17 @@ int msm_vidc_set_cbr_related_properties(void *instance, s32 rc_type = -1; if (msm_vidc_get_parent_value(inst, cap_id, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; if (rc_type != HFI_RC_CBR_VFR && - rc_type != HFI_RC_CBR_CFR) + rc_type != HFI_RC_CBR_CFR) return 0; hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2604,15 +2565,15 @@ int msm_vidc_set_cbr_related_properties(void *instance, } int msm_vidc_set_use_and_mark_ltr(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; u32 hfi_value = 0; if (!inst->capabilities[LTR_COUNT].value || - (inst->capabilities[cap_id].value == - INVALID_DEFAULT_MARK_OR_USE_LTR)) { + inst->capabilities[cap_id].value == + INVALID_DEFAULT_MARK_OR_USE_LTR) { i_vpr_h(inst, "%s: LTR_COUNT: %d %s: %d, cap %s is not set\n", __func__, inst->capabilities[LTR_COUNT].value, @@ -2625,7 +2586,7 @@ int msm_vidc_set_use_and_mark_ltr(void *instance, hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2633,7 +2594,7 @@ int msm_vidc_set_use_and_mark_ltr(void *instance, } int msm_vidc_set_min_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2646,13 +2607,13 @@ int msm_vidc_set_min_qp(void *instance, min_qp_enable = 1; if (min_qp_enable || - (inst->capabilities[I_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[I_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) i_qp_enable = 1; if (min_qp_enable || - (inst->capabilities[P_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[P_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) p_qp_enable = 1; if (min_qp_enable || - (inst->capabilities[B_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[B_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET)) b_qp_enable = 1; client_qp_enable = i_qp_enable | p_qp_enable << 1 | b_qp_enable << 2; @@ -2674,17 +2635,17 @@ int msm_vidc_set_min_qp(void *instance, * max of both caps will result into client set value. */ i_frame_qp = max(inst->capabilities[I_FRAME_MIN_QP].value, - inst->capabilities[MIN_FRAME_QP].value) + offset; + inst->capabilities[MIN_FRAME_QP].value) + offset; p_frame_qp = max(inst->capabilities[P_FRAME_MIN_QP].value, - inst->capabilities[MIN_FRAME_QP].value) + offset; + inst->capabilities[MIN_FRAME_QP].value) + offset; b_frame_qp = max(inst->capabilities[B_FRAME_MIN_QP].value, - inst->capabilities[MIN_FRAME_QP].value) + offset; + inst->capabilities[MIN_FRAME_QP].value) + offset; hfi_value = i_frame_qp | p_frame_qp << 8 | b_frame_qp << 16 | client_qp_enable << 24; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2692,7 +2653,7 @@ int msm_vidc_set_min_qp(void *instance, } int msm_vidc_set_max_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2705,13 +2666,13 @@ int msm_vidc_set_max_qp(void *instance, max_qp_enable = 1; if (max_qp_enable || - (inst->capabilities[I_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[I_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) i_qp_enable = 1; if (max_qp_enable || - (inst->capabilities[P_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[P_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) p_qp_enable = 1; if (max_qp_enable || - (inst->capabilities[B_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) + (inst->capabilities[B_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET)) b_qp_enable = 1; client_qp_enable = i_qp_enable | p_qp_enable << 1 | b_qp_enable << 2; @@ -2733,17 +2694,17 @@ int msm_vidc_set_max_qp(void *instance, * min of both caps will result into client set value. */ i_frame_qp = min(inst->capabilities[I_FRAME_MAX_QP].value, - inst->capabilities[MAX_FRAME_QP].value) + offset; + inst->capabilities[MAX_FRAME_QP].value) + offset; p_frame_qp = min(inst->capabilities[P_FRAME_MAX_QP].value, - inst->capabilities[MAX_FRAME_QP].value) + offset; + inst->capabilities[MAX_FRAME_QP].value) + offset; b_frame_qp = min(inst->capabilities[B_FRAME_MAX_QP].value, - inst->capabilities[MAX_FRAME_QP].value) + offset; + inst->capabilities[MAX_FRAME_QP].value) + offset; hfi_value = i_frame_qp | p_frame_qp << 8 | b_frame_qp << 16 | client_qp_enable << 24; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2751,7 +2712,7 @@ int msm_vidc_set_max_qp(void *instance, } int msm_vidc_set_frame_qp(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2760,10 +2721,11 @@ int msm_vidc_set_frame_qp(void *instance, u32 i_qp_enable = 0, p_qp_enable = 0, b_qp_enable = 0; u32 client_qp_enable = 0, hfi_value = 0, offset = 0; s32 rc_type = -1; + capab = inst->capabilities; if (msm_vidc_get_parent_value(inst, cap_id, - BITRATE_MODE, &rc_type, __func__)) + BITRATE_MODE, &rc_type, __func__)) return -EINVAL; if (inst->bufq[OUTPUT_PORT].vb2q->streaming) { @@ -2777,7 +2739,9 @@ int msm_vidc_set_frame_qp(void *instance, if (rc_type == HFI_RC_OFF) { /* Mandatorily set for rc off case */ - i_qp_enable = p_qp_enable = b_qp_enable = 1; + i_qp_enable = 1; + p_qp_enable = 1; + b_qp_enable = 1; } else { /* Set only if client has set for NON rc off case */ if (capab[I_FRAME_QP].flags & CAP_FLAG_CLIENT_SET) @@ -2807,7 +2771,7 @@ int msm_vidc_set_frame_qp(void *instance, client_qp_enable << 24; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2815,7 +2779,7 @@ int msm_vidc_set_frame_qp(void *instance, } int msm_vidc_set_req_sync_frame(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2829,7 +2793,7 @@ int msm_vidc_set_req_sync_frame(void *instance, hfi_value = HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2837,7 +2801,7 @@ int msm_vidc_set_req_sync_frame(void *instance, } int msm_vidc_set_chroma_qp_index_offset(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2853,7 +2817,7 @@ int msm_vidc_set_chroma_qp_index_offset(void *instance, hfi_value = chroma_qp_offset_mode | chroma_qp << 8 | chroma_qp << 16; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2861,7 +2825,7 @@ int msm_vidc_set_chroma_qp_index_offset(void *instance, } int msm_vidc_set_slice_count(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2886,7 +2850,7 @@ int msm_vidc_set_slice_count(void *instance, } rc = msm_vidc_packetize_control(inst, set_cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2894,7 +2858,7 @@ int msm_vidc_set_slice_count(void *instance, } int msm_vidc_set_nal_length(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2909,7 +2873,7 @@ int msm_vidc_set_nal_length(void *instance, } rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2917,7 +2881,7 @@ int msm_vidc_set_nal_length(void *instance, } int msm_vidc_set_layer_count_and_type(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2929,7 +2893,7 @@ int msm_vidc_set_layer_count_and_type(void *instance, cap_id = LAYER_TYPE; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_layer_type, sizeof(u32), __func__); + &hfi_layer_type, sizeof(u32), __func__); if (rc) goto exit; } else { @@ -2947,7 +2911,7 @@ int msm_vidc_set_layer_count_and_type(void *instance, hfi_layer_count = inst->capabilities[ENH_LAYER_COUNT].value + 1; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_layer_count, sizeof(u32), __func__); + &hfi_layer_count, sizeof(u32), __func__); if (rc) goto exit; @@ -2956,7 +2920,7 @@ exit: } int msm_vidc_set_gop_size(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -2974,7 +2938,7 @@ int msm_vidc_set_gop_size(void *instance, hfi_value = inst->capabilities[GOP_SIZE].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -2982,7 +2946,7 @@ int msm_vidc_set_gop_size(void *instance, } int msm_vidc_set_bitrate(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3004,7 +2968,7 @@ int msm_vidc_set_bitrate(void *instance, set_total_bitrate: hfi_value = inst->capabilities[BIT_RATE].value; rc = msm_vidc_packetize_control(inst, BIT_RATE, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3012,7 +2976,7 @@ set_total_bitrate: } int msm_vidc_set_layer_bitrate(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3034,7 +2998,7 @@ int msm_vidc_set_layer_bitrate(void *instance, * layer encoding is enabled during streamon. */ if (!inst->capabilities[ENH_LAYER_COUNT].max || - !msm_vidc_check_all_layer_bitrate_set(inst)) { + !msm_vidc_check_all_layer_bitrate_set(inst)) { i_vpr_h(inst, "%s: invalid layer bitrate, ignore setting to fw\n", __func__); @@ -3047,7 +3011,7 @@ int msm_vidc_set_layer_bitrate(void *instance, */ hfi_value = inst->capabilities[BIT_RATE].value; rc = msm_vidc_packetize_control(inst, BIT_RATE, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3055,7 +3019,7 @@ int msm_vidc_set_layer_bitrate(void *instance, } int msm_vidc_set_session_priority(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; u32 hfi_value = 0; @@ -3067,7 +3031,7 @@ int msm_vidc_set_session_priority(void *instance, inst->capabilities[FIRMWARE_PRIORITY_OFFSET].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3075,7 +3039,7 @@ int msm_vidc_set_session_priority(void *instance, } int msm_vidc_set_flip(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; u32 hflip, vflip, hfi_value = HFI_DISABLE_FLIP; @@ -3093,14 +3057,14 @@ int msm_vidc_set_flip(void *instance, if (inst->bufq[OUTPUT_PORT].vb2q->streaming) { if (hfi_value != HFI_DISABLE_FLIP) { rc = msm_vidc_set_req_sync_frame(inst, - REQUEST_I_FRAME); + REQUEST_I_FRAME); if (rc) return rc; } } rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3108,14 +3072,14 @@ int msm_vidc_set_flip(void *instance, } int msm_vidc_set_preprocess(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; u32 hfi_value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3123,7 +3087,7 @@ int msm_vidc_set_preprocess(void *instance, } int msm_vidc_set_rotation(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3134,7 +3098,7 @@ int msm_vidc_set_rotation(void *instance, return -EINVAL; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3142,7 +3106,7 @@ int msm_vidc_set_rotation(void *instance, } int msm_vidc_set_blur_resolution(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3150,7 +3114,7 @@ int msm_vidc_set_blur_resolution(void *instance, u32 hfi_value, blur_width, blur_height; if (msm_vidc_get_parent_value(inst, cap_id, - BLUR_TYPES, &blur_type, __func__)) + BLUR_TYPES, &blur_type, __func__)) return -EINVAL; if (blur_type != MSM_VIDC_BLUR_EXTERNAL) @@ -3162,7 +3126,7 @@ int msm_vidc_set_blur_resolution(void *instance, blur_height = hfi_value & 0xFFFF; if (blur_width > inst->crop.width || - blur_height > inst->crop.height) { + blur_height > inst->crop.height) { i_vpr_e(inst, "%s: blur wxh: %dx%d exceeds crop wxh: %dx%d\n", __func__, blur_width, blur_height, @@ -3171,7 +3135,7 @@ int msm_vidc_set_blur_resolution(void *instance, } if (blur_width == inst->crop.width && - blur_height == inst->crop.height) { + blur_height == inst->crop.height) { i_vpr_e(inst, "%s: blur wxh: %dx%d is equal to crop wxh: %dx%d\n", __func__, blur_width, blur_height, @@ -3180,7 +3144,7 @@ int msm_vidc_set_blur_resolution(void *instance, } rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3188,7 +3152,7 @@ int msm_vidc_set_blur_resolution(void *instance, } static int msm_venc_set_csc_coeff(struct msm_vidc_inst *inst, - const char *prop_name, u32 hfi_id, void *payload, + const char *prop_name, u32 hfi_id, void *payload, u32 payload_size, u32 row_count, u32 column_count) { int rc = 0; @@ -3197,12 +3161,12 @@ static int msm_venc_set_csc_coeff(struct msm_vidc_inst *inst, "set cap: name: %24s, hard coded %dx%d matrix array\n", prop_name, row_count, column_count); rc = venus_hfi_session_property(inst, - hfi_id, - HFI_HOST_FLAGS_NONE, - HFI_PORT_BITSTREAM, - HFI_PAYLOAD_S32_ARRAY, - payload, - payload_size); + hfi_id, + HFI_HOST_FLAGS_NONE, + HFI_PORT_BITSTREAM, + HFI_PAYLOAD_S32_ARRAY, + payload, + payload_size); if (rc) { i_vpr_e(inst, "%s: failed to set %s to fw\n", @@ -3211,8 +3175,9 @@ static int msm_venc_set_csc_coeff(struct msm_vidc_inst *inst, return rc; } + int msm_vidc_set_csc_custom_matrix(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; int i; @@ -3227,7 +3192,7 @@ int msm_vidc_set_csc_custom_matrix(void *instance, csc_coeff = &core->platform->data.csc_data; if (!inst->capabilities[cap_id].value || - !inst->capabilities[CSC].value) { + !inst->capabilities[CSC].value) { i_vpr_h(inst, "%s: ignored as custom martix %u, csc %u\n", __func__, inst->capabilities[cap_id].value, @@ -3253,9 +3218,9 @@ int msm_vidc_set_csc_custom_matrix(void *instance, } rc = msm_venc_set_csc_coeff(inst, "CSC_CUSTOM_MATRIX", - HFI_PROP_CSC_MATRIX, &matrix_payload[0], - ARRAY_SIZE(matrix_payload) * sizeof(s32), - matrix_payload[0], matrix_payload[1]); + HFI_PROP_CSC_MATRIX, &matrix_payload[0], + ARRAY_SIZE(matrix_payload) * sizeof(s32), + matrix_payload[0], matrix_payload[1]); if (rc) return rc; @@ -3271,9 +3236,9 @@ int msm_vidc_set_csc_custom_matrix(void *instance, } rc = msm_venc_set_csc_coeff(inst, "CSC_BIAS", - HFI_PROP_CSC_BIAS, &csc_bias_payload[0], - ARRAY_SIZE(csc_bias_payload) * sizeof(s32), - csc_bias_payload[0], csc_bias_payload[1]); + HFI_PROP_CSC_BIAS, &csc_bias_payload[0], + ARRAY_SIZE(csc_bias_payload) * sizeof(s32), + csc_bias_payload[0], csc_bias_payload[1]); if (rc) return rc; @@ -3289,9 +3254,9 @@ int msm_vidc_set_csc_custom_matrix(void *instance, } rc = msm_venc_set_csc_coeff(inst, "CSC_LIMIT", - HFI_PROP_CSC_LIMIT, &csc_limit_payload[0], - ARRAY_SIZE(csc_limit_payload) * sizeof(s32), - csc_limit_payload[0], csc_limit_payload[1]); + HFI_PROP_CSC_LIMIT, &csc_limit_payload[0], + ARRAY_SIZE(csc_limit_payload) * sizeof(s32), + csc_limit_payload[0], csc_limit_payload[1]); if (rc) return rc; @@ -3299,7 +3264,7 @@ int msm_vidc_set_csc_custom_matrix(void *instance, } int msm_vidc_set_reserve_duration(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; u32 hfi_value = 0; @@ -3329,7 +3294,7 @@ int msm_vidc_set_reserve_duration(void *instance, } int msm_vidc_set_level(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3340,7 +3305,7 @@ int msm_vidc_set_level(void *instance, hfi_value = HFI_LEVEL_NONE; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3348,7 +3313,7 @@ int msm_vidc_set_level(void *instance, } int msm_vidc_set_q16(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3357,7 +3322,7 @@ int msm_vidc_set_q16(void *instance, hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_Q16, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3365,7 +3330,7 @@ int msm_vidc_set_q16(void *instance, } int msm_vidc_set_u32(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3380,7 +3345,7 @@ int msm_vidc_set_u32(void *instance, } rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3388,7 +3353,7 @@ int msm_vidc_set_u32(void *instance, } int msm_vidc_set_u32_packed(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3403,7 +3368,7 @@ int msm_vidc_set_u32_packed(void *instance, } rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3411,7 +3376,7 @@ int msm_vidc_set_u32_packed(void *instance, } int msm_vidc_set_u32_enum(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3422,7 +3387,7 @@ int msm_vidc_set_u32_enum(void *instance, return -EINVAL; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3430,7 +3395,7 @@ int msm_vidc_set_u32_enum(void *instance, } int msm_vidc_set_s32(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3439,7 +3404,7 @@ int msm_vidc_set_s32(void *instance, hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_S32, - &hfi_value, sizeof(s32), __func__); + &hfi_value, sizeof(s32), __func__); if (rc) return rc; @@ -3447,7 +3412,7 @@ int msm_vidc_set_s32(void *instance, } int msm_vidc_set_stage(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; u32 stage = 0; @@ -3465,7 +3430,7 @@ int msm_vidc_set_stage(void *instance, stage = inst->capabilities[STAGE].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &stage, sizeof(u32), __func__); + &stage, sizeof(u32), __func__); if (rc) return rc; @@ -3473,7 +3438,7 @@ int msm_vidc_set_stage(void *instance, } int msm_vidc_set_pipe(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; u32 pipe; @@ -3491,7 +3456,7 @@ int msm_vidc_set_pipe(void *instance, pipe = inst->capabilities[PIPE].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &pipe, sizeof(u32), __func__); + &pipe, sizeof(u32), __func__); if (rc) return rc; @@ -3499,7 +3464,7 @@ int msm_vidc_set_pipe(void *instance, } int msm_vidc_set_vui_timing_info(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -3516,7 +3481,7 @@ int msm_vidc_set_vui_timing_info(void *instance, hfi_value = 1; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3524,20 +3489,20 @@ int msm_vidc_set_vui_timing_info(void *instance, } int msm_vidc_set_outbuf_fence_type(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; u32 hfi_value; if (inst->capabilities[OUTBUF_FENCE_TYPE].value == - MSM_VIDC_FENCE_NONE) + MSM_VIDC_FENCE_NONE) return 0; hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -3545,20 +3510,20 @@ int msm_vidc_set_outbuf_fence_type(void *instance, } int msm_vidc_set_outbuf_fence_direction(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; u32 hfi_value; if (inst->capabilities[OUTBUF_FENCE_DIRECTION].value == - MSM_VIDC_FENCE_DIR_NONE) + MSM_VIDC_FENCE_DIR_NONE) return 0; hfi_value = inst->capabilities[cap_id].value; rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_U32_ENUM, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; diff --git a/driver/platform/common/src/msm_vidc_platform_ext.c b/driver/platform/common/src/msm_vidc_platform_ext.c index 3e14bb0b1a..82c9d07893 100644 --- a/driver/platform/common/src/msm_vidc_platform_ext.c +++ b/driver/platform/common/src/msm_vidc_platform_ext.c @@ -23,9 +23,9 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[IR_PERIOD].value; if (msm_vidc_get_parent_value(inst, IR_PERIOD, ALL_INTRA, - &all_intra, __func__) || + &all_intra, __func__) || msm_vidc_get_parent_value(inst, IR_PERIOD, META_ROI_INFO, - &roi_enable, __func__)) + &roi_enable, __func__)) return -EINVAL; if (all_intra) { @@ -45,7 +45,7 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl) if (inst->codec == MSM_VIDC_HEVC) { if (msm_vidc_get_parent_value(inst, IR_PERIOD, - PIX_FMTS, &pix_fmts, __func__)) + PIX_FMTS, &pix_fmts, __func__)) return -EINVAL; if (is_10bit_colorformat(pix_fmts)) { @@ -62,13 +62,12 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl) * Hence, do not return error if not specified as one of the parent. */ if (is_parent_available(inst, IR_PERIOD, BITRATE_MODE, __func__) && - inst->hfi_rc_type != HFI_RC_CBR_CFR && - inst->hfi_rc_type != HFI_RC_CBR_VFR) + inst->hfi_rc_type != HFI_RC_CBR_CFR && + inst->hfi_rc_type != HFI_RC_CBR_VFR) adjusted_value = 0; exit: - msm_vidc_update_cap_value(inst, IR_PERIOD, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, IR_PERIOD, adjusted_value, __func__); return 0; } @@ -114,25 +113,23 @@ int msm_vidc_adjust_delivery_mode(void *instance, struct v4l2_ctrl *ctrl) if (is_decode_session(inst)) return 0; - adjusted_value = ctrl ? ctrl->val : inst->capabilities[DELIVERY_MODE].value; if (msm_vidc_get_parent_value(inst, DELIVERY_MODE, SLICE_MODE, - &slice_mode, __func__)) + &slice_mode, __func__)) return -EINVAL; /* Slice encode delivery mode is only supported for Max MB slice mode */ if (slice_mode != V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) adjusted_value = 0; - msm_vidc_update_cap_value(inst, DELIVERY_MODE, - adjusted_value, __func__); + msm_vidc_update_cap_value(inst, DELIVERY_MODE, adjusted_value, __func__); return 0; } int msm_vidc_set_ir_period(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -169,7 +166,7 @@ int msm_vidc_set_ir_period(void *instance, } int msm_vidc_set_signal_color_info(void *instance, - enum msm_vidc_inst_capability_type cap_id) + enum msm_vidc_inst_capability_type cap_id) { int rc = 0; struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance; @@ -195,18 +192,18 @@ int msm_vidc_set_signal_color_info(void *instance, input_fmt = &inst->fmts[INPUT_PORT]; pix_fmt = v4l2_colorformat_to_driver(inst, - input_fmt->fmt.pix_mp.pixelformat, __func__); + input_fmt->fmt.pix_mp.pixelformat, __func__); if (primaries != V4L2_COLORSPACE_DEFAULT || matrix_coeff != V4L2_YCBCR_ENC_DEFAULT || transfer_char != V4L2_XFER_FUNC_DEFAULT) { colour_description_present_flag = 1; video_signal_type_present_flag = 1; primaries = v4l2_color_primaries_to_driver(inst, - primaries, __func__); + primaries, __func__); matrix_coeff = v4l2_matrix_coeff_to_driver(inst, - matrix_coeff, __func__); + matrix_coeff, __func__); transfer_char = v4l2_transfer_char_to_driver(inst, - transfer_char, __func__); + transfer_char, __func__); } else if (is_rgba_colorformat(pix_fmt)) { colour_description_present_flag = 1; video_signal_type_present_flag = 1; @@ -230,7 +227,7 @@ int msm_vidc_set_signal_color_info(void *instance, ((video_signal_type_present_flag << 29) & 0x20000000); rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED, - &hfi_value, sizeof(u32), __func__); + &hfi_value, sizeof(u32), __func__); if (rc) return rc; @@ -249,7 +246,7 @@ int msm_vidc_adjust_csc(void *instance, struct v4l2_ctrl *ctrl) adjusted_value = ctrl ? ctrl->val : inst->capabilities[CSC].value; if (msm_vidc_get_parent_value(inst, CSC, PIX_FMTS, - &pix_fmt, __func__)) + &pix_fmt, __func__)) return -EINVAL; /* disable csc for 10-bit encoding */