From 9abcce52a62ed28c3e3a5b7c05565383c1f4fa39 Mon Sep 17 00:00:00 2001 From: Priyanka Gujjula Date: Wed, 17 Jul 2019 15:32:03 +0530 Subject: [PATCH] msm: vidc: remove key frame flag usage from ebd Remove HAL_BUFFERFLAG_SYNCFRAME flag usage support from hfi_msg_session_empty_buffer_done_packet and its corresponding usage in handle_ebd. Change-Id: I2dafd35a462a443e6efa165cbf46d4b78833c765 Signed-off-by: Priyanka Gujjula --- msm/vidc/hfi_response_handler.c | 17 +---------------- msm/vidc/msm_vidc_common.c | 2 -- msm/vidc/vidc_hfi.h | 1 + msm/vidc/vidc_hfi_helper.h | 4 ---- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/msm/vidc/hfi_response_handler.c b/msm/vidc/hfi_response_handler.c index 5c376a4cfa69..b6bef94a5e11 100644 --- a/msm/vidc/hfi_response_handler.c +++ b/msm/vidc/hfi_response_handler.c @@ -767,8 +767,6 @@ static int hfi_process_session_etb_done(u32 device_id, { struct hfi_msg_session_empty_buffer_done_packet *pkt = _pkt; struct msm_vidc_cb_data_done data_done = {0}; - struct hfi_picture_type *hfi_picture_type = NULL; - u32 is_sync_frame; dprintk(VIDC_LOW, "RECEIVED: SESSION_ETB_DONE[%#x]\n", pkt->session_id); @@ -790,24 +788,11 @@ static int hfi_process_session_etb_done(u32 device_id, pkt->ubwc_cr_stats.complexity_number; data_done.input_done.offset = pkt->offset; data_done.input_done.filled_len = pkt->filled_len; + data_done.input_done.flags = pkt->flags; data_done.input_done.packet_buffer = pkt->packet_buffer; data_done.input_done.extra_data_buffer = pkt->extra_data_buffer; data_done.input_done.status = hfi_map_err_status(pkt->error_type); - is_sync_frame = pkt->rgData[0]; - if (is_sync_frame) { - if (pkt->size < - sizeof(struct hfi_msg_session_empty_buffer_done_packet) - + sizeof(struct hfi_picture_type)) - goto bad_packet_size; - hfi_picture_type = (struct hfi_picture_type *)&pkt->rgData[1]; - if (hfi_picture_type->picture_type) - data_done.input_done.flags = - hfi_picture_type->picture_type; - else - dprintk(VIDC_LOW, - "Non-Sync frame sent for H264/HEVC\n"); - } trace_msm_v4l2_vidc_buffer_event_end("ETB", (u32)pkt->packet_buffer, -1, -1, diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index 0ced7f4cfb48..d5fd1c6e1b66 100644 --- a/msm/vidc/msm_vidc_common.c +++ b/msm/vidc/msm_vidc_common.c @@ -2521,8 +2521,6 @@ static void handle_ebd(enum hal_command_response cmd, void *data) dprintk(VIDC_LOW, "Failed : Corrupted input stream\n"); mbuf->vvb.flags |= V4L2_BUF_FLAG_DATA_CORRUPT; } - if (empty_buf_done->flags & HAL_BUFFERFLAG_SYNCFRAME) - mbuf->vvb.flags |= V4L2_BUF_FLAG_KEYFRAME; f = &inst->fmts[INPUT_PORT].v4l2_fmt; if (f->fmt.pix_mp.num_planes > 1) diff --git a/msm/vidc/vidc_hfi.h b/msm/vidc/vidc_hfi.h index bd26af04cf1a..24be24e061c3 100644 --- a/msm/vidc/vidc_hfi.h +++ b/msm/vidc/vidc_hfi.h @@ -589,6 +589,7 @@ struct hfi_msg_session_empty_buffer_done_packet { u32 extra_data_buffer; u32 flags; struct hfi_frame_cr_stats_type ubwc_cr_stats; + /* no usage of sync_frame flag in EBD, rgData[1] is not used */ u32 rgData[1]; }; diff --git a/msm/vidc/vidc_hfi_helper.h b/msm/vidc/vidc_hfi_helper.h index 859ab24a9c7e..05f00250726b 100644 --- a/msm/vidc/vidc_hfi_helper.h +++ b/msm/vidc/vidc_hfi_helper.h @@ -658,10 +658,6 @@ struct hfi_bit_depth { u32 bit_depth; }; -struct hfi_picture_type { - u32 picture_type; -}; - /* Base Offset for UBWC color formats */ #define HFI_COLOR_FORMAT_UBWC_BASE (0x8000) /* Base Offset for 10-bit color formats */