From 706c47da7718ebf0e9af77ea555d427de3ecfc1e Mon Sep 17 00:00:00 2001 From: Akshata Sahukar Date: Tue, 14 May 2019 14:03:42 -0700 Subject: [PATCH] msm: vidc: Remove Picture Type Decode Driver Support Remove support for V4L2_CID_MPEG_VIDC_VIDEO_PICTYPE_DEC_MODE. Cleared related code. Change-Id: I3b7100dfd08ee68a5033d8f6ec2cfdcfbbfbbe14 Signed-off-by: Akshata Sahukar --- msm/vidc/msm_vdec.c | 44 -------------------------------------------- msm/vidc/vidc_hfi.h | 4 ---- 2 files changed, 48 deletions(-) diff --git a/msm/vidc/msm_vdec.c b/msm/vidc/msm_vdec.c index 45a4774ba6a7..b2b35cc202ac 100644 --- a/msm/vidc/msm_vdec.c +++ b/msm/vidc/msm_vdec.c @@ -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); diff --git a/msm/vidc/vidc_hfi.h b/msm/vidc/vidc_hfi.h index d3ab844a2499..11b39cfb3430 100644 --- a/msm/vidc/vidc_hfi.h +++ b/msm/vidc/vidc_hfi.h @@ -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];