diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-24 08:28:10 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-24 08:28:10 -0600 |
commit | 5716f3e6f0bc5e5cbe04198923a5cdd8b6e89b3c (patch) | |
tree | a14e7c416bc79a4f46676eb4469f21b977c9f046 /nuttx/audio | |
parent | d01e4f9d601e86759fdec1832f9326159f1005e2 (diff) | |
download | px4-nuttx-5716f3e6f0bc5e5cbe04198923a5cdd8b6e89b3c.tar.gz px4-nuttx-5716f3e6f0bc5e5cbe04198923a5cdd8b6e89b3c.tar.bz2 px4-nuttx-5716f3e6f0bc5e5cbe04198923a5cdd8b6e89b3c.zip |
Audio: Add hooks for fast-forward and rewind needed by CMediaPlayer; add hooks for equalizer settings needed by the WM8904
Diffstat (limited to 'nuttx/audio')
-rw-r--r-- | nuttx/audio/Kconfig | 46 | ||||
-rw-r--r-- | nuttx/audio/audio.c | 4 |
2 files changed, 42 insertions, 8 deletions
diff --git a/nuttx/audio/Kconfig b/nuttx/audio/Kconfig index ef4bfe779..e68e82882 100644 --- a/nuttx/audio/Kconfig +++ b/nuttx/audio/Kconfig @@ -20,6 +20,8 @@ config AUDIO_MULTI_SESSION Selecting this feature adds support for tracking multiple concurrent sessions with the lower-level audio devices. +menu "Audio Buffer Configuration" + config AUDIO_LARGE_BUFFERS bool "Support Audio Buffers with greater than 65K samples" default n @@ -56,6 +58,8 @@ config AUDIO_DRIVER_SPECIFIC_BUFFERS adds extra code which allows the lower-level audio device to specify a partucular size and number of buffers. +endmenu # Audio Buffer Configuration + menu "Supported Audio Formats" config AUDIO_FORMAT_AC3 @@ -116,11 +120,28 @@ config AUDIO_EXCLUDE_BALANCE ---help--- Exclude building support for changing the balance. +config AUDIO_EXCLUDE_EQUALIZER + bool "Exclude equalizer controls" + default y + ---help--- + Exclude building support for setting equalization. + +config AUDIO_EQUALIZER_NBANDS + int "Number of equalizer bands" + default 8 + depends on !AUDIO_EXCLUDE_EQUALIZER + ---help--- + If equalizer support is not excluded, then it will be necessary to + provide the (maximum) number of equalization bands to be supported. + config AUDIO_EXCLUDE_TONE bool "Exclude tone (bass and treble) controls" - default n + default y if !AUDIO_EXCLUDE_EQUALIZER + default n if AUDIO_EXCLUDE_EQUALIZER ---help--- - Exclude building support for changing the bass and treble. + Exclude building support for changing the bass and treble. Normally + you would not select both tone controls and equalizer support unless + your underlying hardware supports both options. config AUDIO_EXCLUDE_PAUSE_RESUME bool "Exclude pause and resume controls" @@ -137,11 +158,28 @@ config AUDIO_EXCLUDE_STOP default n ---help--- Exclude building support for stopping audio files once they are - submitted. If the sound system is being used to play short ssytem - notification or error type sounds that typicaly only last a second + submitted. If the sound system is being used to play short sytem + notification or error type sounds that typically only last a second or two, then there is no need (or chance) to stop the sound playback once it has started. +config AUDIO_EXCLUDE_FFORWARD + bool "Exclude fast forward controls" + default n if !AUDIO_EXCLUDE_STOP + default y if AUDIO_EXCLUDE_STOP + ---help--- + Exclude building support for fast forwarding through audio files + once they are submitted. Selecting this option would only make + if the underlying audio decoding logic is capable of sub-sampling + in the stream of audio data. + +config AUDIO_EXCLUDE_REWIND + bool "Exclude rewind controls" + default y + ---help--- + Rewind may be supported by some audio devices, but not the typical + device that receives a non-seekable, stream of audio buffers. + endmenu config AUDIO_CUSTOM_DEV_PATH diff --git a/nuttx/audio/audio.c b/nuttx/audio/audio.c index f5f815431..5ed2ab176 100644 --- a/nuttx/audio/audio.c +++ b/nuttx/audio/audio.c @@ -34,10 +34,6 @@ ****************************************************************************/ /**************************************************************************** - * Compilation Switches - ****************************************************************************/ - -/**************************************************************************** * Included Files ****************************************************************************/ |