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

new messages

Browse source 
git-svn-id: svn://elaine/murooma/trunk@228 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-02 22:28:18 +00:00
parent acae4edbe7
commit c6ee0960fd
4 changed files with 29 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/timeUtils.h
View file

@ -1,7 +1,6 @@
#ifndef TIME_UTILS_H #ifndef TIME_UTILS_H
#define TIME_UTILS_H #define TIME_UTILS_H
#include "chunk.h"
#include <sys/time.h> #include <sys/time.h>
#include <chrono> #include <chrono>

2
test/Makefile
View file

@ -3,7 +3,7 @@ CC = /usr/bin/g++
CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg
OBJ = test.o message.o OBJ = test.o message.o ../common/sampleFormat.o ../server/oggEncoder.o ../server/pcmEncoder.o
BIN = test BIN = test
all: server all: server

2
test/message.cpp
View file

@ -4,7 +4,7 @@
#include "common/log.h" #include "common/log.h"
Chunk::Chunk(const SampleFormat& sampleFormat, size_t ms) : format(sampleFormat), idx(0) Chunk::Chunk(const SampleFormat& sampleFormat, size_t ms) : WireChunk(), format(sampleFormat), idx(0)
{ {
payloadSize = format.rate*format.frameSize*ms / 1000; payloadSize = format.rate*format.frameSize*ms / 1000;
payload = (char*)malloc(payloadSize); payload = (char*)malloc(payloadSize);

87
test/test.cpp
View file

@ -21,11 +21,6 @@
#include <memory> #include <memory>
#include <set> #include <set>
#include "common/chunk.h" #include "common/chunk.h"
#include "common/timeUtils.h"
#include "common/queue.h"
#include "common/signalHandler.h"
#include "common/utils.h"
#include "common/sampleFormat.h"
#include "pcmEncoder.h" #include "pcmEncoder.h"
#include "oggEncoder.h" #include "oggEncoder.h"
#include <syslog.h> #include <syslog.h>
@ -44,8 +39,16 @@
#include <memory> #include <memory>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include "common/timeUtils.h"
#include "common/queue.h"
#include "common/signalHandler.h"
#include "common/utils.h"
#include "common/sampleFormat.h"
//#include "../server/pcmEncoder.h"
//#include "../server/oggEncoder.h"
#include "message.h" #include "message.h"
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
namespace po = boost::program_options; namespace po = boost::program_options;
@ -57,7 +60,7 @@ using namespace std::chrono;
bool g_terminated = false; bool g_terminated = false;
/*
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
TestMessage* chunk = new TestMessage(1, (char*)"Hallo"); TestMessage* chunk = new TestMessage(1, (char*)"Hallo");
@ -76,7 +79,7 @@ int main(int argc, char* argv[])
cout << "Header: " << chunk->type << ", " << chunk->size << ", " << (int)chunk->logLevel << ", " << chunk->text << "\n"; cout << "Header: " << chunk->type << ", " << chunk->size << ", " << (int)chunk->logLevel << ", " << chunk->text << "\n";
/* chunk->tv_sec = 21; chunk->tv_sec = 21;
chunk->tv_usec = 2; chunk->tv_usec = 2;
chunk->payloadSize = 5; chunk->payloadSize = 5;
chunk->payload = (char*)malloc(5); chunk->payload = (char*)malloc(5);
@ -92,23 +95,10 @@ cout << "4\n";
chunk->deserialize(stream); chunk->deserialize(stream);
cout << "5\n"; cout << "5\n";
cout << chunk->tv_sec << ", " << chunk->tv_usec << ", " << chunk->payloadSize << ", " << chunk->payload << "\n"; cout << chunk->tv_sec << ", " << chunk->tv_usec << ", " << chunk->payloadSize << ", " << chunk->payload << "\n";
*/
return 0; return 0;
} }
*/
/*
std::string return_current_time_and_date()
{
auto now = system_clock::now();
auto in_time_t = system_clock::to_time_t(now);
system_clock::duration ms = now.time_since_epoch();
char buff[20];
strftime(buff, 20, "%Y-%m-%d %H:%M:%S", localtime(&in_time_t));
stringstream ss;
ss << buff << "." << std::setw(3) << std::setfill('0') << ((ms / milliseconds(1)) % 1000);
return ss.str();
}
class Session class Session
@ -125,7 +115,7 @@ public:
for (;;) for (;;)
{ {
shared_ptr<Chunk> chunk(chunks.pop()); shared_ptr<Chunk> chunk(chunks.pop());
char* stream = chunk->serialize(); /* char* stream = chunk->serialize();
size_t written(0); size_t written(0);
size_t toWrite = sizeof(stream); size_t toWrite = sizeof(stream);
do do
@ -133,7 +123,7 @@ public:
written += boost::asio::write(*socket_, boost::asio::buffer(stream + written, toWrite - written));//, error); written += boost::asio::write(*socket_, boost::asio::buffer(stream + written, toWrite - written));//, error);
} }
while (written < toWrite); while (written < toWrite);
} */ }
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@ -188,7 +178,7 @@ public:
a.accept(*sock); a.accept(*sock);
// cout << "New connection: " << sock->remote_endpoint().address().to_string() << "\n"; // cout << "New connection: " << sock->remote_endpoint().address().to_string() << "\n";
Session* session = new Session(sock); Session* session = new Session(sock);
cout << "Sending header: " << headerChunk->wireChunk->length << "\n"; cout << "Sending header: " << headerChunk->payloadSize << "\n";
session->send(headerChunk); session->send(headerChunk);
session->start(); session->start();
sessions.insert(shared_ptr<Session>(session)); sessions.insert(shared_ptr<Session>(session));
@ -197,7 +187,7 @@ cout << "Sending header: " << headerChunk->wireChunk->length << "\n";
void setHeader(shared_ptr<Chunk> chunk) void setHeader(shared_ptr<Chunk> chunk)
{ {
if (chunk && (chunk->wireChunk != NULL)) if (chunk)
headerChunk = shared_ptr<Chunk>(chunk); headerChunk = shared_ptr<Chunk>(chunk);
} }
@ -262,25 +252,6 @@ private:
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
WireChunk* chunk = new WireChunk();
chunk->tv_sec = 21;
chunk->tv_usec = 2;
chunk->payloadSize = 5;
chunk->payload = (char*)malloc(5);
chunk->payload[0] = 99;
char* stream = chunk->serialize();
cout << "1\n";
for (size_t n=0; n<24; ++n)
cout << (int)stream[n] << " ";
delete chunk;
cout << "\n3\n";
chunk = new WireChunk();
cout << "4\n";
chunk->deserialize(stream);
cout << "5\n";
cout << chunk->tv_sec << ", " << chunk->tv_usec << ", " << chunk->payloadSize << ", " << chunk->payload << "\n";
return 0;
try try
{ {
string sampleFormat; string sampleFormat;
@ -331,7 +302,7 @@ return 0;
size_t duration = 50; size_t duration = 50;
SampleFormat format(sampleFormat); SampleFormat format(sampleFormat);
std::auto_ptr<Encoder> encoder; /* std::auto_ptr<Encoder> encoder;
if (codec == "ogg") if (codec == "ogg")
encoder.reset(new OggEncoder(sampleFormat)); encoder.reset(new OggEncoder(sampleFormat));
else if (codec == "pcm") else if (codec == "pcm")
@ -341,9 +312,9 @@ size_t duration = 50;
cout << "unknown codec: " << codec << "\n"; cout << "unknown codec: " << codec << "\n";
return 1; return 1;
} }
*/
shared_ptr<Chunk> header(new Chunk(format, encoder->getHeader())); // shared_ptr<Chunk> header(new Chunk(format, encoder->getHeader()));
server->setHeader(header); // server->setHeader(header);
while (!g_terminated) while (!g_terminated)
{ {
@ -354,14 +325,11 @@ size_t duration = 50;
while (true)//cin.good()) while (true)//cin.good())
{ {
chunk.reset(new Chunk(format, duration));//2*WIRE_CHUNK_SIZE)); chunk.reset(new Chunk(format, duration));//2*WIRE_CHUNK_SIZE));
WireChunk* wireChunk = chunk->wireChunk; int toRead = chunk->payloadSize;
int toRead = wireChunk->length;
// cout << "tr: " << toRead << ", size: " << WIRE_CHUNK_SIZE << "\t";
// char* payload = (char*)(&chunk->payload[0]);
int len = 0; int len = 0;
do do
{ {
int count = read(fd, wireChunk->payload + len, toRead - len); int count = read(fd, chunk->payload + len, toRead - len);
if (count <= 0) if (count <= 0)
throw ServerException("count = " + boost::lexical_cast<string>(count)); throw ServerException("count = " + boost::lexical_cast<string>(count));
@ -369,12 +337,12 @@ size_t duration = 50;
} }
while (len < toRead); while (len < toRead);
wireChunk->tv_sec = tvChunk.tv_sec; chunk->tv_sec = tvChunk.tv_sec;
wireChunk->tv_usec = tvChunk.tv_usec; chunk->tv_usec = tvChunk.tv_usec;
double chunkDuration = encoder->encode(chunk.get()); double chunkDuration = 50;//encoder->encode(chunk.get());
if (chunkDuration > 0) if (chunkDuration > 0)
server->send(chunk); server->send(chunk);
//cout << wireChunk->tv_sec << ", " << wireChunk->tv_usec / 1000 << "\n"; cout << chunk->tv_sec << ", " << chunk->tv_usec / 1000 << "\n";
// addUs(tvChunk, 1000*chunk->getDuration()); // addUs(tvChunk, 1000*chunk->getDuration());
addUs(tvChunk, chunkDuration * 1000); addUs(tvChunk, chunkDuration * 1000);
nextTick += duration; nextTick += duration;
@ -385,7 +353,6 @@ size_t duration = 50;
} }
else else
{ {
cin.sync();
gettimeofday(&tvChunk, NULL); gettimeofday(&tvChunk, NULL);
nextTick = getTickCount(); nextTick = getTickCount();
} }
@ -410,6 +377,6 @@ size_t duration = 50;
} }
*/