Skip to content

Work around CodeQL multiplication warning #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
softins wants to merge 1 commit into from
Closed

Work around CodeQL multiplication warning #2456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions android/sound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() )
{
Expand All @@ -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<int16_t> 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<int16_t> outBuffer ( count );

mOutBuffer.Get ( outBuffer, count );

Expand Down