Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc34bc2a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Avoid port reconfigure if pic struct remains same"

parents 0b81c503 eed4f964

drivers/media/platform/msm/vidc/hfi_response_handler.c

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -114,6 +114,9 @@ static int hfi_process_sess_evt_seq_changed(u32 device_id, 
	enum msm_vidc_pixel_depth luma_bit_depth, chroma_bit_depth;

	struct hfi_colour_space *colour_info;



	 /* Initialize pic_struct to unknown as default */

	event_notify.pic_struct = MSM_VIDC_PIC_STRUCT_UNKNOWN;



	if (sizeof(struct hfi_msg_event_notify_packet) > pkt->size) {

		dprintk(VIDC_ERR,

				"hal_process_session_init_done: bad_pkt_size\n");

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,7 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
	}



	if (inst->fmts[CAPTURE_PORT].fourcc == V4L2_PIX_FMT_NV12 &&

		event_notify->pic_struct != MSM_VIDC_PIC_STRUCT_UNKNOWN &&

		inst->pic_struct != event_notify->pic_struct) {

		inst->pic_struct = event_notify->pic_struct;

		event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

include/uapi/media/msm_vidc.h

+1 −0
Original line number Diff line number Diff line
@@ -372,5 +372,6 @@ enum msm_vidc_color_desc_flag { 
/*enum msm_vidc_pic_struct */

#define MSM_VIDC_PIC_STRUCT_MAYBE_INTERLACED 0x0

#define MSM_VIDC_PIC_STRUCT_PROGRESSIVE 0x1

#define MSM_VIDC_PIC_STRUCT_UNKNOWN 0XFFFFFFFF



#endif