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-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: support dynamic blur info config"

Browse source
This commit is contained in:
qctecmdr 2019-05-18 14:42:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0eeafb9f0d
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
msm/vidc/msm_venc.c
View file

@ -1717,6 +1717,15 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl)
return -EINVAL;
}
break;
case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_DIMENSIONS:
if (inst->state == MSM_VIDC_START_DONE) {
rc = msm_venc_set_blur_resolution(inst);
if (rc)
dprintk(VIDC_ERR,
"%s: set blur resolution failed\n",
__func__);
}
break;
case V4L2_CID_MPEG_VIDC_VIDEO_HEVC_MAX_HIER_CODING_LAYER:
case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE:
case V4L2_CID_ROTATE:
@ -1747,7 +1756,6 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl)
case V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD:
case V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH:
case V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT:
case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_DIMENSIONS:
case V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY:
case V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_RANDOM:
case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:
@ -3840,8 +3848,6 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst)
codec = get_v4l2_codec(inst);
if (inst->prop.extradata_ctrls == EXTRADATA_NONE) {
// Disable all Extradata
msm_comm_set_index_extradata(inst,
MSM_VIDC_EXTRADATA_ASPECT_RATIO, 0x0);
msm_comm_set_extradata(inst,
HFI_PROPERTY_PARAM_VENC_LTR_INFO, 0x0);
msm_comm_set_extradata(inst,

1
msm/vidc/msm_venc.h
View file

@ -37,4 +37,5 @@ int msm_venc_set_hp_max_layer(struct msm_vidc_inst *inst);
int msm_venc_set_hp_layer(struct msm_vidc_inst *inst);
int msm_venc_set_base_layer_priority_id(struct msm_vidc_inst *inst);
int msm_venc_set_lossless(struct msm_vidc_inst *inst);
int msm_venc_set_blur_resolution(struct msm_vidc_inst *inst);
#endif