Merge ea1ec63548943fedd3a1f8f8f7a9832c0fac5c51 on remote branch
Change-Id: I403a6286024e41a51cdeb27f4e9503a78e69fcb1
diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c
index 02c924a..5fc5bc6 100644
--- a/msm/vidc/msm_venc.c
+++ b/msm/vidc/msm_venc.c
@@ -3277,7 +3277,6 @@
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 @@
} 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) {
diff --git a/msm/vidc/msm_vidc_platform.c b/msm/vidc/msm_vidc_platform.c
index 90a63ec..4da338b 100644
--- a/msm/vidc/msm_vidc_platform.c
+++ b/msm/vidc/msm_vidc_platform.c
@@ -820,9 +820,9 @@
{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 */