samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

video: driver: remove cabac_session as PSC property

浏览代码 
remove HFI_PROP_CABAC_SESSION as PSC property.

Change-Id: Ib123f5576763221775a225f882bcc91685d16411
Signed-off-by: Darshana Patil <darshana@codeaurora.org>
这个提交包含在：
Darshana Patil
2021-01-25 19:16:52 -08:00
父节点 60b7435a4c
当前提交 d868af90db
共修改 3 个文件，包含 6 行新增和 18 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
driver/vidc/inc/msm_vidc_internal.h
查看文件

@@ -582,7 +582,6 @@ struct msm_vidc_subscription_params {
u32 bitstream_resolution;
u64 crop_offsets;
u32 bit_depth;
u32 cabac;
u32 coded_frames;
u32 fw_min_count;
u32 pic_order_cnt;

16
driver/vidc/src/msm_vdec.c
查看文件

@@ -23,7 +23,6 @@ u32 msm_vdec_subscribe_for_port_settings_change[] = {
HFI_PROP_BITSTREAM_RESOLUTION,
HFI_PROP_CROP_OFFSETS,
HFI_PROP_LUMA_CHROMA_BIT_DEPTH,
HFI_PROP_CABAC_SESSION,
HFI_PROP_CODED_FRAMES,
HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT,
HFI_PROP_PIC_ORDER_CNT_TYPE,
@@ -35,6 +34,7 @@ u32 msm_vdec_subscribe_for_port_settings_change[] = {
u32 msm_vdec_subscribe_for_properties[] = {
HFI_PROP_NO_OUTPUT,
HFI_PROP_CABAC_SESSION,
};
static int msm_vdec_codec_change(struct msm_vidc_inst *inst, u32 v4l2_codec)
@@ -197,7 +197,8 @@ static int msm_vdec_set_bit_depth(struct msm_vidc_inst *inst,
return rc;
}
//todo: enable when needed
/*
static int msm_vdec_set_cabac(struct msm_vidc_inst *inst,
enum msm_vidc_port_type port)
{
@@ -224,7 +225,7 @@ static int msm_vdec_set_cabac(struct msm_vidc_inst *inst,
return rc;
}
*/
static int msm_vdec_set_coded_frames(struct msm_vidc_inst *inst,
enum msm_vidc_port_type port)
{
@@ -967,9 +968,6 @@ static int msm_vdec_subscribe_input_port_settings_change(struct msm_vidc_inst *i
case HFI_PROP_LUMA_CHROMA_BIT_DEPTH:
rc = msm_vdec_set_bit_depth(inst, port);
break;
case HFI_PROP_CABAC_SESSION:
rc = msm_vdec_set_cabac(inst, port);
break;
case HFI_PROP_CODED_FRAMES:
rc = msm_vdec_set_coded_frames(inst, port);
break;
@@ -1201,7 +1199,6 @@ static int msm_vdec_update_properties(struct msm_vidc_inst *inst)
inst->capabilities->cap[PROFILE].value = subsc_params.profile;
inst->capabilities->cap[LEVEL].value = subsc_params.level;
inst->capabilities->cap[HEVC_TIER].value = subsc_params.tier;
inst->capabilities->cap[ENTROPY_MODE].value = subsc_params.cabac;
inst->capabilities->cap[POC].value = subsc_params.pic_order_cnt;
inst->capabilities->cap[BIT_DEPTH].value = subsc_params.bit_depth;
inst->capabilities->cap[CODED_FRAMES].value = subsc_params.coded_frames;
@@ -1417,11 +1414,6 @@ static int msm_vdec_subscribe_output_port_settings_change(struct msm_vidc_inst *
payload_size = sizeof(u32);
payload_type = HFI_PAYLOAD_U32;
break;
case HFI_PROP_CABAC_SESSION:
payload[0] = subsc_params.cabac;
payload_size = sizeof(u32);
payload_type = HFI_PAYLOAD_U32;
break;
case HFI_PROP_CODED_FRAMES:
payload[0] = subsc_params.coded_frames;
payload_size = sizeof(u32);

7
driver/vidc/src/venus_hfi_response.c
查看文件

@@ -19,10 +19,10 @@ void print_psc_properties(u32 tag, const char *str, struct msm_vidc_inst *inst,
return;
dprintk(tag, inst->sid,
"%s: resolution %d, crop offsets %lld, bit depth %d, cabac %d, coded frames %d "
"%s: resolution %#x, crop offsets %#llx, bit depth %d, coded frames %d "
"fw min count %d, poc %d, color info %d, profile %d, level %d, tier %d ",
str, subsc_params.bitstream_resolution, subsc_params.crop_offsets,
subsc_params.bit_depth, subsc_params.cabac, subsc_params.coded_frames,
subsc_params.bit_depth, subsc_params.coded_frames,
subsc_params.fw_min_count, subsc_params.pic_order_cnt,
subsc_params.color_info, subsc_params.profile, subsc_params.level,
subsc_params.tier);
@@ -900,9 +900,6 @@ static int handle_session_property(struct msm_vidc_inst *inst,
case HFI_PROP_LUMA_CHROMA_BIT_DEPTH:
inst->subcr_params[port].bit_depth = payload_ptr[0];
break;
case HFI_PROP_CABAC_SESSION:
inst->subcr_params[port].cabac = payload_ptr[0];
break;
case HFI_PROP_CODED_FRAMES:
inst->subcr_params[port].coded_frames = payload_ptr[0];
break;