mirror of
https://github.com/badaix/snapcast.git
synced 2025-05-25 15:06:21 +02:00
decoder gets sample format from header
This commit is contained in:
badaix
parent
1d1ef239b2
commit
eed7f287fb
10 changed files with 216 additions and 114 deletions
|
|
@ -36,7 +36,7 @@
|
|||
using namespace std;
|
||||
|
||||
|
||||
Controller::Controller() : MessageReceiver(), active_(false), sampleFormat_(NULL), decoder_(NULL), player_(nullptr), asyncException_(false)
|
||||
Controller::Controller() : MessageReceiver(), active_(false), stream_(NULL), decoder_(NULL), player_(nullptr), asyncException_(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -55,9 +55,9 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
|
|||
{
|
||||
if ((stream_ != NULL) && (decoder_ != NULL))
|
||||
{
|
||||
msg::PcmChunk* pcmChunk = new msg::PcmChunk(*sampleFormat_, 0);
|
||||
msg::PcmChunk* pcmChunk = new msg::PcmChunk(sampleFormat_, 0);
|
||||
pcmChunk->deserialize(baseMessage, buffer);
|
||||
//logD << "chunk: " << pcmChunk->payloadSize;
|
||||
// logD << "chunk: " << pcmChunk->payloadSize << ", sampleFormat: " << sampleFormat_.rate << "\n";
|
||||
if (decoder_->decode(pcmChunk))
|
||||
{
|
||||
//TODO: do decoding in thread?
|
||||
|
|
@ -146,9 +146,9 @@ void Controller::worker()
|
|||
while (active_ && !(serverSettings = clientConnection_->sendReq<msg::ServerSettings>(&requestMsg)));
|
||||
logO << "ServerSettings - buffer: " << serverSettings->bufferMs << ", latency: " << serverSettings->latency << ", volume: " << serverSettings->volume << ", muted: " << serverSettings->muted << "\n";
|
||||
|
||||
requestMsg.request = kSampleFormat;
|
||||
while (active_ && !(sampleFormat_ = clientConnection_->sendReq<msg::SampleFormat>(&requestMsg)));
|
||||
logO << "SampleFormat rate: " << sampleFormat_->rate << ", bits: " << sampleFormat_->bits << ", channels: " << sampleFormat_->channels << "\n";
|
||||
// requestMsg.request = kSampleFormat;
|
||||
// while (active_ && !(sampleFormat_ = clientConnection_->sendReq<msg::SampleFormat>(&requestMsg)));
|
||||
// logO << "SampleFormat rate: " << sampleFormat_->rate << ", bits: " << sampleFormat_->bits << ", channels: " << sampleFormat_->channels << "\n";
|
||||
|
||||
requestMsg.request = kHeader;
|
||||
shared_ptr<msg::Header> headerChunk(NULL);
|
||||
|
|
@ -162,7 +162,10 @@ void Controller::worker()
|
|||
#endif
|
||||
else if (headerChunk->codec == "flac")
|
||||
decoder_ = new FlacDecoder();
|
||||
decoder_->setHeader(headerChunk.get());
|
||||
sampleFormat_ = decoder_->setHeader(headerChunk.get());
|
||||
logO << "sample rate : " << sampleFormat_.rate << "Hz\n";
|
||||
logO << "bits per sample: " << sampleFormat_.bits << "\n";
|
||||
logO << "channels : " << sampleFormat_.channels << "\n";
|
||||
|
||||
msg::Request timeReq(kTime);
|
||||
for (size_t n=0; n<50 && active_; ++n)
|
||||
|
|
@ -177,7 +180,7 @@ void Controller::worker()
|
|||
}
|
||||
logO << "diff to server [ms]: " << (float)TimeProvider::getInstance().getDiffToServer<chronos::usec>().count() / 1000.f << "\n";
|
||||
|
||||
stream_ = new Stream(*sampleFormat_);
|
||||
stream_ = new Stream(sampleFormat_);
|
||||
stream_->setBufferLen(serverSettings->bufferMs - latency_);
|
||||
|
||||
#ifndef ANDROID
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ private:
|
|||
ClientConnection* clientConnection_;
|
||||
Stream* stream_;
|
||||
std::string ip_;
|
||||
std::shared_ptr<msg::SampleFormat> sampleFormat_;
|
||||
msg::SampleFormat sampleFormat_;
|
||||
Decoder* decoder_;
|
||||
PcmDevice pcmDevice_;
|
||||
size_t latency_;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#define DECODER_H
|
||||
#include "message/pcmChunk.h"
|
||||
#include "message/header.h"
|
||||
#include "message/sampleFormat.h"
|
||||
|
||||
|
||||
class Decoder
|
||||
{
|
||||
|
|
@ -27,7 +29,7 @@ public:
|
|||
Decoder() {};
|
||||
virtual ~Decoder() {};
|
||||
virtual bool decode(msg::PcmChunk* chunk) = 0;
|
||||
virtual bool setHeader(msg::Header* chunk) = 0;
|
||||
virtual msg::SampleFormat setHeader(msg::Header* chunk) = 0;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include <cmath>
|
||||
#include <FLAC/stream_decoder.h>
|
||||
#include "flacDecoder.h"
|
||||
#include "common/snapException.h"
|
||||
#include "common/log.h"
|
||||
|
||||
|
||||
|
|
@ -36,9 +37,11 @@ static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecod
|
|||
static msg::Header* flacHeader = NULL;
|
||||
static msg::PcmChunk* flacChunk = NULL;
|
||||
static msg::PcmChunk* pcmChunk = NULL;
|
||||
static msg::SampleFormat sampleFormat;
|
||||
static FLAC__StreamDecoder *decoder = NULL;
|
||||
|
||||
|
||||
|
||||
FlacDecoder::FlacDecoder() : Decoder()
|
||||
{
|
||||
flacChunk = new msg::PcmChunk();
|
||||
|
|
@ -78,28 +81,25 @@ bool FlacDecoder::decode(msg::PcmChunk* chunk)
|
|||
}
|
||||
|
||||
|
||||
bool FlacDecoder::setHeader(msg::Header* chunk)
|
||||
msg::SampleFormat FlacDecoder::setHeader(msg::Header* chunk)
|
||||
{
|
||||
flacHeader = chunk;
|
||||
FLAC__bool ok = true;
|
||||
FLAC__StreamDecoderInitStatus init_status;
|
||||
|
||||
if ((decoder = FLAC__stream_decoder_new()) == NULL)
|
||||
{
|
||||
logS(kLogErr) << "ERROR: allocating decoder\n";
|
||||
return false;
|
||||
}
|
||||
throw SnapException("ERROR: allocating decoder");
|
||||
|
||||
// (void)FLAC__stream_decoder_set_md5_checking(decoder, true);
|
||||
init_status = FLAC__stream_decoder_init_stream(decoder, read_callback, NULL, NULL, NULL, NULL, write_callback, metadata_callback, error_callback, this);
|
||||
if (init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK)
|
||||
{
|
||||
logS(kLogErr) << "ERROR: initializing decoder: " << FLAC__StreamDecoderInitStatusString[init_status] << "\n";
|
||||
ok = false;
|
||||
}
|
||||
FLAC__stream_decoder_process_until_end_of_metadata(decoder);
|
||||
throw SnapException("ERROR: initializing decoder: " + string(FLAC__StreamDecoderInitStatusString[init_status]));
|
||||
|
||||
return ok;
|
||||
sampleFormat.rate = 0;
|
||||
FLAC__stream_decoder_process_until_end_of_metadata(decoder);
|
||||
if (sampleFormat.rate == 0)
|
||||
throw SnapException("Sample format not found");
|
||||
|
||||
return sampleFormat;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -179,9 +179,10 @@ void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMet
|
|||
if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
|
||||
{
|
||||
((FlacDecoder*)client_data)->cacheInfo_.sampleRate_ = metadata->data.stream_info.sample_rate;
|
||||
logO << "sample rate : " << metadata->data.stream_info.sample_rate << "Hz\n";
|
||||
logO << "bits per sample: " << metadata->data.stream_info.bits_per_sample << "\n";
|
||||
logO << "channels : " << metadata->data.stream_info.channels << "\n";
|
||||
sampleFormat.setFormat(
|
||||
metadata->data.stream_info.sample_rate,
|
||||
metadata->data.stream_info.bits_per_sample,
|
||||
metadata->data.stream_info.channels);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
FlacDecoder();
|
||||
virtual ~FlacDecoder();
|
||||
virtual bool decode(msg::PcmChunk* chunk);
|
||||
virtual bool setHeader(msg::Header* chunk);
|
||||
virtual msg::SampleFormat setHeader(msg::Header* chunk);
|
||||
|
||||
CacheInfo cacheInfo_;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,12 +16,15 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "oggDecoder.h"
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
#include <cmath>
|
||||
#include <vorbis/vorbisenc.h>
|
||||
|
||||
#include "oggDecoder.h"
|
||||
#include "common/snapException.h"
|
||||
#include "common/log.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
@ -71,7 +74,7 @@ bool OggDecoder::decode(msg::PcmChunk* chunk)
|
|||
if(result < 0)
|
||||
{
|
||||
/* missing or corrupt data at this page position */
|
||||
fprintf(stderr,"Corrupt or missing data in bitstream; continuing...\n");
|
||||
logE << "Corrupt or missing data in bitstream; continuing...\n";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -140,7 +143,7 @@ bool OggDecoder::decode(msg::PcmChunk* chunk)
|
|||
}
|
||||
|
||||
|
||||
bool OggDecoder::setHeader(msg::Header* chunk)
|
||||
msg::SampleFormat OggDecoder::setHeader(msg::Header* chunk)
|
||||
{
|
||||
bytes = chunk->payloadSize;
|
||||
buffer=ogg_sync_buffer(&oy, bytes);
|
||||
|
|
@ -148,33 +151,20 @@ bool OggDecoder::setHeader(msg::Header* chunk)
|
|||
ogg_sync_wrote(&oy, bytes);
|
||||
|
||||
if (ogg_sync_pageout(&oy, &og) != 1)
|
||||
{
|
||||
fprintf(stderr,"Input does not appear to be an Ogg bitstream.\n");
|
||||
return false;
|
||||
}
|
||||
throw SnapException("Input does not appear to be an Ogg bitstream");
|
||||
|
||||
ogg_stream_init(&os,ogg_page_serialno(&og));
|
||||
|
||||
vorbis_info_init(&vi);
|
||||
vorbis_comment_init(&vc);
|
||||
if (ogg_stream_pagein(&os, &og) < 0)
|
||||
{
|
||||
fprintf(stderr,"Error reading first page of Ogg bitstream data.\n");
|
||||
return false;
|
||||
}
|
||||
throw SnapException("Error reading first page of Ogg bitstream data");
|
||||
|
||||
if (ogg_stream_packetout(&os, &op) != 1)
|
||||
{
|
||||
fprintf(stderr,"Error reading initial header packet.\n");
|
||||
return false;
|
||||
}
|
||||
throw SnapException("Error reading initial header packet");
|
||||
|
||||
if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
|
||||
{
|
||||
fprintf(stderr,"This Ogg bitstream does not contain Vorbis audio data.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
throw SnapException("This Ogg bitstream does not contain Vorbis audio data");
|
||||
|
||||
int i(0);
|
||||
while (i < 2)
|
||||
|
|
@ -194,19 +184,15 @@ bool OggDecoder::setHeader(msg::Header* chunk)
|
|||
result=ogg_stream_packetout(&os, &op);
|
||||
if (result == 0)
|
||||
break;
|
||||
/// Uh oh; data at some point was corrupted or missing!
|
||||
/// We can't tolerate that in a header. Die. */
|
||||
if (result < 0)
|
||||
{
|
||||
/* Uh oh; data at some point was corrupted or missing!
|
||||
We can't tolerate that in a header. Die. */
|
||||
fprintf(stderr,"Corrupt secondary header. Exiting.\n");
|
||||
return false;
|
||||
}
|
||||
throw SnapException("Corrupt secondary header. Exiting.");
|
||||
|
||||
result=vorbis_synthesis_headerin(&vi, &vc, &op);
|
||||
if (result < 0)
|
||||
{
|
||||
fprintf(stderr,"Corrupt secondary header. Exiting.\n");
|
||||
return false;
|
||||
}
|
||||
throw SnapException("Corrupt secondary header. Exiting.");
|
||||
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
|
@ -220,18 +206,19 @@ bool OggDecoder::setHeader(msg::Header* chunk)
|
|||
fprintf(stderr,"%s\n",*ptr);
|
||||
++ptr;
|
||||
}
|
||||
fprintf(stderr,"\nBitstream is %d channel, %ldHz\n",vi.channels,vi.rate);
|
||||
fprintf(stderr,"Encoded by: %s\n\n",vc.vendor);
|
||||
|
||||
/* OK, got and parsed all three headers. Initialize the Vorbis
|
||||
packet->PCM decoder. */
|
||||
if(vorbis_synthesis_init(&vd,&vi)==0) /* central decode state */
|
||||
vorbis_block_init(&vd,&vb); /* local state for most of the decode
|
||||
so multiple block decodes can
|
||||
proceed in parallel. We could init
|
||||
multiple vorbis_block structures
|
||||
for vd here */
|
||||
return false;
|
||||
logE << "Encoded by: " << vc.vendor << "\n";
|
||||
|
||||
/// OK, got and parsed all three headers. Initialize the Vorbis packet->PCM decoder.
|
||||
if (vorbis_synthesis_init(&vd, &vi) == 0)
|
||||
vorbis_block_init(&vd, &vb);
|
||||
/// central decode state
|
||||
/// local state for most of the decode so multiple block decodes can proceed
|
||||
/// in parallel. We could init multiple vorbis_block structures for vd here
|
||||
|
||||
|
||||
msg::SampleFormat sampleFormat(vi.rate, 16, vi.channels);
|
||||
return sampleFormat;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,24 +28,22 @@ public:
|
|||
OggDecoder();
|
||||
virtual ~OggDecoder();
|
||||
virtual bool decode(msg::PcmChunk* chunk);
|
||||
virtual bool setHeader(msg::Header* chunk);
|
||||
virtual msg::SampleFormat setHeader(msg::Header* chunk);
|
||||
|
||||
private:
|
||||
bool decodePayload(msg::PcmChunk* chunk);
|
||||
|
||||
ogg_sync_state oy; /* sync and verify incoming physical bitstream */
|
||||
ogg_stream_state os; /* take physical pages, weld into a logical
|
||||
stream of packets */
|
||||
ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */
|
||||
ogg_packet op; /* one raw packet of data for decode */
|
||||
ogg_sync_state oy; /// sync and verify incoming physical bitstream
|
||||
ogg_stream_state os; /// take physical pages, weld into a logical stream of packets
|
||||
ogg_page og; /// one Ogg bitstream page. Vorbis packets are inside
|
||||
ogg_packet op; /// one raw packet of data for decode
|
||||
|
||||
vorbis_info vi; /* struct that stores all the static vorbis bitstream
|
||||
settings */
|
||||
vorbis_comment vc; /* struct that stores all the bitstream user comments */
|
||||
vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
|
||||
vorbis_block vb; /* local working space for packet->PCM decode */
|
||||
vorbis_info vi; /// struct that stores all the static vorbis bitstream settings
|
||||
vorbis_comment vc; /// struct that stores all the bitstream user comments
|
||||
vorbis_dsp_state vd; /// central working state for the packet->PCM decoder
|
||||
vorbis_block vb; /// local working space for packet->PCM decode
|
||||
|
||||
ogg_int16_t* convbuffer; /* take 8k out of the data segment, not the stack */
|
||||
ogg_int16_t* convbuffer; /// take 8k out of the data segment, not the stack
|
||||
int convsize;
|
||||
|
||||
char *buffer;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,42 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "common/snapException.h"
|
||||
#include "common/log.h"
|
||||
#include "pcmDecoder.h"
|
||||
|
||||
|
||||
#define ID_RIFF 0x46464952
|
||||
#define ID_WAVE 0x45564157
|
||||
#define ID_FMT 0x20746d66
|
||||
#define ID_DATA 0x61746164
|
||||
|
||||
struct riff_wave_header
|
||||
{
|
||||
uint32_t riff_id;
|
||||
uint32_t riff_sz;
|
||||
uint32_t wave_id;
|
||||
};
|
||||
|
||||
|
||||
struct chunk_header
|
||||
{
|
||||
uint32_t id;
|
||||
uint32_t sz;
|
||||
};
|
||||
|
||||
|
||||
struct chunk_fmt
|
||||
{
|
||||
uint16_t audio_format;
|
||||
uint16_t num_channels;
|
||||
uint32_t sample_rate;
|
||||
uint32_t byte_rate;
|
||||
uint16_t block_align;
|
||||
uint16_t bits_per_sample;
|
||||
};
|
||||
|
||||
|
||||
PcmDecoder::PcmDecoder() : Decoder()
|
||||
{
|
||||
}
|
||||
|
|
@ -29,9 +63,61 @@ bool PcmDecoder::decode(msg::PcmChunk* chunk)
|
|||
}
|
||||
|
||||
|
||||
bool PcmDecoder::setHeader(msg::Header* chunk)
|
||||
msg::SampleFormat PcmDecoder::setHeader(msg::Header* chunk)
|
||||
{
|
||||
return true;
|
||||
if (chunk->payloadSize < 44)
|
||||
throw SnapException("PCM header too small");
|
||||
|
||||
struct riff_wave_header riff_wave_header;
|
||||
struct chunk_header chunk_header;
|
||||
struct chunk_fmt chunk_fmt;
|
||||
chunk_fmt.sample_rate = 0;
|
||||
|
||||
size_t pos(0);
|
||||
memcpy(&riff_wave_header, chunk->payload + pos, sizeof(riff_wave_header));
|
||||
pos += sizeof(riff_wave_header);
|
||||
if ((riff_wave_header.riff_id != ID_RIFF) || (riff_wave_header.wave_id != ID_WAVE))
|
||||
throw SnapException("Not a riff/wave header");
|
||||
|
||||
bool moreChunks(true);
|
||||
do
|
||||
{
|
||||
if (pos + sizeof(chunk_header) > chunk->payloadSize)
|
||||
throw SnapException("riff/wave header incomplete");
|
||||
memcpy(&chunk_header, chunk->payload + pos, sizeof(chunk_header));
|
||||
pos += sizeof(chunk_header);
|
||||
switch (chunk_header.id)
|
||||
{
|
||||
case ID_FMT:
|
||||
if (pos + sizeof(chunk_fmt) > chunk->payloadSize)
|
||||
throw SnapException("riff/wave header incomplete");
|
||||
memcpy(&chunk_fmt, chunk->payload + pos, sizeof(chunk_fmt));
|
||||
pos += sizeof(chunk_fmt);
|
||||
/// If the format header is larger, skip the rest
|
||||
if (chunk_header.sz > sizeof(chunk_fmt))
|
||||
pos += (chunk_header.sz - sizeof(chunk_fmt));
|
||||
break;
|
||||
case ID_DATA:
|
||||
/// Stop looking for chunks
|
||||
moreChunks = false;
|
||||
break;
|
||||
default:
|
||||
/// Unknown chunk, skip bytes
|
||||
pos += chunk_header.sz;
|
||||
}
|
||||
}
|
||||
while (moreChunks);
|
||||
|
||||
|
||||
if (chunk_fmt.sample_rate == 0)
|
||||
throw SnapException("Sample format not found");
|
||||
|
||||
msg::SampleFormat sampleFormat(
|
||||
chunk_fmt.sample_rate,
|
||||
chunk_fmt.bits_per_sample,
|
||||
chunk_fmt.num_channels);
|
||||
|
||||
return sampleFormat;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class PcmDecoder : public Decoder
|
|||
public:
|
||||
PcmDecoder();
|
||||
virtual bool decode(msg::PcmChunk* chunk);
|
||||
virtual bool setHeader(msg::Header* chunk);
|
||||
virtual msg::SampleFormat setHeader(msg::Header* chunk);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <memory>
|
||||
#include "pcmEncoder.h"
|
||||
|
||||
|
||||
PcmEncoder::PcmEncoder(const std::string& codecOptions) : Encoder(codecOptions)
|
||||
{
|
||||
headerChunk_ = new msg::Header("pcm");
|
||||
|
|
@ -34,6 +35,30 @@ void PcmEncoder::encode(const msg::PcmChunk* chunk)
|
|||
|
||||
void PcmEncoder::initEncoder()
|
||||
{
|
||||
//TODO: Endianess
|
||||
headerChunk_->payloadSize = 44;
|
||||
headerChunk_->payload = (char*)malloc(headerChunk_->payloadSize);
|
||||
memcpy(headerChunk_->payload, "RIFF", 4);
|
||||
uint32_t int32 = 36;
|
||||
memcpy(headerChunk_->payload + 4, reinterpret_cast<const char *>(&int32), sizeof(uint32_t));
|
||||
memcpy(headerChunk_->payload + 8, "WAVEfmt ", 8);
|
||||
int32 = 16;
|
||||
memcpy(headerChunk_->payload + 16, reinterpret_cast<const char *>(&int32), sizeof(uint32_t));
|
||||
uint16_t int16 = 1;
|
||||
memcpy(headerChunk_->payload + 20, reinterpret_cast<const char *>(&int16), sizeof(uint16_t));
|
||||
int16 = sampleFormat_.channels;
|
||||
memcpy(headerChunk_->payload + 22, reinterpret_cast<const char *>(&int16), sizeof(uint16_t));
|
||||
int32 = sampleFormat_.rate;
|
||||
memcpy(headerChunk_->payload + 24, reinterpret_cast<const char *>(&int32), sizeof(uint32_t));
|
||||
int32 = sampleFormat_.rate * sampleFormat_.bits * sampleFormat_.channels / 8;
|
||||
memcpy(headerChunk_->payload + 28, reinterpret_cast<const char *>(&int32), sizeof(uint32_t));
|
||||
int16 = sampleFormat_.channels * ((sampleFormat_.bits + 7) / 8);
|
||||
memcpy(headerChunk_->payload + 32, reinterpret_cast<const char *>(&int16), sizeof(uint16_t));
|
||||
int16 = sampleFormat_.bits;
|
||||
memcpy(headerChunk_->payload + 34, reinterpret_cast<const char *>(&int16), sizeof(uint16_t));
|
||||
memcpy(headerChunk_->payload + 36, "data", 4);
|
||||
int32 = 0;
|
||||
memcpy(headerChunk_->payload + 40, reinterpret_cast<const char *>(&int32), sizeof(uint32_t));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue