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

Commit 70a480ca 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: Deprecate vpe deinterlace property" into msm-4.9

parents 0c1d06c7 5a442045

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

+0 −8
Original line number Diff line number Diff line
@@ -1523,14 +1523,6 @@ int create_pkt_cmd_session_set_property( 
			sizeof(struct hfi_vui_timing_info);

		break;

	}

	case HAL_CONFIG_VPE_DEINTERLACE:

	{

		create_pkt_enable(pkt->rg_property_data,

				HFI_PROPERTY_CONFIG_VPE_DEINTERLACE,

				((struct hal_enable *)pdata)->enable);

		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

	}

	case HAL_PARAM_VENC_GENERATE_AUDNAL:

	{

		create_pkt_enable(pkt->rg_property_data,

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ enum hal_property { 
	HAL_CONFIG_VPE_OPERATIONS,

	HAL_PARAM_VENC_INTRA_REFRESH,

	HAL_PARAM_VENC_MULTI_SLICE_CONTROL,

	HAL_CONFIG_VPE_DEINTERLACE,

	HAL_SYS_DEBUG_CONFIG,

	HAL_CONFIG_BUFFER_REQUIREMENTS,

	HAL_CONFIG_PRIORITY,

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+0 −2
Original line number Diff line number Diff line
@@ -349,8 +349,6 @@ struct hfi_buffer_info { 
	(HFI_DOMAIN_BASE_VPE + HFI_ARCH_COMMON_OFFSET + 0x8000)

#define  HFI_PROPERTY_CONFIG_VENC_BLUR_FRAME_SIZE		\

	(HFI_PROPERTY_CONFIG_COMMON_START + 0x010)

#define HFI_PROPERTY_CONFIG_VPE_DEINTERLACE				\

	(HFI_PROPERTY_CONFIG_VPE_COMMON_START + 0x001)

#define HFI_PROPERTY_CONFIG_VPE_OPERATIONS				\

	(HFI_PROPERTY_CONFIG_VPE_COMMON_START + 0x002)