musicdsp/audio-drain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] Remove some log when too many missing data in writing output

Browse Source
This commit is contained in:
Edouard DUPIN 2017-02-07 21:40:37 +01:00
parent e1b155410a
commit 2bd207471f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/drain/EndPointWrite.cpp
View File

@ -9,7 +9,9 @@
audio::drain::EndPointWrite::EndPointWrite() : audio::drain::EndPointWrite::EndPointWrite() :
m_function(nullptr), m_function(nullptr),
m_bufferSizeMicroseconds(1000000) { m_bufferSizeMicroseconds(1000000),
m_bufferSizeChunk(32),
m_bufferUnderFlowSize(0) {
} }
@ -71,14 +73,25 @@ bool audio::drain::EndPointWrite::process(audio::Time& _time,
std::unique_lock<std::mutex> lock(m_mutex); std::unique_lock<std::mutex> lock(m_mutex);
// check if data in the tmpBuffer // check if data in the tmpBuffer
if (m_buffer.getSize() == 0) { if (m_buffer.getSize() == 0) {
DRAIN_WARNING("No data in the user buffer (write null data ... " << _outputNbChunk << " chunks)"); if (m_bufferUnderFlowSize == 0) {
DRAIN_WARNING("No data in the user buffer (write null data ... " << _outputNbChunk << " chunks)");
m_bufferUnderFlowSize = 1;
} else {
if (m_bufferUnderFlowSize == 1) {
m_bufferUnderFlowSize = 0;
}
m_bufferUnderFlowSize += _outputNbChunk;
}
// clear the buffer to force the flush on the next elements ... // clear the buffer to force the flush on the next elements ...
m_outputData.clear(); m_outputData.clear();
_outputNbChunk = 0; _outputNbChunk = 0;
generateStatus("EPW_UNDERFLOW"); generateStatus("EPW_UNDERFLOW");
// just send no data ... // just send no data ...
return true; return true;
} else if (m_bufferUnderFlowSize > 1) {
DRAIN_WARNING("No data in the user buffer (write null data ... " << m_bufferUnderFlowSize << " chunks [In the past])");
} }
m_bufferUnderFlowSize = 0;
DRAIN_VERBOSE("Write " << _outputNbChunk << " chunks"); DRAIN_VERBOSE("Write " << _outputNbChunk << " chunks");
// check if we have enought data: // check if we have enought data:
int32_t nbChunkToCopy = std::min(_inputNbChunk, m_buffer.getSize()); int32_t nbChunkToCopy = std::min(_inputNbChunk, m_buffer.getSize());

1
audio/drain/EndPointWrite.hpp
View File

@ -47,6 +47,7 @@ namespace audio {
protected: protected:
std::chrono::microseconds m_bufferSizeMicroseconds; // 0 if m_bufferSizeChunk != 0 std::chrono::microseconds m_bufferSizeMicroseconds; // 0 if m_bufferSizeChunk != 0
size_t m_bufferSizeChunk; // 0 if m_bufferSizeMicroseconds != 0 size_t m_bufferSizeChunk; // 0 if m_bufferSizeMicroseconds != 0
size_t m_bufferUnderFlowSize; //!< Limit display of underflow in the write callback
public: public:
/** /**
* @brief Set buffer size in chunk number * @brief Set buffer size in chunk number