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

opus add pseudo header and configurable options

Browse source
This commit is contained in:
badaix 2019-11-03 17:37:04 +01:00
parent 3fea89a60b
commit 6cd3b7df67
4 changed files with 155 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

96
server/encoder/opus_encoder.cpp
View file

@ -20,11 +20,27 @@
#include "common/aixlog.hpp"
#include "common/snap_exception.hpp"
#include "common/str_compat.hpp"
#include "common/utils/string_utils.hpp"
#define ID_OPUS 0x4F505553
namespace
{
template <typename T>
void assign(void* pointer, T val)
{
T* p = (T*)pointer;
*p = val;
}
} // namespace
// TODO:
// - handle variable chunk durations (now it's fixed to 10ms)
// const msg::SampleFormat& format);
OpusEncoder::OpusEncoder(const std::string& codecOptions) : Encoder(codecOptions), enc_(nullptr)
{
headerChunk_.reset(new msg::CodecHeader("opus"));
}
@ -35,6 +51,17 @@ OpusEncoder::~OpusEncoder()
}
std::string OpusEncoder::getAvailableOptions() const
{
return "BR:[6 - 512|MAX|AUTO],COMPLEXITY:[1-10]";
}
std::string OpusEncoder::getDefaultOptions() const
{
return "BR:192,COMPLEXITY:10";
}
std::string OpusEncoder::name() const
{
return "opus";
@ -43,13 +70,78 @@ std::string OpusEncoder::name() const
void OpusEncoder::initEncoder()
{
opus_int32 bitrate = 192000;
opus_int32 complexity = 10;
auto options = utils::string::split(codecOptions_, ',');
for (const auto& option : options)
{
auto kv = utils::string::split(option, ':');
if (kv.size() == 2)
{
if (kv.front() == "BR")
{
if (kv.back() == "MAX")
bitrate = OPUS_BITRATE_MAX;
else if (kv.back() == "AUTO")
bitrate = OPUS_AUTO;
else
{
try
{
bitrate = cpt::stoi(kv.back());
if ((bitrate < 6) || (bitrate > 512))
throw SnapException("Opus bitrate must be between 6 and 512");
bitrate *= 1000;
}
catch (const std::invalid_argument&)
{
throw SnapException("Opus error parsing bitrate (must be between 6 and 512): " + kv.back());
}
}
}
else if (kv.front() == "COMPLEXITY")
{
try
{
complexity = cpt::stoi(kv.back());
if ((complexity < 1) || (complexity > 10))
throw SnapException("Opus complexity must be between 1 and 10");
}
catch (const std::invalid_argument&)
{
throw SnapException("Opus error parsing complexity (must be between 1 and 10): " + kv.back());
}
}
else
throw SnapException("Opus unknown option: " + kv.front());
}
else
throw SnapException("Opus error parsing options: " + codecOptions_);
}
LOG(INFO) << "Opus bitrate: " << bitrate << " bps, complexity: " << complexity << "\n";
int error;
enc_ = opus_encoder_create(sampleFormat_.rate, sampleFormat_.channels, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &error);
if (error != 0)
{
throw SnapException("Failed to initialize opus encoder: " + cpt::to_string(error));
throw SnapException("Failed to initialize Opus encoder: " + cpt::to_string(error));
}
headerChunk_.reset(new msg::CodecHeader("opus"));
opus_encoder_ctl(enc_, OPUS_SET_BITRATE(bitrate)); // max 512000, OPUS_BITRATE_MAX, OPUS_AUTO
opus_encoder_ctl(enc_, OPUS_SET_COMPLEXITY(complexity)); // max 10
if ((sampleFormat_.rate != 48000) || (sampleFormat_.bits != 16) || (sampleFormat_.channels != 2))
throw SnapException("Opus sampleformat must be 48000:16:2");
// create some opus pseudo header to let the decoder know about the sample format
headerChunk_->payloadSize = 12;
headerChunk_->payload = (char*)malloc(headerChunk_->payloadSize);
char* payload = headerChunk_->payload;
assign(payload, SWAP_32(ID_OPUS));
assign(payload + 4, SWAP_32(sampleFormat_.rate));
assign(payload + 8, SWAP_16(sampleFormat_.bits));
assign(payload + 10, SWAP_16(sampleFormat_.channels));
}