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-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: Remove Picture Type Decode Driver Support"

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

44
msm/vidc/msm_vdec.c
View file

@ -82,20 +82,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
.default_value = V4L2_MPEG_MSM_VIDC_DISABLE,
.step = 1,
},
{
.id = V4L2_CID_MPEG_VIDC_VIDEO_PICTYPE_DEC_MODE,
.name = "Picture Type Decoding",
.type = V4L2_CTRL_TYPE_BITMASK,
.minimum = 0,
.maximum = (V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_I |
V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_P |
V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_B),
.default_value = (V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_I |
V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_P |
V4L2_MPEG_VIDC_VIDEO_PICTYPE_DECODE_B),
.step = 0,
.qmenu = NULL,
},
{
.id = V4L2_CID_MPEG_VIDC_VIDEO_SYNC_FRAME_DECODE,
.name = "Sync Frame Decode",
@ -854,7 +840,6 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl)
(msm_comm_v4l2_to_hfi(ctrl->id, ctrl->val) << 28);
break;
case V4L2_CID_MPEG_VIDC_VIDEO_DECODE_ORDER:
case V4L2_CID_MPEG_VIDC_VIDEO_PICTYPE_DEC_MODE:
case V4L2_CID_MPEG_VIDC_VIDEO_CONCEAL_COLOR_8BIT:
case V4L2_CID_MPEG_VIDC_VIDEO_CONCEAL_COLOR_10BIT:
break;
@ -1113,32 +1098,6 @@ int msm_vdec_set_output_order(struct msm_vidc_inst *inst)
return rc;
}
int msm_vdec_set_picture_type(struct msm_vidc_inst *inst)
{
int rc = 0;
struct hfi_device *hdev;
struct v4l2_ctrl *ctrl;
struct hfi_enable_picture enable_picture;
if (!inst || !inst->core) {
dprintk(VIDC_ERR, "%s: invalid params\n", __func__);
return -EINVAL;
}
hdev = inst->core->device;
ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_PICTYPE_DEC_MODE);
enable_picture.picture_type = ctrl->val;
dprintk(VIDC_DBG, "%s: %#x\n", __func__, enable_picture.picture_type);
rc = call_hfi_op(hdev, session_set_property, inst->session,
HFI_PROPERTY_PARAM_VDEC_PICTURE_TYPE_DECODE, &enable_picture,
sizeof(enable_picture));
if (rc)
dprintk(VIDC_ERR, "%s: set property failed\n", __func__);
return rc;
}
int msm_vdec_set_sync_frame_mode(struct msm_vidc_inst *inst)
{
int rc = 0;
@ -1462,9 +1421,6 @@ int msm_vdec_set_properties(struct msm_vidc_inst *inst)
if (rc)
goto exit;
rc = msm_vdec_set_output_order(inst);
if (rc)
goto exit;
rc = msm_vdec_set_picture_type(inst);
if (rc)
goto exit;
rc = msm_vdec_set_sync_frame_mode(inst);

4
msm/vidc/vidc_hfi.h
View file

@ -257,10 +257,6 @@ struct hfi_data_payload {
u8 rg_data[1];
};
struct hfi_enable_picture {
u32 picture_type;
};
struct hfi_mb_error_map {
u32 error_map_size;
u8 rg_error_map[1];