diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/aaudio/AudioStreamAAudio.cpp | 2 | ||||
-rw-r--r-- | src/common/AudioStreamBuilder.cpp | 2 | ||||
-rw-r--r-- | src/common/DataConversionFlowGraph.cpp | 14 | ||||
-rw-r--r-- | src/common/Utilities.cpp | 14 | ||||
-rw-r--r-- | src/opensles/AudioOutputStreamOpenSLES.cpp | 2 | ||||
-rw-r--r-- | src/opensles/AudioStreamOpenSLES.cpp | 6 |
6 files changed, 27 insertions, 13 deletions
diff --git a/src/aaudio/AudioStreamAAudio.cpp b/src/aaudio/AudioStreamAAudio.cpp index db7e658b..421798df 100644 --- a/src/aaudio/AudioStreamAAudio.cpp +++ b/src/aaudio/AudioStreamAAudio.cpp @@ -528,7 +528,7 @@ DataCallbackResult AudioStreamAAudio::callOnAudioReady(AAudioStream * /*stream*/ if (result == DataCallbackResult::Stop) { LOGD("Oboe callback returned DataCallbackResult::Stop"); } else { - LOGE("Oboe callback returned unexpected value = %d", result); + LOGE("Oboe callback returned unexpected value. Error: %d", static_cast<int>(result)); } // Returning Stop caused various problems before S. See #1230 diff --git a/src/common/AudioStreamBuilder.cpp b/src/common/AudioStreamBuilder.cpp index f655f9fc..b1549b54 100644 --- a/src/common/AudioStreamBuilder.cpp +++ b/src/common/AudioStreamBuilder.cpp @@ -96,7 +96,7 @@ Result AudioStreamBuilder::openStream(AudioStream **streamPP) { Result AudioStreamBuilder::openStreamInternal(AudioStream **streamPP) { auto result = isValidConfig(); if (result != Result::OK) { - LOGW("%s() invalid config %d", __func__, result); + LOGW("%s() invalid config. Error %s", __func__, oboe::convertToText(result)); return result; } diff --git a/src/common/DataConversionFlowGraph.cpp b/src/common/DataConversionFlowGraph.cpp index 374fffd1..0bb51ae2 100644 --- a/src/common/DataConversionFlowGraph.cpp +++ b/src/common/DataConversionFlowGraph.cpp @@ -92,14 +92,14 @@ Result DataConversionFlowGraph::configure(AudioStream *sourceStream, AudioStream int32_t sinkSampleRate = sinkStream->getSampleRate(); int32_t sinkFramesPerCallback = sinkStream->getFramesPerDataCallback(); - LOGI("%s() flowgraph converts channels: %d to %d, format: %d to %d" - ", rate: %d to %d, cbsize: %d to %d, qual = %d", + LOGI("%s() flowgraph converts channels: %d to %d, format: %s to %s" + ", rate: %d to %d, cbsize: %d to %d, qual = %s", __func__, sourceChannelCount, sinkChannelCount, - sourceFormat, sinkFormat, + oboe::convertToText(sourceFormat), oboe::convertToText(sinkFormat), sourceSampleRate, sinkSampleRate, sourceFramesPerCallback, sinkFramesPerCallback, - sourceStream->getSampleRateConversionQuality()); + oboe::convertToText(sourceStream->getSampleRateConversionQuality())); // Source // IF OUTPUT and using a callback then call back to the app using a SourceCaller. @@ -128,7 +128,7 @@ Result DataConversionFlowGraph::configure(AudioStream *sourceStream, AudioStream actualSourceFramesPerCallback); break; default: - LOGE("%s() Unsupported source caller format = %d", __func__, sourceFormat); + LOGE("%s() Unsupported source caller format = %d", __func__, static_cast<int>(sourceFormat)); return Result::ErrorIllegalArgument; } mSourceCaller->setStream(sourceStream); @@ -150,7 +150,7 @@ Result DataConversionFlowGraph::configure(AudioStream *sourceStream, AudioStream mSource = std::make_unique<SourceI32>(sourceChannelCount); break; default: - LOGE("%s() Unsupported source format = %d", __func__, sourceFormat); + LOGE("%s() Unsupported source format = %d", __func__, static_cast<int>(sourceFormat)); return Result::ErrorIllegalArgument; } if (isInput) { @@ -226,7 +226,7 @@ Result DataConversionFlowGraph::configure(AudioStream *sourceStream, AudioStream mSink = std::make_unique<SinkI32>(sinkChannelCount); break; default: - LOGE("%s() Unsupported sink format = %d", __func__, sinkFormat); + LOGE("%s() Unsupported sink format = %d", __func__, static_cast<int>(sinkFormat)); return Result::ErrorIllegalArgument;; } lastOutput->connect(&mSink->input); diff --git a/src/common/Utilities.cpp b/src/common/Utilities.cpp index f6718afc..d84d35f4 100644 --- a/src/common/Utilities.cpp +++ b/src/common/Utilities.cpp @@ -278,6 +278,20 @@ const char *convertToText<ChannelCount>(ChannelCount channelCount) { } } +template<> +const char *convertToText<SampleRateConversionQuality>(SampleRateConversionQuality sampleRateConversionQuality) { + + switch (sampleRateConversionQuality) { + case SampleRateConversionQuality::None: return "None"; + case SampleRateConversionQuality::Fastest: return "Fastest"; + case SampleRateConversionQuality::Low: return "Low"; + case SampleRateConversionQuality::Medium: return "Medium"; + case SampleRateConversionQuality::High: return "High"; + case SampleRateConversionQuality::Best: return "Best"; + default: return "Unrecognized sample rate conversion quality"; + } +} + std::string getPropertyString(const char * name) { std::string result; #ifdef __ANDROID__ diff --git a/src/opensles/AudioOutputStreamOpenSLES.cpp b/src/opensles/AudioOutputStreamOpenSLES.cpp index 0ef87dd0..2b689905 100644 --- a/src/opensles/AudioOutputStreamOpenSLES.cpp +++ b/src/opensles/AudioOutputStreamOpenSLES.cpp @@ -372,7 +372,7 @@ Result AudioOutputStreamOpenSLES::requestFlush_l() { } else { SLresult slResult = (*mSimpleBufferQueueInterface)->Clear(mSimpleBufferQueueInterface); if (slResult != SL_RESULT_SUCCESS){ - LOGW("Failed to clear buffer queue. OpenSLES error: %d", result); + LOGW("Failed to clear buffer queue. OpenSLES error: %s", getSLErrStr(slResult)); result = Result::ErrorInternal; } } 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) { |