Commit 95140634 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: mpeg2-ctrls.h: move MPEG2 state controls to non-public header 



The MPEG2 state controls for the cedrus stateless MPEG2 driver are
not yet stable. Move them out of the public headers into media/mpeg2-ctrls.h.

Eventually, once this has stabilized, they will be moved back to the
public headers.

Unfortunately I had to cast the control type to a u32 in two switch
statements to prevent a compiler warning about a control type define
not being part of the enum.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent daa3fc44

drivers/media/v4l2-core/v4l2-ctrls.c

+2 −2
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx, 
	u64 offset;

	s64 val;



	switch (ctrl->type) {

	switch ((u32)ctrl->type) {

	case V4L2_CTRL_TYPE_INTEGER:

		return ROUND_TO_RANGE(ptr.p_s32[idx], u32, ctrl);

	case V4L2_CTRL_TYPE_INTEGER64:
@@ -2232,7 +2232,7 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, 
	is_array = nr_of_dims > 0;



	/* Prefill elem_size for all types handled by std_type_ops */

	switch (type) {

	switch ((u32)type) {

	case V4L2_CTRL_TYPE_INTEGER64:

		elem_size = sizeof(s64);

		break;

include/media/mpeg2-ctrls.h

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * These are the MPEG2 state controls for use with stateless MPEG-2

 * codec drivers.

 *

 * It turns out that these structs are not stable yet and will undergo

 * more changes. So keep them private until they are stable and ready to

 * become part of the official public API.

 */



#ifndef _MPEG2_CTRLS_H_

#define _MPEG2_CTRLS_H_



#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS		(V4L2_CID_MPEG_BASE+250)

#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION		(V4L2_CID_MPEG_BASE+251)



/* enum v4l2_ctrl_type type values */

#define V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS 0x0103

#define	V4L2_CTRL_TYPE_MPEG2_QUANTIZATION 0x0104



#define V4L2_MPEG2_PICTURE_CODING_TYPE_I	1

#define V4L2_MPEG2_PICTURE_CODING_TYPE_P	2

#define V4L2_MPEG2_PICTURE_CODING_TYPE_B	3

#define V4L2_MPEG2_PICTURE_CODING_TYPE_D	4



struct v4l2_mpeg2_sequence {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence header */

	__u16	horizontal_size;

	__u16	vertical_size;

	__u32	vbv_buffer_size;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence extension */

	__u8	profile_and_level_indication;

	__u8	progressive_sequence;

	__u8	chroma_format;

	__u8	pad;

};



struct v4l2_mpeg2_picture {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture header */

	__u8	picture_coding_type;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture coding extension */

	__u8	f_code[2][2];

	__u8	intra_dc_precision;

	__u8	picture_structure;

	__u8	top_field_first;

	__u8	frame_pred_frame_dct;

	__u8	concealment_motion_vectors;

	__u8	q_scale_type;

	__u8	intra_vlc_format;

	__u8	alternate_scan;

	__u8	repeat_first_field;

	__u8	progressive_frame;

	__u8	pad;

};



struct v4l2_ctrl_mpeg2_slice_params {

	__u32	bit_size;

	__u32	data_bit_offset;



	struct v4l2_mpeg2_sequence sequence;

	struct v4l2_mpeg2_picture picture;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Slice */

	__u8	quantiser_scale_code;



	__u8	backward_ref_index;

	__u8	forward_ref_index;

	__u8	pad;

};



struct v4l2_ctrl_mpeg2_quantization {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Quant matrix extension */

	__u8	load_intra_quantiser_matrix;

	__u8	load_non_intra_quantiser_matrix;

	__u8	load_chroma_intra_quantiser_matrix;

	__u8	load_chroma_non_intra_quantiser_matrix;



	__u8	intra_quantiser_matrix[64];

	__u8	non_intra_quantiser_matrix[64];

	__u8	chroma_intra_quantiser_matrix[64];

	__u8	chroma_non_intra_quantiser_matrix[64];

};



#endif

include/media/v4l2-ctrls.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 
#include <linux/videodev2.h>

#include <media/media-request.h>



/*

 * Include the mpeg2 stateless codec compound control definitions.

 * This will move to the public headers once this API is fully stable.

 */

#include <media/mpeg2-ctrls.h>



/* forward references */

struct file;

struct v4l2_ctrl_handler;

include/uapi/linux/v4l2-controls.h

+0 −68
Original line number Diff line number Diff line
@@ -404,9 +404,6 @@ enum v4l2_mpeg_video_multi_slice_mode { 
#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE		(V4L2_CID_MPEG_BASE+228)

#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME		(V4L2_CID_MPEG_BASE+229)



#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS		(V4L2_CID_MPEG_BASE+250)

#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION		(V4L2_CID_MPEG_BASE+251)



#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP		(V4L2_CID_MPEG_BASE+300)

#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP		(V4L2_CID_MPEG_BASE+301)

#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP		(V4L2_CID_MPEG_BASE+302)
@@ -1097,69 +1094,4 @@ enum v4l2_detect_md_mode { 
#define V4L2_CID_DETECT_MD_THRESHOLD_GRID	(V4L2_CID_DETECT_CLASS_BASE + 3)

#define V4L2_CID_DETECT_MD_REGION_GRID		(V4L2_CID_DETECT_CLASS_BASE + 4)



#define V4L2_MPEG2_PICTURE_CODING_TYPE_I	1

#define V4L2_MPEG2_PICTURE_CODING_TYPE_P	2

#define V4L2_MPEG2_PICTURE_CODING_TYPE_B	3

#define V4L2_MPEG2_PICTURE_CODING_TYPE_D	4



struct v4l2_mpeg2_sequence {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence header */

	__u16	horizontal_size;

	__u16	vertical_size;

	__u32	vbv_buffer_size;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence extension */

	__u8	profile_and_level_indication;

	__u8	progressive_sequence;

	__u8	chroma_format;

	__u8	pad;

};



struct v4l2_mpeg2_picture {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture header */

	__u8	picture_coding_type;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture coding extension */

	__u8	f_code[2][2];

	__u8	intra_dc_precision;

	__u8	picture_structure;

	__u8	top_field_first;

	__u8	frame_pred_frame_dct;

	__u8	concealment_motion_vectors;

	__u8	q_scale_type;

	__u8	intra_vlc_format;

	__u8	alternate_scan;

	__u8	repeat_first_field;

	__u8	progressive_frame;

	__u8	pad;

};



struct v4l2_ctrl_mpeg2_slice_params {

	__u32	bit_size;

	__u32	data_bit_offset;



	struct v4l2_mpeg2_sequence sequence;

	struct v4l2_mpeg2_picture picture;



	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Slice */

	__u8	quantiser_scale_code;



	__u8	backward_ref_index;

	__u8	forward_ref_index;

	__u8	pad;

};



struct v4l2_ctrl_mpeg2_quantization {

	/* ISO/IEC 13818-2, ITU-T Rec. H.262: Quant matrix extension */

	__u8	load_intra_quantiser_matrix;

	__u8	load_non_intra_quantiser_matrix;

	__u8	load_chroma_intra_quantiser_matrix;

	__u8	load_chroma_non_intra_quantiser_matrix;



	__u8	intra_quantiser_matrix[64];

	__u8	non_intra_quantiser_matrix[64];

	__u8	chroma_intra_quantiser_matrix[64];

	__u8	chroma_non_intra_quantiser_matrix[64];

};



#endif

include/uapi/linux/videodev2.h

+0 −4
Original line number Diff line number Diff line
@@ -1622,8 +1622,6 @@ struct v4l2_ext_control { 
		__u8 __user *p_u8;

		__u16 __user *p_u16;

		__u32 __user *p_u32;

		struct v4l2_ctrl_mpeg2_slice_params __user *p_mpeg2_slice_params;

		struct v4l2_ctrl_mpeg2_quantization __user *p_mpeg2_quantization;

		void __user *ptr;

	};

} __attribute__ ((packed));
@@ -1669,8 +1667,6 @@ enum v4l2_ctrl_type { 
	V4L2_CTRL_TYPE_U8	     = 0x0100,

	V4L2_CTRL_TYPE_U16	     = 0x0101,

	V4L2_CTRL_TYPE_U32	     = 0x0102,

	V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS = 0x0103,

	V4L2_CTRL_TYPE_MPEG2_QUANTIZATION = 0x0104,

};



/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */

CRA Git | Maintained and supported by SUSTech CRA and CCSE