Merge commit '563c068743d546b0bd232f8edc67a1546bf5ce40' into android12-base

* commit '563c068743d546b0bd232f8edc67a1546bf5ce40':
  msm: vidc: Update maximum supported slice count
  msm: vidc: Enable intra cyclic refresh

Change-Id: I995bb36aac93c8d458c1aaf025be966f6df829ee
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
UtsavBalar1231 2022-10-19 10:44:57 +05:30
commit ac3e058d5e
2 changed files with 4 additions and 4 deletions

View File

@ -3277,7 +3277,6 @@ int msm_venc_set_intra_refresh_mode(struct msm_vidc_inst *inst)
inst->rc_type == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR))
return 0;
/* Firmware supports only random mode */
intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_RANDOM);
@ -3296,6 +3295,7 @@ int msm_venc_set_intra_refresh_mode(struct msm_vidc_inst *inst)
} else {
ctrl = get_ctrl(inst,
V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB);
intra_refresh.mode = HFI_INTRA_REFRESH_CYCLIC;
intra_refresh.mbs = ctrl->val;
}
if (!intra_refresh.mbs) {

View File

@ -820,9 +820,9 @@ static struct msm_vidc_codec_capability kona_capabilities[] = {
{CAP_I_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 20},
{CAP_P_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 40},
{CAP_B_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 40},
/* 10 slices */
{CAP_SLICE_BYTE, ENC, H264|HEVC, 1, 10, 1, 10},
{CAP_SLICE_MB, ENC, H264|HEVC, 1, 10, 1, 10},
/* 128 slices */
{CAP_SLICE_BYTE, ENC, H264|HEVC, 1, 128, 1, 10},
{CAP_SLICE_MB, ENC, H264|HEVC, 1, 128, 1, 10},
{CAP_MAX_VIDEOCORES, DOMAINS_ALL, CODECS_ALL, 0, 1, 1, 1},
/* VP8 specific */