diff options
Diffstat (limited to 'drivers/media/video/v4l2-common.c')
-rw-r--r-- | drivers/media/video/v4l2-common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 0c511839f7ee..20c3be8617ea 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -386,6 +386,7 @@ const char *v4l2_ctrl_get_name(u32 id) | |||
386 | case V4L2_CID_MPEG_AUDIO_L1_BITRATE: return "Audio Layer I Bitrate"; | 386 | case V4L2_CID_MPEG_AUDIO_L1_BITRATE: return "Audio Layer I Bitrate"; |
387 | case V4L2_CID_MPEG_AUDIO_L2_BITRATE: return "Audio Layer II Bitrate"; | 387 | case V4L2_CID_MPEG_AUDIO_L2_BITRATE: return "Audio Layer II Bitrate"; |
388 | case V4L2_CID_MPEG_AUDIO_L3_BITRATE: return "Audio Layer III Bitrate"; | 388 | case V4L2_CID_MPEG_AUDIO_L3_BITRATE: return "Audio Layer III Bitrate"; |
389 | case V4L2_CID_MPEG_AUDIO_AAC_BITRATE: return "Audio AAC Bitrate"; | ||
389 | case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: return "Audio AC-3 Bitrate"; | 390 | case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: return "Audio AC-3 Bitrate"; |
390 | case V4L2_CID_MPEG_AUDIO_MODE: return "Audio Stereo Mode"; | 391 | case V4L2_CID_MPEG_AUDIO_MODE: return "Audio Stereo Mode"; |
391 | case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension"; | 392 | case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension"; |
@@ -548,6 +549,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl) | |||
548 | V4L2_MPEG_AUDIO_L3_BITRATE_32K, | 549 | V4L2_MPEG_AUDIO_L3_BITRATE_32K, |
549 | V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1, | 550 | V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1, |
550 | V4L2_MPEG_AUDIO_L3_BITRATE_192K); | 551 | V4L2_MPEG_AUDIO_L3_BITRATE_192K); |
552 | case V4L2_CID_MPEG_AUDIO_AAC_BITRATE: | ||
553 | return v4l2_ctrl_query_fill(qctrl, 0, 6400, 1, 3200000); | ||
551 | case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: | 554 | case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: |
552 | return v4l2_ctrl_query_fill(qctrl, | 555 | return v4l2_ctrl_query_fill(qctrl, |
553 | V4L2_MPEG_AUDIO_AC3_BITRATE_32K, | 556 | V4L2_MPEG_AUDIO_AC3_BITRATE_32K, |