samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "video: driver: add picture type for decoder"

Browse Source
This commit is contained in:
qctecmdr
2021-03-10 19:16:33 -08:00
committed by Gerrit - the friendly Code Review server
parent ccb6da7567 d102315942
commit 0cdf5e607e
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
driver/vidc/src/msm_vdec.c
View File

@@ -61,6 +61,7 @@ static const u32 msm_vdec_input_subscribe_for_properties[] = {
static const u32 msm_vdec_output_subscribe_for_properties[] = {
HFI_PROP_WORST_COMPRESSION_RATIO,
HFI_PROP_WORST_COMPLEXITY_FACTOR,
HFI_PROP_PICTURE_TYPE,
};
static const u32 msm_vdec_internal_buffer_type[] = {
@@ -1067,14 +1068,12 @@ static int msm_vdec_subscribe_property(struct msm_vidc_inst *inst,
payload[i + 1] = msm_vdec_input_subscribe_for_properties[i];
payload_size = (ARRAY_SIZE(msm_vdec_input_subscribe_for_properties) + 1) *
sizeof(u32);
}
else if (port == OUTPUT_PORT) {
} else if (port == OUTPUT_PORT) {
for (i = 0; i < ARRAY_SIZE(msm_vdec_output_subscribe_for_properties); i++)
payload[i + 1] = msm_vdec_output_subscribe_for_properties[i];
payload_size = (ARRAY_SIZE(msm_vdec_output_subscribe_for_properties) + 1) *
sizeof(u32);
}
else {
} else {
i_vpr_e(inst, "%s: invalid port: %d\n", __func__, port);
return -EINVAL;
}

7
driver/vidc/src/venus_hfi_response.c
View File

@@ -1236,13 +1236,6 @@ static int handle_session_property(struct msm_vidc_inst *inst,
inst->subcr_params[port].tier = payload_ptr[0];
break;
case HFI_PROP_PICTURE_TYPE:
if (is_encode_session(inst) && port == INPUT_PORT) {
rc = -EINVAL;
i_vpr_e(inst,
"%s: invalid port: %d for property %#x\n",
__func__, pkt->port, pkt->type);
break;
}
inst->hfi_frame_info.picture_type = payload_ptr[0];
break;
case HFI_PROP_NO_OUTPUT: