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

chunk time

Browse source 
git-svn-id: svn://elaine/murooma/trunk@117 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-07-28 06:48:28 +00:00
parent 73ef1cda12
commit b5615ec185
4 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
stream.cpp
View file

@ -48,6 +48,8 @@ void Stream::getSilentPlayerChunk(short* outputBuffer)
}
timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
{
Chunk* chunk = getNextChunk();
@ -87,13 +89,16 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
}
//std::cerr << "Idx: " << chunk->idx << " => " << idx+2 << "\t" << WIRE_CHUNK_SIZE << "\t" << PLAYER_CHUNK_SIZE/2 << "\n";
chunk->idx = idx;
/// timeval nextTv = getTimeval(chunk);
/// addMs(nextTv, idx / WIRE_CHUNK_MS_SIZE);
/// setTimeval(chunk, nextTv);
//timeval chunkTv = getTimeval(chunk);
timeval nextTv = tv;
addMs(nextTv, samples / PLAYER_CHUNK_MS_SIZE);
setTimeval(chunk, nextTv);
// timeval nextTv = tv;
// addMs(nextTv, samples / PLAYER_CHUNK_MS_SIZE);
// setTimeval(chunk, nextTv);
//timeval tvLater = getTimeval(chunk);
std::cerr << "Diff: " << diff_ms(nextTv, tv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n";
std::cerr << "Diff: " << diff_ms(getTimeval(chunk), tv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n";
//std::cerr << timeToStr(tv) << "\n" << timeToStr(chunkTv) << "\n" << timeToStr(tvLater) << "\n";
return tv;
}
@ -119,7 +124,7 @@ std::cerr << "Diff: " << diff_ms(nextTv, tv) << "\t" << chunk->idx / PLAYER_CHUN
timeval nextTv = tv;
addMs(nextTv, PLAYER_CHUNK_MS);
setTimeval(chunk, nextTv);
// setTimeval(chunk, nextTv);
chunk->idx += missing;
if (chunk->idx >= WIRE_CHUNK_SIZE)
{