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

Commit 66f0f99b 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: Remove legacy enumeration"

parents ba2c4d19 54fa534f

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

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ int create_pkt_cmd_session_set_property( 
			&pkt->rg_property_data[1];

		hfi->enable = extra->enable;

		if (extra->index == HAL_EXTRADATA_ASPECT_RATIO)

			index = EXTRADATA_ASPECT_RATIO;

			index = MSM_VIDC_EXTRADATA_ASPECT_RATIO;

		else

			index = get_hfi_extradata_index(extra->index);

		if (index)

include/media/msm_vidc.h

+0 −30
Original line number Diff line number Diff line
@@ -97,24 +97,6 @@ struct msm_vidc_panscan_window_payload { 
	unsigned int num_panscan_windows;

	struct msm_vidc_panscan_window wnd[1];

};

enum msm_vidc_extradata_type_ { /* Legacy enumeration */

	EXTRADATA_NONE = 0x00000000,

	EXTRADATA_MB_QUANTIZATION = 0x00000001,

	EXTRADATA_INTERLACE_VIDEO = 0x00000002,

	EXTRADATA_VC1_FRAMEDISP = 0x00000003,

	EXTRADATA_VC1_SEQDISP = 0x00000004,

	EXTRADATA_TIMESTAMP = 0x00000005,

	EXTRADATA_S3D_FRAME_PACKING = 0x00000006,

	EXTRADATA_FRAME_RATE = 0x00000007,

	EXTRADATA_PANSCAN_WINDOW = 0x00000008,

	EXTRADATA_RECOVERY_POINT_SEI = 0x00000009,

	EXTRADATA_MPEG2_SEQDISP = 0x0000000D,

	EXTRADATA_MULTISLICE_INFO = 0x7F100000,

	EXTRADATA_NUM_CONCEALED_MB = 0x7F100001,

	EXTRADATA_INDEX = 0x7F100002,

	EXTRADATA_ASPECT_RATIO = 0x7F100003,

	EXTRADATA_METADATA_FILLER = 0x7FE00002,

};

enum msm_vidc_extradata_type {

	MSM_VIDC_EXTRADATA_NONE = 0x00000000,

	MSM_VIDC_EXTRADATA_MB_QUANTIZATION = 0x00000001,
@@ -133,13 +115,6 @@ enum msm_vidc_extradata_type { 
	MSM_VIDC_EXTRADATA_ASPECT_RATIO = 0x7F100003,

	MSM_VIDC_EXTRADATA_METADATA_FILLER = 0x7FE00002,

};

enum msm_vidc_interlace_type_ { /* Legacy enumeration */

	INTERLACE_FRAME_PROGRESSIVE = 0x01,

	INTERLACE_INTERLEAVE_FRAME_TOPFIELDFIRST = 0x02,

	INTERLACE_INTERLEAVE_FRAME_BOTTOMFIELDFIRST = 0x04,

	INTERLACE_FRAME_TOPFIELDFIRST = 0x08,

	INTERLACE_FRAME_BOTTOMFIELDFIRST = 0x10,

};

enum msm_vidc_interlace_type {

	MSM_VIDC_INTERLACE_FRAME_PROGRESSIVE = 0x01,

	MSM_VIDC_INTERLACE_INTERLEAVE_FRAME_TOPFIELDFIRST = 0x02,
@@ -147,11 +122,6 @@ enum msm_vidc_interlace_type { 
	MSM_VIDC_INTERLACE_FRAME_TOPFIELDFIRST = 0x08,

	MSM_VIDC_INTERLACE_FRAME_BOTTOMFIELDFIRST = 0x10,

};

enum msm_vidc_recovery_sei_ { /* Legacy enumeration */

	FRAME_RECONSTRUCTION_INCORRECT = 0x0,

	FRAME_RECONSTRUCTION_CORRECT = 0x01,

	FRAME_RECONSTRUCTION_APPROXIMATELY_CORRECT = 0x02,

};

enum msm_vidc_recovery_sei {

	MSM_VIDC_FRAME_RECONSTRUCTION_INCORRECT = 0x0,

	MSM_VIDC_FRAME_RECONSTRUCTION_CORRECT = 0x01,