From 3dd28e87d9a45bb45a58cab83d4e051d8a67ce6f Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Thu, 3 Mar 2022 17:11:45 +0000 Subject: [PATCH] Work around CodeQL multiplication warning --- android/sound.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/android/sound.cpp b/android/sound.cpp index cff00204ca..8fe1598707 100644 --- a/android/sound.cpp +++ b/android/sound.cpp @@ -272,16 +272,17 @@ oboe::DataCallbackResult CSound::onAudioInput ( oboe::AudioStream* oboeStream, v void CSound::addOutputData ( int channel_count ) { - QMutexLocker locker ( &MutexAudioProcessCallback ); + QMutexLocker locker ( &MutexAudioProcessCallback ); + const std::size_t bufsize = (std::size_t) iOboeBufferSizeMono * channel_count; // Only copy data if we have data to copy, otherwise fill with silence if ( vecsTmpInputAudioSndCrdStereo.empty() ) { // prime output stream buffer with silence - vecsTmpInputAudioSndCrdStereo.resize ( iOboeBufferSizeMono * channel_count, 0 ); + vecsTmpInputAudioSndCrdStereo.resize ( bufsize, 0 ); } - mOutBuffer.Put ( vecsTmpInputAudioSndCrdStereo, iOboeBufferSizeMono * channel_count ); + mOutBuffer.Put ( vecsTmpInputAudioSndCrdStereo, bufsize ); if ( mOutBuffer.isFull() ) { @@ -296,9 +297,9 @@ oboe::DataCallbackResult CSound::onAudioOutput ( oboe::AudioStream* oboeStream, QMutexLocker locker ( &MutexAudioProcessCallback ); - std::size_t to_write = (std::size_t) numFrames * oboeStream->getChannelCount(); - std::size_t count = std::min ( (std::size_t) mOutBuffer.GetAvailData(), to_write ); - CVector outBuffer ( count ); + const std::size_t to_write = (std::size_t) numFrames * oboeStream->getChannelCount(); + const std::size_t count = std::min ( (std::size_t) mOutBuffer.GetAvailData(), to_write ); + CVector outBuffer ( count ); mOutBuffer.Get ( outBuffer, count );