birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for Android

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 19:40:25 -07:00
parent 7558a3d233
commit 25284fb3a7
1 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp
+36 -38
View File
@@ -121,53 +121,51 @@ namespace Audio
AZStd::size_t GetData(void** outputData, AZStd::size_t numFrames, const SAudioInputConfig& targetConfig, bool shouldDeinterleave)
{
bool changeSampleType = (targetConfig.m_sampleType != m_config.m_sampleType);
bool changeSampleRate = (targetConfig.m_sampleRate != m_config.m_sampleRate);
bool changeNumChannels = (targetConfig.m_numChannels != m_config.m_numChannels);
#if defined(USE_LIBSAMPLERATE)
return {};
#else
if (changeSampleType || changeNumChannels)
{
// Without the SRC library, any change is unsupported!
return {};
}
else if (changeSampleRate)
{
if(targetConfig.m_sampleRate > m_config.m_sampleRate)
bool changeSampleType = (targetConfig.m_sampleType != m_config.m_sampleType);
bool changeSampleRate = (targetConfig.m_sampleRate != m_config.m_sampleRate);
bool changeNumChannels = (targetConfig.m_numChannels != m_config.m_numChannels);
if (changeSampleType || changeNumChannels)
{
AZ_Error("MacOSMicrophone", false, "Target sample rate is larger than source sample rate, this is not supported");
// Without the SRC library, any change is unsupported!
return {};
}
auto sourceBuffer = new AZ::s16[numFrames];
AZStd::size_t targetSize = GetDownsampleSize(numFrames, m_config.m_sampleRate, targetConfig.m_sampleRate);
auto targetBuffer = new AZ::s16[targetSize];
numFrames = m_captureData->ConsumeData(reinterpret_cast<void**>(&sourceBuffer), numFrames, m_config.m_numChannels, false);
if(numFrames > 0)
else if (changeSampleRate)
{
Downsample(sourceBuffer, numFrames, m_config.m_sampleRate, targetBuffer, targetSize, targetConfig.m_sampleRate);
if(targetConfig.m_sampleRate > m_config.m_sampleRate)
{
AZ_Error("MacOSMicrophone", false, "Target sample rate is larger than source sample rate, this is not supported");
return {};
}
numFrames = targetSize;
// swap target data to output
::memcpy(*outputData, targetBuffer, targetSize * 2); //*2 as two bytes per frame
auto sourceBuffer = new AZ::s16[numFrames];
AZStd::size_t targetSize = GetDownsampleSize(numFrames, m_config.m_sampleRate, targetConfig.m_sampleRate);
auto targetBuffer = new AZ::s16[targetSize];
numFrames = m_captureData->ConsumeData(reinterpret_cast<void**>(&sourceBuffer), numFrames, m_config.m_numChannels, false);
if(numFrames > 0)
{
Downsample(sourceBuffer, numFrames, m_config.m_sampleRate, targetBuffer, targetSize, targetConfig.m_sampleRate);
numFrames = targetSize;
// swap target data to output
::memcpy(*outputData, targetBuffer, targetSize * 2); //*2 as two bytes per frame
}
delete [] sourceBuffer;
delete [] targetBuffer;
return numFrames;
}
else
{
// No change to the data from Input to Output
return m_captureData->ConsumeData(outputData, numFrames, m_config.m_numChannels, shouldDeinterleave);
}
delete [] sourceBuffer;
delete [] targetBuffer;
return numFrames;
}
else
{
// No change to the data from Input to Output
return m_captureData->ConsumeData(outputData, numFrames, m_config.m_numChannels, shouldDeinterleave);
}
#endif
}