3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-10 15:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

adaptive sample rate

Browse source 
git-svn-id: svn://elaine/murooma/trunk@308 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-10-25 09:11:15 +00:00
parent 42ef09e726
commit 750a14c396
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/stream.cpp
View file

@ -220,6 +220,7 @@ if (since.count() > 0)
while (sleep > chunk->duration<chronos::usec>()) while (sleep > chunk->duration<chronos::usec>())
{ {
cout << "sleep > chunk->getDuration(): " << sleep.count() << " > " << chunk->duration<chronos::msec>().count() << ", chunks: " << chunks.size() << ", out: " << outputBufferDacTime.count() << ", needed: " << bufferDuration.count() << "\n"; cout << "sleep > chunk->getDuration(): " << sleep.count() << " > " << chunk->duration<chronos::msec>().count() << ", chunks: " << chunks.size() << ", out: " << outputBufferDacTime.count() << ", needed: " << bufferDuration.count() << "\n";
sleep = std::chrono::duration_cast<usec>(TimeProvider::serverNow() - chunk->start() - bufferMs + outputBufferDacTime);
if (!chunks.try_pop(chunk, outputBufferDacTime)) if (!chunks.try_pop(chunk, outputBufferDacTime))
{ {
cout << "no chunks available\n"; cout << "no chunks available\n";
@ -227,8 +228,6 @@ if (since.count() > 0)
sleep = chronos::usec(0); sleep = chronos::usec(0);
return false; return false;
} }
sleep = std::chrono::duration_cast<usec>(TimeProvider::serverNow() - chunk->start() - bufferMs + outputBufferDacTime);
} }
} }
@ -260,7 +259,7 @@ if (since.count() > 0)
age = std::chrono::duration_cast<usec>(TimeProvider::serverNow() - getNextPlayerChunk(outputBuffer, outputBufferDacTime, framesPerBuffer, framesCorrection) - bufferMs + outputBufferDacTime); age = std::chrono::duration_cast<usec>(TimeProvider::serverNow() - getNextPlayerChunk(outputBuffer, outputBufferDacTime, framesPerBuffer, framesCorrection) - bufferMs + outputBufferDacTime);
// setRealSampleRate(format.rate); setRealSampleRate(format.rate);
if (sleep.count() == 0) if (sleep.count() == 0)
{ {
if (buffer.full()) if (buffer.full())
@ -279,11 +278,22 @@ if (since.count() > 0)
setRealSampleRate(format.rate + format.rate / 1000); setRealSampleRate(format.rate + format.rate / 1000);
} }
*/ } */ }
else if (shortBuffer.full() && (chronos::usec(abs(shortMedian)) > chronos::msec(5))) else if (shortBuffer.full())
{
if (chronos::usec(abs(shortMedian)) > chronos::msec(5))
{ {
cout << "pShortBuffer->full() && (abs(shortMedian) > 5): " << shortMedian << "\n"; cout << "pShortBuffer->full() && (abs(shortMedian) > 5): " << shortMedian << "\n";
sleep = chronos::usec(shortMedian); sleep = chronos::usec(shortMedian);
} }
if (chronos::usec(shortMedian) > chronos::usec(100))
setRealSampleRate(format.rate * 0.9999);
else if (chronos::usec(shortMedian) < -chronos::usec(100))
setRealSampleRate(format.rate * 1.0001);
/* else
{
setRealSampleRate(format.rate + -shortMedian / 100);
}
*/ }
else if (miniBuffer.full() && (chronos::usec(abs(miniBuffer.median())) > chronos::msec(50))) else if (miniBuffer.full() && (chronos::usec(abs(miniBuffer.median())) > chronos::msec(50)))
{ {
cout << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer.median() << "\n"; cout << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer.median() << "\n";

2
client/timeProvider.cpp
View file

@ -3,7 +3,7 @@
TimeProvider::TimeProvider() : diffToServer(0) TimeProvider::TimeProvider() : diffToServer(0)
{ {
diffBuffer.setSize(100); diffBuffer.setSize(200);
} }