oboe: return correct InputPreset when modified

The InputPreset can be coerced from VoicePerformance to VoiceRecognition. But getInputPreset() returned the wrong value. Fixed for FilterAudioStream and OpenSL ES. Fixes #1090
google · Nov 24, 2020 · 888826d · 888826d
1 parent 7bc2eab
commit 888826d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/common/FilterAudioStream.h b/src/common/FilterAudioStream.h
@@ -55,6 +55,7 @@ class FilterAudioStream : public AudioStream, AudioStreamCallback {
         // Copy parameters that may not match builder.
         mBufferCapacityInFrames = mChildStream->getBufferCapacityInFrames();
         mPerformanceMode = mChildStream->getPerformanceMode();
+        mInputPreset = mChildStream->getInputPreset();
     }
 
     virtual ~FilterAudioStream() = default;

diff --git a/src/opensles/AudioInputStreamOpenSLES.cpp b/src/opensles/AudioInputStreamOpenSLES.cpp
@@ -156,6 +156,10 @@ Result AudioInputStreamOpenSLES::open() {
         LOGW("%s() GetInterface(SL_IID_ANDROIDCONFIGURATION) failed with %s",
              __func__, getSLErrStr(result));
     } else {
+        if (getInputPreset() == InputPreset::VoicePerformance) {
+            LOGD("OpenSL ES does not support InputPreset::VoicePerformance. Use VoiceRecognition.");
+            mInputPreset = InputPreset::VoiceRecognition;
+        }
         SLuint32 presetValue = OpenSLES_convertInputPreset(getInputPreset());
         result = (*configItf)->SetConfiguration(configItf,
                                          SL_ANDROID_KEY_RECORDING_PRESET,