- better logging for https://gitlab.com/sevana_ou/qualtest_softphone/-/issues/6
This commit is contained in:
parent
cc5b704997
commit
095aab4d59
|
|
@ -578,6 +578,9 @@ void AgentImpl::processGetMediaStats(Json::Value& request, Json::Value& answer)
|
||||||
referenceAudio.appendBuffer(buffer, wasRead);
|
referenceAudio.appendBuffer(buffer, wasRead);
|
||||||
} while (wasRead == 1024);
|
} while (wasRead == 1024);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
ICELogCritical(<< "Failed to read AQuA reference audio, error code: " << reader.lastError());
|
||||||
|
}
|
||||||
|
|
||||||
sevana::aqua::audio_buffer test(mAquaIncoming.data(), mAquaIncoming.size()),
|
sevana::aqua::audio_buffer test(mAquaIncoming.data(), mAquaIncoming.size()),
|
||||||
reference(referenceAudio.data(), referenceAudio.size());
|
reference(referenceAudio.data(), referenceAudio.size());
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ using namespace Audio;
|
||||||
|
|
||||||
// ---------------------- WavFileReader -------------------------
|
// ---------------------- WavFileReader -------------------------
|
||||||
WavFileReader::WavFileReader()
|
WavFileReader::WavFileReader()
|
||||||
:mHandle(nullptr), mRate(0)
|
:mHandle(nullptr), mRate(0), mLastError(0)
|
||||||
{
|
{
|
||||||
mDataOffset = 0;
|
mDataOffset = 0;
|
||||||
}
|
}
|
||||||
|
|
@ -84,7 +84,16 @@ bool WavFileReader::open(const std::tstring& filename)
|
||||||
mHandle = fopen(StringHelper::makeUtf8(filename).c_str(), "rb");
|
mHandle = fopen(StringHelper::makeUtf8(filename).c_str(), "rb");
|
||||||
#endif
|
#endif
|
||||||
if (NULL == mHandle)
|
if (NULL == mHandle)
|
||||||
|
{
|
||||||
|
#if defined(TARGET_ANDROID) || defined(TARGET_LINUX) || defined(TARGET_OSX)
|
||||||
|
mLastError = errno;
|
||||||
|
#endif
|
||||||
|
#if defined(TARGET_WIN)
|
||||||
|
mLastError = GetLastError();
|
||||||
|
#endif
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
mLastError = 0;
|
||||||
|
|
||||||
// Read the .WAV header
|
// Read the .WAV header
|
||||||
char riff[4];
|
char riff[4];
|
||||||
|
|
@ -157,7 +166,8 @@ bool WavFileReader::open(const std::tstring& filename)
|
||||||
}
|
}
|
||||||
catch(...)
|
catch(...)
|
||||||
{
|
{
|
||||||
fclose(mHandle); mHandle = NULL;
|
fclose(mHandle); mHandle = nullptr;
|
||||||
|
mLastError = static_cast<unsigned>(-1);
|
||||||
}
|
}
|
||||||
return isOpened();
|
return isOpened();
|
||||||
}
|
}
|
||||||
|
|
@ -240,6 +250,10 @@ unsigned WavFileReader::size() const
|
||||||
return mDataLength;
|
return mDataLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned WavFileReader::lastError() const
|
||||||
|
{
|
||||||
|
return mLastError;
|
||||||
|
}
|
||||||
// ------------------------- WavFileWriter -------------------------
|
// ------------------------- WavFileWriter -------------------------
|
||||||
#define LOG_SUBSYTEM "WavFileWriter"
|
#define LOG_SUBSYTEM "WavFileWriter"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,8 @@ namespace Audio
|
||||||
unsigned mDataOffset;
|
unsigned mDataOffset;
|
||||||
unsigned mDataLength;
|
unsigned mDataLength;
|
||||||
Resampler mResampler;
|
Resampler mResampler;
|
||||||
|
unsigned mLastError;
|
||||||
|
|
||||||
std::string readChunk();
|
std::string readChunk();
|
||||||
public:
|
public:
|
||||||
WavFileReader();
|
WavFileReader();
|
||||||
|
|
@ -47,6 +49,8 @@ namespace Audio
|
||||||
unsigned read(short* buffer, unsigned samples);
|
unsigned read(short* buffer, unsigned samples);
|
||||||
std::tstring filename() const;
|
std::tstring filename() const;
|
||||||
unsigned size() const;
|
unsigned size() const;
|
||||||
|
|
||||||
|
unsigned lastError() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::shared_ptr<WavFileReader> PWavFileReader;
|
typedef std::shared_ptr<WavFileReader> PWavFileReader;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue