3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-22 19:07:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

xxx

Browse source 
git-svn-id: svn://elaine/murooma/trunk@94 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-07-10 21:59:42 +00:00
parent 0c2cb12d15
commit 31f1d5e382
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
stream.cpp
View file

@ -89,7 +89,8 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
if (correction != 0)
{
std::cerr << "Correction: " << correction << "\n";
int factor = ceil((float)PLAYER_CHUNK_MS / (float)abs(correction));
std::cerr << "Correction: " << correction << ", factor: " << factor << "\n";
size_t idx(chunk->idx);
size_t samples(0);
for (size_t n=0; n<PLAYER_CHUNK_SIZE/2; ++n)
@ -97,7 +98,20 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
*(outputBuffer + 2*n) = chunk->payload[idx];
*(outputBuffer + 2*n+1) = chunk->payload[idx + 1];
//std::cerr << 2*n << "\t" << idx << "\n";
if (correction > 0)
if (n % factor == 0)
{
if (correction < 0)
{
samples += 4;
idx += 4;
}
}
else
{
samples += 2;
idx += 2;
}
/* if (correction > 0)
{
if (n % 2 != 0)
{
@ -118,7 +132,7 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
idx += 2;
}
}
*/
if (idx >= WIRE_CHUNK_SIZE)
{
//std::cerr << "idx >= WIRE_CHUNK_SIZE: " << idx << "\t" << WIRE_CHUNK_SIZE << "\n";
@ -202,8 +216,8 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
return;
}
int correction(0);
if (pBuffer->full() && (abs(median) <= PLAYER_CHUNK_MS))
int correction(1);
/* if (pBuffer->full() && (abs(median) <= PLAYER_CHUNK_MS))
{
if (median >= PLAYER_CHUNK_MS / 2)
correction = 1;
@ -215,7 +229,7 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
pShortBuffer->clear();
}
}
*/
timeval tv = getNextPlayerChunk(outputBuffer, correction);
int age = getAge(tv) - bufferMs + outputBufferDacTime*1000;
pBuffer->add(age);
@ -239,7 +253,7 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
//sleep = 0;
if (sleep != 0)
std::cerr << "Sleep: " << sleep << "\n";
//sleep = 0;
sleep = 0;
std::cerr << "Chunk: " << age << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << outputBufferDacTime*1000 << "\n";
}
}