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

Merge "msm: vidc: Provide default profile type in s_fmt"

Browse Source
This commit is contained in:
qctecmdr 2019-06-11 16:25:15 -07:00 committed by Gerrit - the friendly Code Review server
commit c8babda925
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
msm/vidc/msm_venc.c
View File

@ -1249,6 +1249,15 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f)
mplane->width = f->fmt.pix_mp.width;
mplane->height = f->fmt.pix_mp.height;
mplane->pixelformat = f->fmt.pix_mp.pixelformat;
if (!inst->profile) {
rc = msm_venc_set_default_profile(inst);
if (rc) {
dprintk(VIDC_ERR, "%s: Failed to set default profile type\n", __func__);
goto exit;
}
}
rc = msm_comm_try_state(inst, MSM_VIDC_OPEN_DONE);
if (rc) {
dprintk(VIDC_ERR, "Failed to open instance\n");
@ -1327,6 +1336,26 @@ exit:
return rc;
}
int msm_venc_set_default_profile(struct msm_vidc_inst *inst)
{
if (!inst) {
dprintk(VIDC_ERR,
"%s: invalid params\n", __func__);
return -EINVAL;
}
if (get_v4l2_codec(inst) == V4L2_PIX_FMT_HEVC)
inst->profile = HFI_HEVC_PROFILE_MAIN;
else if (get_v4l2_codec(inst) == V4L2_PIX_FMT_VP8)
inst->profile = HFI_VP8_PROFILE_MAIN;
else if (get_v4l2_codec(inst) == V4L2_PIX_FMT_H264)
inst->profile = HFI_H264_PROFILE_HIGH;
else
dprintk(VIDC_ERR,
"%s: Invalid codec type %#x\n", __func__, get_v4l2_codec(inst));
return 0;
}
int msm_venc_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f)
{
struct v4l2_format *fmt;

1
msm/vidc/msm_venc.h
View File

@ -18,6 +18,7 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst,
struct v4l2_format *f);
int msm_venc_g_fmt(struct msm_vidc_inst *inst,
struct v4l2_format *f);
int msm_venc_set_default_profile(struct msm_vidc_inst *inst);
int msm_venc_s_ctrl(struct msm_vidc_inst *inst,
struct v4l2_ctrl *ctrl);
int msm_venc_set_properties(struct msm_vidc_inst *inst);