diff options
author | Brad Davis <bdavis@saintandreas.org> | 2019-10-09 10:51:59 -0700 |
---|---|---|
committer | Brad Davis <bdavis@saintandreas.org> | 2019-11-11 05:50:39 -0700 |
commit | fc2029e9fe621a1ceaa67fbc1d32b3150fd0b262 (patch) | |
tree | 71ba6629f47317ce99117e3698853354552715b3 | |
parent | 4d251f072c6f97b4cf4618103e4e857e499c5ed7 (diff) | |
download | qtmultimedia-fc2029e9fe621a1ceaa67fbc1d32b3150fd0b262.tar.gz |
opensl: support android voice comm preset in order to trigger aec
OpenSL ES support acoustic echo cancellation via the SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION preset, but
this isn't exposed through Qt's wrapping layer. This change exposes new Qt constants to enable the use of this feature
Change-Id: Ie64a949313b5a5b35d24159d3549290893ce32dd
Fixes: QTBUG-70368
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r-- | src/plugins/opensles/qopenslesaudioinput.cpp | 2 | ||||
-rw-r--r-- | src/plugins/opensles/qopenslesaudioinput.h | 1 | ||||
-rw-r--r-- | src/plugins/opensles/qopenslesengine.cpp | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/opensles/qopenslesaudioinput.cpp b/src/plugins/opensles/qopenslesaudioinput.cpp index ad87cb057..54ed18ac1 100644 --- a/src/plugins/opensles/qopenslesaudioinput.cpp +++ b/src/plugins/opensles/qopenslesaudioinput.cpp @@ -117,6 +117,8 @@ QOpenSLESAudioInput::QOpenSLESAudioInput(const QByteArray &device) m_recorderPreset = SL_ANDROID_RECORDING_PRESET_CAMCORDER; else if (qstrcmp(device, QT_ANDROID_PRESET_VOICE_RECOGNITION) == 0) m_recorderPreset = SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION; + else if (qstrcmp(device, QT_ANDROID_PRESET_VOICE_COMMUNICATION) == 0) + m_recorderPreset = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION; else m_recorderPreset = SL_ANDROID_RECORDING_PRESET_GENERIC; #endif diff --git a/src/plugins/opensles/qopenslesaudioinput.h b/src/plugins/opensles/qopenslesaudioinput.h index ad84db0cd..35cc37959 100644 --- a/src/plugins/opensles/qopenslesaudioinput.h +++ b/src/plugins/opensles/qopenslesaudioinput.h @@ -50,6 +50,7 @@ #define QT_ANDROID_PRESET_MIC "mic" #define QT_ANDROID_PRESET_CAMCORDER "camcorder" #define QT_ANDROID_PRESET_VOICE_RECOGNITION "voicerecognition" +#define QT_ANDROID_PRESET_VOICE_COMMUNICATION "voicecommunication" #endif diff --git a/src/plugins/opensles/qopenslesengine.cpp b/src/plugins/opensles/qopenslesengine.cpp index 43cdcb276..36025dcfd 100644 --- a/src/plugins/opensles/qopenslesengine.cpp +++ b/src/plugins/opensles/qopenslesengine.cpp @@ -114,7 +114,8 @@ QList<QByteArray> QOpenSLESEngine::availableDevices(QAudio::Mode mode) const #ifdef ANDROID devices << QT_ANDROID_PRESET_MIC << QT_ANDROID_PRESET_CAMCORDER - << QT_ANDROID_PRESET_VOICE_RECOGNITION; + << QT_ANDROID_PRESET_VOICE_RECOGNITION + << QT_ANDROID_PRESET_VOICE_COMMUNICATION; #else devices << "default"; #endif |