diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 12:21:00 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 12:21:00 +0200 |
| commit | a938ca9971031bb3895c624e6bc26d92da85a960 (patch) | |
| tree | e375dd48ff1954d1dbcc688f349407871d338fd9 /linux/include | |
| parent | 387f6919b61c886b36fea9568a6ad6e0842c2e6f (diff) | |
| download | mediapointer-dvb-s2-a938ca9971031bb3895c624e6bc26d92da85a960.tar.gz mediapointer-dvb-s2-a938ca9971031bb3895c624e6bc26d92da85a960.tar.bz2 | |
v4l2: extend MPEG Encoding API with AVC and AAC
From: Janne Grunau <j@jannau.net>
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.
Priority: normal
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index f852028e7..c7f7f7d14 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -908,6 +908,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 { @@ -990,8 +991,9 @@ enum v4l2_mpeg_audio_crc { /* MPEG video */ #define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) enum v4l2_mpeg_video_encoding { - V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, - V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, + 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 { |