3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-29 17:06:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

cardBuffer

Browse source 
git-svn-id: svn://elaine/murooma/trunk@165 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-08-09 11:53:58 +00:00
parent a52cfc260a
commit f6848f65f0
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
stream.cpp
View file

@ -101,6 +101,20 @@ void Stream::getPlayerChunk(short* outputBuffer, double outputBufferDacTime, uns
{ {
//cout << "framesPerBuffer: " << framesPerBuffer << "\tms: " << framesPerBuffer*2 / PLAYER_CHUNK_MS_SIZE << "\t" << PLAYER_CHUNK_SIZE << "\n"; //cout << "framesPerBuffer: " << framesPerBuffer << "\tms: " << framesPerBuffer*2 / PLAYER_CHUNK_MS_SIZE << "\t" << PLAYER_CHUNK_SIZE << "\n";
int msBuffer = floor(framesPerBuffer*2 / PLAYER_CHUNK_MS_SIZE); int msBuffer = floor(framesPerBuffer*2 / PLAYER_CHUNK_MS_SIZE);
int ticks = 0;
long currentTick = getTickCount();
if (lastTick == 0)
lastTick = currentTick;
ticks = currentTick - lastTick;
lastTick = currentTick;
int cardBuffer = 0;
if (ticks > 1)
pCardBuffer->add(ticks);
if (pCardBuffer->full())
cardBuffer = pCardBuffer->percentil(90);
int correction = 0; int correction = 0;
if (sleep != 0) if (sleep != 0)
{ {
@ -143,20 +157,14 @@ void Stream::getPlayerChunk(short* outputBuffer, double outputBufferDacTime, uns
int age = Chunk::getAge(getNextPlayerChunk(outputBuffer, framesPerBuffer, correction)) - bufferMs;// + outputBufferDacTime*1000; int age = Chunk::getAge(getNextPlayerChunk(outputBuffer, framesPerBuffer, correction)) - bufferMs;// + outputBufferDacTime*1000;
long currentTick = getTickCount();
if (lastTick == 0)
lastTick = currentTick;
if (currentTick - lastTick > 1)
pCardBuffer->add(currentTick - lastTick);
cout << age << "\t" << msBuffer << "\t" << currentTick - lastTick << "\tcardBuffer: " << pCardBuffer->percentil(90) << "\n";
lastTick = currentTick;
if (outputBufferDacTime < 1) if (outputBufferDacTime < 1)
age += outputBufferDacTime*1000; age += outputBufferDacTime*1000;
if (pCardBuffer->full()) if (pCardBuffer->full())
age += pCardBuffer->percentil(90); age += pCardBuffer->percentil(90);
cout << age << "\t" << msBuffer << "\t" << ticks << "\tcardBuffer: " << cardBuffer << "\n";
// cout << age << "\t" << outputBufferDacTime*1000 << "\n"; // cout << age << "\t" << outputBufferDacTime*1000 << "\n";