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

correction

Browse source 
git-svn-id: svn://elaine/murooma/trunk@95 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-07-10 22:23:13 +00:00
parent 31f1d5e382
commit ebc2890679
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
stream.cpp
View file

@ -150,7 +150,7 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
addMs(nextTv, samples / PLAYER_CHUNK_MS_SIZE); addMs(nextTv, samples / PLAYER_CHUNK_MS_SIZE);
setTimeval(chunk, nextTv); setTimeval(chunk, nextTv);
//timeval tvLater = getTimeval(chunk); //timeval tvLater = getTimeval(chunk);
//std::cerr << "Diff: " << diff_ms(tv, nextTv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n"; std::cerr << "Diff: " << diff_ms(nextTv, tv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n";
//std::cerr << timeToStr(tv) << "\n" << timeToStr(chunkTv) << "\n" << timeToStr(tvLater) << "\n"; //std::cerr << timeToStr(tv) << "\n" << timeToStr(chunkTv) << "\n" << timeToStr(tvLater) << "\n";
return tv; return tv;
} }
@ -216,20 +216,17 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
return; return;
} }
int correction(1); int correction(0);
/* if (pBuffer->full() && (abs(median) <= PLAYER_CHUNK_MS)) if (pBuffer->full() && (abs(median) <= PLAYER_CHUNK_MS))
{ {
if (median >= PLAYER_CHUNK_MS / 2) if (abs(median) > 1)
correction = 1;
else if (median <= -PLAYER_CHUNK_MS / 2)
correction = -1;
if (correction != 0)
{ {
correction = -median;
pBuffer->clear(); pBuffer->clear();
pShortBuffer->clear(); pShortBuffer->clear();
} }
} }
*/
timeval tv = getNextPlayerChunk(outputBuffer, correction); timeval tv = getNextPlayerChunk(outputBuffer, correction);
int age = getAge(tv) - bufferMs + outputBufferDacTime*1000; int age = getAge(tv) - bufferMs + outputBufferDacTime*1000;
pBuffer->add(age); pBuffer->add(age);
@ -253,7 +250,7 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
//sleep = 0; //sleep = 0;
if (sleep != 0) if (sleep != 0)
std::cerr << "Sleep: " << sleep << "\n"; std::cerr << "Sleep: " << sleep << "\n";
sleep = 0; //sleep = 0;
std::cerr << "Chunk: " << age << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << outputBufferDacTime*1000 << "\n"; std::cerr << "Chunk: " << age << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << outputBufferDacTime*1000 << "\n";
} }
} }