diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:04:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:04:50 +0200 |
| commit | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (patch) | |
| tree | 6408aa52426dcd7d77ab21358f11a3dcb10dc4ca /src/plugins/opensles | |
| parent | 3c278e96ce62f5211b2d2a700f233653a3ce64e6 (diff) | |
| parent | 7f502f32d9cc08bca841962511bbfabab1334b43 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8027e798d85ae60dbcb4fbc8592e3992af7546d4
Diffstat (limited to 'src/plugins/opensles')
| -rw-r--r-- | src/plugins/opensles/qopenslesengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/opensles/qopenslesengine.cpp b/src/plugins/opensles/qopenslesengine.cpp index 8a08c46f3..0cbd10887 100644 --- a/src/plugins/opensles/qopenslesengine.cpp +++ b/src/plugins/opensles/qopenslesengine.cpp @@ -143,7 +143,7 @@ QList<int> QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defaultValue) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int sampleRate = 0; static int framesPerBuffer = 0; static const int sdkVersion = QtAndroidPrivate::androidSdkVersion(); @@ -204,7 +204,7 @@ int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defau int QOpenSLESEngine::getDefaultBufferSize(const QAudioFormat &format) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) if (!format.isValid()) return 0; @@ -252,7 +252,7 @@ int QOpenSLESEngine::getLowLatencyBufferSize(const QAudioFormat &format) bool QOpenSLESEngine::supportsLowLatency() { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int isSupported = -1; if (isSupported != -1) |