diff options
author | Robert Wu <85952307+robertwu1@users.noreply.github.com> | 2024-03-13 12:33:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-13 12:33:09 -0700 |
commit | 25cacaa77cf99e9dc339167377eb63ad3c213fc5 (patch) | |
tree | 9e6572866e570d6e2349208da3e96b0e099141cc | |
parent | 70ef948c436bff8a7b346dea749d591558d718ec (diff) | |
download | oboe-25cacaa77cf99e9dc339167377eb63ad3c213fc5.tar.gz |
Add more static_casts (#1982)
-rw-r--r-- | apps/OboeTester/app/src/main/cpp/analyzer/GlitchAnalyzer.h | 2 | ||||
-rw-r--r-- | src/opensles/AudioStreamOpenSLES.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/OboeTester/app/src/main/cpp/analyzer/GlitchAnalyzer.h b/apps/OboeTester/app/src/main/cpp/analyzer/GlitchAnalyzer.h index 759185d8..fff87902 100644 --- a/apps/OboeTester/app/src/main/cpp/analyzer/GlitchAnalyzer.h +++ b/apps/OboeTester/app/src/main/cpp/analyzer/GlitchAnalyzer.h @@ -75,7 +75,7 @@ public: } else { double signalToNoise = mMeanSquareSignal / mMeanSquareNoise; // power ratio double signalToNoiseDB = 10.0 * log(signalToNoise); - if (signalToNoiseDB < MIN_SNR_DB) { + if (signalToNoiseDB < static_cast<float>(MIN_SNR_DB)) { setResult(ERROR_VOLUME_TOO_LOW); } return signalToNoiseDB; diff --git a/src/opensles/AudioStreamOpenSLES.cpp b/src/opensles/AudioStreamOpenSLES.cpp index 9013d61c..ec041ccb 100644 --- a/src/opensles/AudioStreamOpenSLES.cpp +++ b/src/opensles/AudioStreamOpenSLES.cpp @@ -72,8 +72,8 @@ Result AudioStreamOpenSLES::open() { // OpenSL ES only supports I16 and Float if (mFormat != AudioFormat::I16 && mFormat != AudioFormat::Float) { - LOGW("%s() Android's OpenSL ES implementation only supports I16 and Float. Format: %d", - __func__, mFormat); + LOGW("%s() Android's OpenSL ES implementation only supports I16 and Float. Format: %s", + __func__, oboe::convertToText(mFormat)); return Result::ErrorInvalidFormat; } @@ -422,7 +422,7 @@ bool AudioStreamOpenSLES::processBufferCallback(SLAndroidSimpleBufferQueueItf bq LOGD("Oboe callback returned Stop"); shouldStopStream = true; } else { - LOGW("Oboe callback returned unexpected value = %d", result); + LOGW("Oboe callback returned unexpected value = %d", static_cast<int>(result)); shouldStopStream = true; } if (shouldStopStream) { |