A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: fix vp8 frame rate capabilities"

Browse source
This commit is contained in:
qctecmdr 2019-08-27 13:09:18 -07:00 • committed by Gerrit - the friendly Code Review server
commit e554b07b4a
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
msm/vidc/msm_venc.c
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,

4
msm/vidc/msm_vidc_platform.c
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},