diff options
author | Eric Laurent <elaurent@google.com> | 2011-06-16 22:17:17 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2011-07-05 14:40:24 -0700 |
commit | 88482dc964d975e7eadfd43f5e7dae04886e7b0d (patch) | |
tree | c32e495a040631fdc548c0b439de469cb28600ba /libaudio/AudioHardware.h | |
parent | cfb2e6cc33943975fd6a3bab1930899aa7ac37ac (diff) | |
download | device_samsung_crespo-88482dc964d975e7eadfd43f5e7dae04886e7b0d.zip device_samsung_crespo-88482dc964d975e7eadfd43f5e7dae04886e7b0d.tar.gz device_samsung_crespo-88482dc964d975e7eadfd43f5e7dae04886e7b0d.tar.bz2 |
Use tinyalsa library
Audio HAL now uses tinyalsa library to interface to alsa kernel drivers.
Removed local thin alsa user space implementation.
Also modified value of AUDIO_HW_IN_SAMPLERATE to match actual
sampling rate when reading from kernel pcm device.
Change-Id: Id0b2d166f3ab2f2291bf49b36c7085b21135ceea
Diffstat (limited to 'libaudio/AudioHardware.h')
-rw-r--r-- | libaudio/AudioHardware.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h index dc83921..3a8fdb9 100644 --- a/libaudio/AudioHardware.h +++ b/libaudio/AudioHardware.h @@ -53,23 +53,19 @@ namespace android_audio_legacy { // Default audio output sample format #define AUDIO_HW_OUT_FORMAT (AudioSystem::PCM_16_BIT) // Kernel pcm out buffer size in frames at 44.1kHz -#define AUDIO_HW_OUT_PERIOD_MULT 8 // (8 * 128 = 1024 frames) -#define AUDIO_HW_OUT_PERIOD_SZ (PCM_PERIOD_SZ_MIN * AUDIO_HW_OUT_PERIOD_MULT) +#define AUDIO_HW_OUT_PERIOD_SZ 1024 #define AUDIO_HW_OUT_PERIOD_CNT 4 // Default audio output buffer size in bytes #define AUDIO_HW_OUT_PERIOD_BYTES (AUDIO_HW_OUT_PERIOD_SZ * 2 * sizeof(int16_t)) // Default audio input sample rate -#define AUDIO_HW_IN_SAMPLERATE 8000 +#define AUDIO_HW_IN_SAMPLERATE 44100 // Default audio input channel mask #define AUDIO_HW_IN_CHANNELS (AudioSystem::CHANNEL_IN_MONO) // Default audio input sample format #define AUDIO_HW_IN_FORMAT (AudioSystem::PCM_16_BIT) -// Number of buffers in audio driver for input -#define AUDIO_HW_NUM_IN_BUF 2 // Kernel pcm in buffer size in frames at 44.1kHz (before resampling) -#define AUDIO_HW_IN_PERIOD_MULT 16 // (16 * 128 = 2048 frames) -#define AUDIO_HW_IN_PERIOD_SZ (PCM_PERIOD_SZ_MIN * AUDIO_HW_IN_PERIOD_MULT) +#define AUDIO_HW_IN_PERIOD_SZ 2048 #define AUDIO_HW_IN_PERIOD_CNT 2 // Default audio input buffer size in bytes (8kHz mono) #define AUDIO_HW_IN_PERIOD_BYTES ((AUDIO_HW_IN_PERIOD_SZ*sizeof(int16_t))/8) |