diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-07-17 14:13:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-17 14:13:17 +0000 |
| commit | d791d81421a19e732cbf3cf29a6cc48fc5ccdc63 (patch) | |
| tree | b0c892fb4a26b40d67fc4d0f615237a175206746 | |
| parent | 25140e2467ffb0e0d67fc645e4cb2c2003248b36 (diff) | |
| parent | e493afff2c5173fe934c1afaa9254938a7fa7590 (diff) | |
| download | frameworks_av-d791d81421a19e732cbf3cf29a6cc48fc5ccdc63.zip frameworks_av-d791d81421a19e732cbf3cf29a6cc48fc5ccdc63.tar.gz frameworks_av-d791d81421a19e732cbf3cf29a6cc48fc5ccdc63.tar.bz2 | |
am e493afff: am d81d4896: Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev
* commit 'e493afff2c5173fe934c1afaa9254938a7fa7590':
Add audio_input_flags_t to HAL open_input_stream
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 5fed0c1..5fd7ce8 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1847,8 +1847,9 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, audio_io_handle_t id = nextUniqueId(); audio_stream_in_t *inStream = NULL; + audio_input_flags_t flags = AUDIO_INPUT_FLAG_FAST; // FIXME until added to openInput() status_t status = inHwHal->open_input_stream(inHwHal, id, *pDevices, &config, - &inStream); + &inStream, flags); ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %#x, Channels %x, " "status %d", inStream, @@ -1868,7 +1869,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, // FIXME describe the change proposed by HAL (save old values so we can log them here) ALOGV("openInput() reopening with proposed sampling rate and channel mask"); inStream = NULL; - status = inHwHal->open_input_stream(inHwHal, id, *pDevices, &config, &inStream); + status = inHwHal->open_input_stream(inHwHal, id, *pDevices, &config, &inStream, flags); // FIXME log this new status; HAL should not propose any further changes } |