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

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

Merge "[media] v4l2: Remove legacy extra-data for CC and AFD"

parents 63b519e5 62a4075a

include/uapi/linux/v4l2-controls.h

+10 −12
Original line number Diff line number Diff line
@@ -726,18 +726,16 @@ enum v4l2_mpeg_vidc_extradata { 
	V4L2_MPEG_VIDC_EXTRADATA_FRAME_RATE = 7,

	V4L2_MPEG_VIDC_EXTRADATA_PANSCAN_WINDOW = 8,

	V4L2_MPEG_VIDC_EXTRADATA_RECOVERY_POINT_SEI = 9,

	V4L2_MPEG_VIDC_EXTRADATA_CLOSED_CAPTION_UD = 10,

	V4L2_MPEG_VIDC_EXTRADATA_AFD_UD = 11,

	V4L2_MPEG_VIDC_EXTRADATA_MULTISLICE_INFO = 12,

	V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB = 13,

	V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER = 14,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_INPUT_CROP = 15,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_DIGITAL_ZOOM = 16,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO = 17,

	V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP = 18,

	V4L2_MPEG_VIDC_EXTRADATA_STREAM_USERDATA = 19,

	V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP = 20,

	V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO = 21,

	V4L2_MPEG_VIDC_EXTRADATA_MULTISLICE_INFO = 10,

	V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB = 11,

	V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER = 12,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_INPUT_CROP = 13,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_DIGITAL_ZOOM = 14,

	V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO = 15,

	V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP = 16,

	V4L2_MPEG_VIDC_EXTRADATA_STREAM_USERDATA = 17,

	V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP = 18,

	V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO = 19,

};



#define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26)