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

xxx

Browse source 
git-svn-id: svn://elaine/murooma/trunk@71 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-07-05 17:16:14 +00:00
parent 858e49a3ed
commit 18b3901c57
2 changed files with 80 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
chunk.h
View file

@ -1,7 +1,7 @@
#ifndef CHUNK_H #ifndef CHUNK_H
#define CHUNK_H #define CHUNK_H
#define SAMPLE_RATE (48000) #define SAMPLE_RATE (44100)
//#define SAMPLE_BIT (16) //#define SAMPLE_BIT (16)
#define CHANNELS (2) #define CHANNELS (2)
@ -10,6 +10,7 @@
#define PLAYER_CHUNK_MS (10) #define PLAYER_CHUNK_MS (10)
#define PLAYER_CHUNK_SIZE (SAMPLE_RATE*CHANNELS*PLAYER_CHUNK_MS/1000) #define PLAYER_CHUNK_SIZE (SAMPLE_RATE*CHANNELS*PLAYER_CHUNK_MS/1000)
#define PLAYER_CHUNK_MS_SIZE (SAMPLE_RATE*CHANNELS/1000)
#define FRAMES_PER_BUFFER (SAMPLE_RATE*PLAYER_CHUNK_MS/1000) #define FRAMES_PER_BUFFER (SAMPLE_RATE*PLAYER_CHUNK_MS/1000)

89
stream.h
View file

@ -47,9 +47,15 @@ public:
} }
PlayerChunk* getNextPlayerChunk() PlayerChunk* getNextPlayerChunk(int correction = 0)
{ {
Chunk* chunk = getNextChunk(); Chunk* chunk = getNextChunk();
if (correction > PLAYER_CHUNK_MS / 2)
correction = PLAYER_CHUNK_MS/2;
else if (correction < -PLAYER_CHUNK_MS/2)
correction = -PLAYER_CHUNK_MS/2;
//std::cerr << "GetNextPlayerChunk: " << correction << "\n";
// int age(0); // int age(0);
// age = getAge(*chunk) + outputBufferDacTime*1000 - bufferMs; // age = getAge(*chunk) + outputBufferDacTime*1000 - bufferMs;
// std::cerr << "age: " << age << " \tidx: " << chunk->idx << "\n"; // std::cerr << "age: " << age << " \tidx: " << chunk->idx << "\n";
@ -57,11 +63,37 @@ public:
playerChunk->tv_sec = chunk->tv_sec; playerChunk->tv_sec = chunk->tv_sec;
playerChunk->tv_usec = chunk->tv_usec; playerChunk->tv_usec = chunk->tv_usec;
playerChunk->idx = 0; playerChunk->idx = 0;
size_t missing = PLAYER_CHUNK_SIZE; size_t missing = PLAYER_CHUNK_SIZE;// + correction*PLAYER_CHUNK_MS_SIZE;
/* double factor = (double)PLAYER_CHUNK_MS / (double)(PLAYER_CHUNK_MS + correction);
size_t idx(0);
size_t idxCorrection(0);
for (size_t n=0; n<PLAYER_CHUNK_SIZE/2; ++n)
{
idx = chunk->idx + 2*floor(n*factor) - idxCorrection;
//std::cerr << factor << "\t" << n << "\t" << idx << "\n";
if (idx >= WIRE_CHUNK_SIZE)
{
idxCorrection = 2*floor(n*factor);
idx = 0;
chunks.pop_front();
delete chunk;
chunk = getNextChunk();
}
playerChunk->payload[2*n] = chunk->payload[idx];
playerChunk->payload[2*n+1] = chunk->payload[idx + 1];
}
addMs(chunk, -PLAYER_CHUNK_MS - correction);
chunk->idx = idx;
if (idx >= WIRE_CHUNK_SIZE)
{
chunks.pop_front();
delete chunk;
}
*/
if (chunk->idx + PLAYER_CHUNK_SIZE > WIRE_CHUNK_SIZE) if (chunk->idx + PLAYER_CHUNK_SIZE > WIRE_CHUNK_SIZE)
{ {
std::cerr << "chunk->idx + PLAYER_CHUNK_SIZE >= WIRE_CHUNK_SIZE: " << chunk->idx + PLAYER_CHUNK_SIZE << " >= " << WIRE_CHUNK_SIZE << "\n"; //std::cerr << "chunk->idx + PLAYER_CHUNK_SIZE >= WIRE_CHUNK_SIZE: " << chunk->idx + PLAYER_CHUNK_SIZE << " >= " << WIRE_CHUNK_SIZE << "\n";
memcpy(&(playerChunk->payload[0]), &chunk->payload[chunk->idx], sizeof(int16_t)*(WIRE_CHUNK_SIZE - chunk->idx)); memcpy(&(playerChunk->payload[0]), &chunk->payload[chunk->idx], sizeof(int16_t)*(WIRE_CHUNK_SIZE - chunk->idx));
missing = chunk->idx + PLAYER_CHUNK_SIZE - WIRE_CHUNK_SIZE; missing = chunk->idx + PLAYER_CHUNK_SIZE - WIRE_CHUNK_SIZE;
chunks.pop_front(); chunks.pop_front();
@ -85,17 +117,52 @@ std::cerr << "chunk->idx + PLAYER_CHUNK_SIZE >= WIRE_CHUNK_SIZE: " << chunk->idx
PlayerChunk* getChunk(double outputBufferDacTime, unsigned long framesPerBuffer) PlayerChunk* getChunk(double outputBufferDacTime, unsigned long framesPerBuffer)
{ {
PlayerChunk* playerChunk = getNextPlayerChunk(); int correction(0);
int age = getAge(playerChunk) + outputBufferDacTime*1000 - bufferMs; if (pBuffer->full() && (abs(median) <= PLAYER_CHUNK_MS))
correction = median;
PlayerChunk* playerChunk = getNextPlayerChunk(correction);
int age = getAge(playerChunk) - bufferMs + outputBufferDacTime*1000;
pBuffer->add(age);
pShortBuffer->add(age);
// std::cerr << "Chunk: " << age << "\t" << outputBufferDacTime*1000 << "\n"; // std::cerr << "Chunk: " << age << "\t" << outputBufferDacTime*1000 << "\n";
if (age < -100)
int sleep(0);
time_t now = time(NULL);
if (now != lastUpdate)
{ {
std::cerr << "Playing silence, age: " << age << "\n"; lastUpdate = now;
sleepMs(-age); median = pBuffer->median();
// *playerChunk = new PlayerChunk(); shortMedian = pShortBuffer->median();
// return; if (abs(age) > 300)
sleep = age;
if (pShortBuffer->full() && (abs(shortMedian) > WIRE_CHUNK_MS))
sleep = shortMedian;
if (pBuffer->full() && (abs(median) > PLAYER_CHUNK_MS))
sleep = median;
std::cerr << "Chunk: " << age << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << outputBufferDacTime*1000 << "\n";
} }
if (sleep != 0)
{
std::cerr << "Sleep: " << sleep << "\n";
pBuffer->clear();
pShortBuffer->clear();
if (sleep < 0)
{
sleepMs(100-sleep);
}
else
{
for (size_t n=0; n<(size_t)(sleep / PLAYER_CHUNK_MS); ++n)
{
delete playerChunk;
playerChunk = getNextPlayerChunk();
}
}
}
// int age = getAge(*lastPlayerChunk) + outputBufferDacTime*1000 - bufferMs; // int age = getAge(*lastPlayerChunk) + outputBufferDacTime*1000 - bufferMs;
return playerChunk; return playerChunk;
} }