diff options
Diffstat (limited to 'include/linux/videodev2.h')
| -rw-r--r-- | include/linux/videodev2.h | 30 | 
1 files changed, 28 insertions, 2 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 303d93ffd6b..d4b03034ee7 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -910,6 +910,8 @@ 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, +	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,  };  #define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)  enum v4l2_mpeg_audio_l1_bitrate { @@ -988,12 +990,36 @@ enum v4l2_mpeg_audio_crc {  	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,  };  #define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109) +#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110) +#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111) +enum v4l2_mpeg_audio_ac3_bitrate { +	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0, +	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1, +	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2, +	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3, +	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4, +	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5, +	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6, +	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7, +	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8, +	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9, +	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10, +	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11, +	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12, +	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13, +	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14, +	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15, +	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16, +	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17, +	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18, +};  /*  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 {  |