From 9ceb6b3533cbc8d7725797aea22d71a82e66dfb1 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef> Date: Thu, 28 Aug 2014 07:10:01 +0000 Subject: [PATCH] pcmEncoder git-svn-id: svn://elaine/murooma/trunk@214 d8a302eb-03bc-478d-80e4-98257eca68ef --- server/Makefile | 2 +- server/pcmEncoder.cpp | 18 ++++++++++++++++++ server/pcmEncoder.h | 16 ++++++++++++++++ server/snapServer.cpp | 5 ++++- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 server/pcmEncoder.cpp create mode 100644 server/pcmEncoder.h diff --git a/server/Makefile b/server/Makefile index c6a9ccde..a5b85fb6 100644 --- a/server/Makefile +++ b/server/Makefile @@ -3,7 +3,7 @@ CC = /usr/bin/g++ CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. LDFLAGS = -lrt -lpthread -lportaudio -lboost_system -lboost_program_options -OBJ = snapServer.o ../common/chunk.o ../common/sampleFormat.o +OBJ = snapServer.o pcmEncoder.o ../common/chunk.o ../common/sampleFormat.o BIN = snapserver all: server diff --git a/server/pcmEncoder.cpp b/server/pcmEncoder.cpp new file mode 100644 index 00000000..ddabb727 --- /dev/null +++ b/server/pcmEncoder.cpp @@ -0,0 +1,18 @@ +#include "pcmEncoder.h" + +PcmEncoder::PcmEncoder() +{ +} + + +void PcmEncoder::encode(Chunk* chunk) +{ + WireChunk* wireChunk = chunk->wireChunk; + for (size_t n=0; nlength; ++n) + wireChunk->payload[n] *= 1.5; +// return chunk; +} + + + + diff --git a/server/pcmEncoder.h b/server/pcmEncoder.h new file mode 100644 index 00000000..7ee245ed --- /dev/null +++ b/server/pcmEncoder.h @@ -0,0 +1,16 @@ +#ifndef PCM_ENCODER_H +#define PCM_ENCODER_H +#include "common/chunk.h" + + +class PcmEncoder +{ +public: + PcmEncoder(); + void encode(Chunk* chunk); +}; + + +#endif + + diff --git a/server/snapServer.cpp b/server/snapServer.cpp index a9e99827..ecd28cd4 100644 --- a/server/snapServer.cpp +++ b/server/snapServer.cpp @@ -26,6 +26,7 @@ #include "common/signalHandler.h" #include "common/utils.h" #include "common/sampleFormat.h" +#include "pcmEncoder.h" #include @@ -260,7 +261,8 @@ int main(int argc, char* argv[]) mkfifo(fifoName.c_str(), 0777); size_t duration = 50; - + + PcmEncoder pcmEncoder; SampleFormat format(sampleFormat); while (!g_terminated) { @@ -288,6 +290,7 @@ size_t duration = 50; wireChunk->tv_sec = tvChunk.tv_sec; wireChunk->tv_usec = tvChunk.tv_usec; + pcmEncoder.encode(chunk.get()); server->send(chunk); addMs(tvChunk, duration);