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

Commit 188919ac authored by Janne Grunau's avatar Janne Grunau Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8634): v4l2: extend MPEG Encoding API with AVC and AAC 



Adds Advanced Audio Coding (AAC) and MPEG-4 Advanced Video Coding
(AVC/H.264) as audio/video codecs to the extended controls API.
Updates cx2341x driver to the new values.

Signed-off-by: default avatarJanne Grunau <j@jannau.net>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a832781c

drivers/media/video/cx2341x.c

+4 −1
Original line number Diff line number Diff line
@@ -508,7 +508,10 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
		/* this setting is read-only for the cx2341x since the

		   V4L2_CID_MPEG_STREAM_TYPE really determines the

		   MPEG-1/2 setting */

		err = v4l2_ctrl_query_fill_std(qctrl);

		err = v4l2_ctrl_query_fill(qctrl,

					   V4L2_MPEG_VIDEO_ENCODING_MPEG_1,

					   V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,

					   V4L2_MPEG_VIDEO_ENCODING_MPEG_2);

		if (err == 0)

			qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

		return err;

drivers/media/video/v4l2-common.c

+8 −6
Original line number Diff line number Diff line
@@ -187,9 +187,10 @@ const char **v4l2_ctrl_get_menu(u32 id) 
		NULL

	};

	static const char *mpeg_audio_encoding[] = {

		"Layer I",

		"Layer II",

		"Layer III",

		"MPEG-1 Layer I",

		"MPEG-1 Layer II",

		"MPEG-1 Layer III",

		"MPEG-4 AAC",

		NULL

	};

	static const char *mpeg_audio_l1_bitrate[] = {
@@ -271,6 +272,7 @@ const char **v4l2_ctrl_get_menu(u32 id) 
	static const char *mpeg_video_encoding[] = {

		"MPEG-1",

		"MPEG-2",

		"MPEG-4 AVC",

		NULL

	};

	static const char *mpeg_video_aspect[] = {
@@ -358,7 +360,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste 
	/* MPEG controls */

	case V4L2_CID_MPEG_CLASS: 		name = "MPEG Encoder Controls"; break;

	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: name = "Audio Sampling Frequency"; break;

	case V4L2_CID_MPEG_AUDIO_ENCODING: 	name = "Audio Encoding Layer"; break;

	case V4L2_CID_MPEG_AUDIO_ENCODING: 	name = "Audio Encoding"; break;

	case V4L2_CID_MPEG_AUDIO_L1_BITRATE: 	name = "Audio Layer I Bitrate"; break;

	case V4L2_CID_MPEG_AUDIO_L2_BITRATE: 	name = "Audio Layer II Bitrate"; break;

	case V4L2_CID_MPEG_AUDIO_L3_BITRATE: 	name = "Audio Layer III Bitrate"; break;
@@ -493,7 +495,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl) 
	case V4L2_CID_MPEG_AUDIO_ENCODING:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_ENCODING_LAYER_1,

				V4L2_MPEG_AUDIO_ENCODING_LAYER_3, 1,

				V4L2_MPEG_AUDIO_ENCODING_AAC, 1,

				V4L2_MPEG_AUDIO_ENCODING_LAYER_2);

	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:

		return v4l2_ctrl_query_fill(qctrl,
@@ -535,7 +537,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl) 
	case V4L2_CID_MPEG_VIDEO_ENCODING:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_VIDEO_ENCODING_MPEG_1,

				V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,

				V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 1,

				V4L2_MPEG_VIDEO_ENCODING_MPEG_2);

	case V4L2_CID_MPEG_VIDEO_ASPECT:

		return v4l2_ctrl_query_fill(qctrl,

include/linux/videodev2.h

+4 −2
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ enum v4l2_mpeg_audio_encoding { 
	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,

	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,

	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,

	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,

};

#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)

enum v4l2_mpeg_audio_l1_bitrate {
@@ -994,6 +995,7 @@ enum v4l2_mpeg_audio_crc { 
enum v4l2_mpeg_video_encoding {

	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,

	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,

	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,

};

#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)

enum v4l2_mpeg_video_aspect {