merge PR#4

This commit is contained in:
badaix 2019-11-01 23:07:32 +01:00
commit 0c7691756c
10 changed files with 235 additions and 7 deletions

View file

@ -0,0 +1,69 @@
/***
This file is part of snapcast
Copyright (C) 2015 Hannes Ellinger
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "opus_encoder.hpp"
#include "common/aixlog.hpp"
// const msg::SampleFormat& format);
OpusEncoderWrapper::OpusEncoderWrapper(const std::string& codecOptions) : Encoder(codecOptions)
{
headerChunk_.reset(new msg::CodecHeader("opus"));
// int error;
// enc = opus_encoder_create(format.rate, format.channels, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &error);
// if (error != 0)
// {
// LOG(ERROR) << "Failed to initialize opus encoder: " << error << '\n'
// << " Rate: " << format.rate << '\n'
// << " Channels: " << format.channels << '\n';
// }
}
void OpusEncoderWrapper::encode(const msg::PcmChunk* /*chunk*/)
{
// int samples = chunk->payloadSize / 4;
// opus_int16 pcm[samples * 2];
// unsigned char encoded[chunk->payloadSize];
// // get 16 bit samples
// for (int i = 0; i < samples * 2; i++)
// {
// pcm[i] = (opus_int16)(((opus_int16)chunk->payload[2 * i + 1] << 8) | (0x00ff & (opus_int16)chunk->payload[2 * i]));
// }
// // encode
// int len = opus_encode(enc, pcm, samples, encoded, chunk->payloadSize);
// // logD << "Encoded: size " << chunk->payloadSize << " bytes, encoded: " << len << " bytes" << '\n';
// if (len > 0)
// {
// // copy encoded data to chunk
// chunk->payloadSize = len;
// chunk->payload = (char*)realloc(chunk->payload, chunk->payloadSize);
// memcpy(chunk->payload, encoded, len);
// }
// else
// {
// LOG(ERROR) << "Failed to encode chunk: " << len << '\n' << " Frame size: " << samples / 2 << '\n' << " Max bytes: " << chunk->payloadSize << '\n';
// }
// // return chunk duration
// return (double)samples / ((double)sampleFormat.rate / 1000.);
}