- new sync primitive - memory blocks queue
- better audio buffer management in AQuA wrapper
This commit is contained in:
@@ -669,20 +669,20 @@ SevanaAqua::CompareResult SevanaAqua::compare(AudioBuffer& reference, AudioBuffe
|
||||
|
||||
std::unique_lock<std::mutex> l(mMutex);
|
||||
|
||||
if (!mContext)
|
||||
if (!mContext || !reference.isInitialized() || !test.isInitialized())
|
||||
return r;
|
||||
|
||||
// Make analysis
|
||||
TSSA_AQuA_AudioData aad;
|
||||
aad.dSrcData.dNChannels = reference.mChannels;
|
||||
aad.dSrcData.dSampleRate = reference.mRate;
|
||||
aad.dSrcData.pSamples = (short*)reference.mData;
|
||||
aad.dSrcData.dNSamples = (long)reference.mSize / 2 / reference.mChannels;
|
||||
aad.dSrcData.pSamples = (short*)reference.mData->data();
|
||||
aad.dSrcData.dNSamples = (long)reference.mData->size() / 2 / reference.mChannels;
|
||||
|
||||
aad.dTstData.dNChannels = test.mChannels;
|
||||
aad.dTstData.dSampleRate = test.mRate;
|
||||
aad.dTstData.pSamples = (short*)test.mData;
|
||||
aad.dTstData.dNSamples = (long)test.mSize / 2 / test.mChannels;
|
||||
aad.dTstData.pSamples = (short*)test.mData->data();
|
||||
aad.dTstData.dNSamples = (long)test.mData->size() / 2 / test.mChannels;
|
||||
|
||||
int rescode;
|
||||
rescode = SSA_OnTestAudioData(mContext, &aad);
|
||||
|
||||
@@ -164,10 +164,41 @@ namespace MT
|
||||
// Report is returned in JSON format
|
||||
struct AudioBuffer
|
||||
{
|
||||
int mRate = 8000;
|
||||
int mChannels = 1;
|
||||
void* mData = nullptr;
|
||||
int mSize = 0; // In bytes
|
||||
AudioBuffer()
|
||||
{}
|
||||
|
||||
AudioBuffer(int size)
|
||||
{
|
||||
mData = std::make_shared<std::vector<unsigned char>>();
|
||||
mData->resize(size);
|
||||
}
|
||||
|
||||
AudioBuffer(const void* data, int size)
|
||||
{
|
||||
mData = std::make_shared<std::vector<unsigned char>>();
|
||||
mData->resize(size);
|
||||
memcpy(mData->data(), data, size);
|
||||
}
|
||||
|
||||
void* data()
|
||||
{
|
||||
return mData ? mData->data() : nullptr;
|
||||
}
|
||||
|
||||
const void* data() const
|
||||
{
|
||||
return mData ? mData->data() : nullptr;
|
||||
}
|
||||
|
||||
int size() const
|
||||
{
|
||||
return mData ? mData->size() : 0;
|
||||
}
|
||||
|
||||
int mRate = 8000;
|
||||
int mChannels = 1;
|
||||
std::shared_ptr<std::vector<unsigned char>> mData;
|
||||
bool isInitialized() const { return mRate > 0 && mChannels > 0 && mData; }
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user