lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: vidc: Update num_ref calc and limit max_layer"

Browse Source
This commit is contained in:
qctecmdr 2020-12-05 10:32:17 -08:00 committed by Gerrit - the friendly Code Review server
commit bf4ebfcb5b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
msm/vidc/msm_venc.c
View File

@ -3810,6 +3810,12 @@ int msm_venc_set_hp_max_layer(struct msm_vidc_inst *inst)
__func__);
return rc;
}
if (!inst->hybrid_hp && max_layer->val > 4) {
update_ctrl(max_layer, 0, inst->sid);
s_vpr_h(inst->sid,
"%s: Hier-P requested beyond max capability\n", __func__);
return 0;
}
/*
* We send enhancement layer count to FW,

8
msm/vidc/msm_vidc_buffer_calculations.c
View File

@ -497,13 +497,13 @@ int msm_vidc_get_num_ref_frames(struct msm_vidc_inst *inst)
codec = get_v4l2_codec(inst);
/* LTR and B - frame not supported with hybrid HP */
if (inst->hybrid_hp)
num_ref = (max_layer->val - 1);
num_ref = max_layer->val >> 1;
else if (codec == V4L2_PIX_FMT_HEVC)
num_ref = ((max_layer->val + 1) / 2) + ltr_count;
else if ((codec == V4L2_PIX_FMT_H264) && (max_layer->val <= 4))
num_ref = ((1 << (max_layer->val - 1)) - 1) + ltr_count;
else if ((codec == V4L2_PIX_FMT_H264) && (max_layer->val < 4))
num_ref = (max_layer->val - 1) + ltr_count;
else
num_ref = ((max_layer->val + 1) / 2) + ltr_count;
num_ref = max_layer->val + ltr_count;
}
if (is_hier_b_session(inst)) {