Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f723af16da8359cda47320001960609b0086082b

Authored by Hans Verkuil
Committed by Mauro Carvalho Chehab
1 parent 89ce2216e3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (8649): v4l2: add AAC bitrate control 

If you can select AAC as audio encoder, then you should also be
able to set the bitrate. Add this missing control.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 2 changed files with 5 additions and 1 deletions Side-by-side Diff

drivers/media/video/v4l2-common.c
Diff comments   View file @ f723af1
... ... @@ -386,6 +386,7 @@
386 386 case V4L2_CID_MPEG_AUDIO_L1_BITRATE: return "Audio Layer I Bitrate";
387 387 case V4L2_CID_MPEG_AUDIO_L2_BITRATE: return "Audio Layer II Bitrate";
388 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 390 case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: return "Audio AC-3 Bitrate";
390 391 case V4L2_CID_MPEG_AUDIO_MODE: return "Audio Stereo Mode";
391 392 case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension";
... ... @@ -548,6 +549,8 @@
548 549 V4L2_MPEG_AUDIO_L3_BITRATE_32K,
549 550 V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1,
550 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 554 case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
552 555 return v4l2_ctrl_query_fill(qctrl,
553 556 V4L2_MPEG_AUDIO_AC3_BITRATE_32K,
include/linux/videodev2.h
Diff comments   View file @ f723af1
... ... @@ -990,7 +990,8 @@
990 990 V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
991 991 };
992 992 #define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109)
993   -#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+110)
  993 +#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110)
  994 +#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111)
994 995 enum v4l2_mpeg_audio_ac3_bitrate {
995 996 V4L2_MPEG_AUDIO_AC3_BITRATE_32K = 0,
996 997 V4L2_MPEG_AUDIO_AC3_BITRATE_40K = 1,