msm: vidc: fix vp8 frame rate capabilities

Corrected VP8 frame rate capabilities for encoder
and decoder as per PRD.Added bframe ctrl capability
for VP8.Moved LTR count null check.

Signed-off-by: Darshana Patil <darshana@codeaurora.org>

Change-Id: I2111719e711d6bc67c2279d4c4fc6ef63215a5cb
This commit is contained in:
Darshana Patil 2019-08-26 16:03:16 -07:00
commit 736bca1b48
2 changed files with 5 additions and 3 deletions

View file

@ -3884,6 +3884,8 @@ int msm_venc_set_ltr_mode(struct msm_vidc_inst *inst)
}
hdev = inst->core->device;
ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT);
if (!ctrl->val)
return 0;
codec = get_v4l2_codec(inst);
if (!(codec == V4L2_PIX_FMT_HEVC || codec == V4L2_PIX_FMT_H264)) {
@ -3898,8 +3900,6 @@ int msm_venc_set_ltr_mode(struct msm_vidc_inst *inst)
goto disable_ltr;
}
if (!ctrl->val)
return 0;
if (ctrl->val > inst->capability.cap[CAP_LTR_COUNT].max) {
dprintk(VIDC_ERR, "%s: invalid ltr count %d, max %d\n",
__func__, ctrl->val,

View file

@ -325,7 +325,9 @@ static struct msm_vidc_codec_capability kona_capabilities[] = {
{CAP_MBS_PER_FRAME, ENC|DEC, VP8, 64, 36864, 1, 8160},
/* ((4096 * 2304) / 256) * 120 */
{CAP_MBS_PER_SECOND, ENC|DEC, VP8, 64, 4423680, 1, 244800},
{CAP_FRAMERATE, ENC|DEC, VP8, 1, 120, 1, 30},
{CAP_BFRAME, ENC, VP8, 0, 0, 1, 0},
{CAP_FRAMERATE, ENC, VP8, 1, 60, 1, 30},
{CAP_FRAMERATE, DEC, VP8, 1, 120, 1, 30},
{CAP_BITRATE, ENC, VP8, 1, 74000000, 1, 20000000},
{CAP_BITRATE, DEC, VP8, 1, 220000000, 1, 20000000},