Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 12:22:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rework plugins to allow different decoder/encoder instances per streams

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-07-10 16:49:03 -07:00
parent a71baf5601
commit ba6bb24595
11 changed files with 135 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/audio/AudioMixer.cpp
View file

@ -533,12 +533,16 @@ void AudioMixer::handleNegotiateAudioFormat(QSharedPointer<ReceivedMessage> mess
clientData->_codec = selectedCoded;
clientData->_selectedCodecName = selectedCodecName;
clientData->_encoder = selectedCoded->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::STEREO);
clientData->_decoder = selectedCoded->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
qDebug() << "selectedCodecName:" << selectedCodecName;
auto avatarAudioStream = clientData->getAvatarAudioStream();
if (avatarAudioStream) {
avatarAudioStream->_codec = selectedCoded;
avatarAudioStream->_selectedCodecName = selectedCodecName;
avatarAudioStream->_decoder = selectedCoded->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
}
auto replyPacket = NLPacket::create(PacketType::SelectedAudioFormat);
@ -777,7 +781,7 @@ void AudioMixer::broadcastMixes() {
QByteArray decocedBuffer(reinterpret_cast<char*>(_clampedSamples), AudioConstants::NETWORK_FRAME_BYTES_STEREO);
QByteArray encodedBuffer;
if (nodeData->_codec) {
nodeData->_codec->encode(decocedBuffer, encodedBuffer);
nodeData->_encoder->encode(decocedBuffer, encodedBuffer);
} else {
encodedBuffer = decocedBuffer;
}

11
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -39,6 +39,14 @@ AudioMixerClientData::AudioMixerClientData(const QUuid& nodeID) :
_frameToSendStats = distribution(numberGenerator);
}
AudioMixerClientData::~AudioMixerClientData() {
if (_codec) {
_codec->releaseDecoder(_decoder);
_codec->releaseEncoder(_encoder);
}
}
AvatarAudioStream* AudioMixerClientData::getAvatarAudioStream() {
QReadLocker readLocker { &_streamsLock };
@ -104,6 +112,9 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
auto avatarAudioStream = new AvatarAudioStream(isStereo, AudioMixer::getStreamSettings());
avatarAudioStream->_codec = _codec;
avatarAudioStream->_selectedCodecName = _selectedCodecName;
if (_codec) {
avatarAudioStream->_decoder = _codec->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
}
qDebug() << "creating new AvatarAudioStream... codec:" << avatarAudioStream->_selectedCodecName;
auto emplaced = _audioStreams.emplace(

3
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -29,6 +29,7 @@ class AudioMixerClientData : public NodeData {
Q_OBJECT
public:
AudioMixerClientData(const QUuid& nodeID);
~AudioMixerClientData();
using SharedStreamPointer = std::shared_ptr<PositionalAudioStream>;
using AudioStreamMap = std::unordered_map<QUuid, SharedStreamPointer>;
@ -70,6 +71,8 @@ public:
// FIXME -- maybe make these private
CodecPluginPointer _codec;
QString _selectedCodecName;
Encoder* _encoder { nullptr }; // for outbound mixed stream
Decoder* _decoder { nullptr }; // for mic stream
signals:

10
libraries/audio-client/src/AudioClient.cpp
View file

@ -536,6 +536,8 @@ void AudioClient::handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> mess
for (auto& plugin : codecPlugins) {
if (_selectedCodecName == plugin->getName()) {
_receivedAudioStream._codec = _codec = plugin;
_receivedAudioStream._decoder = plugin->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::STEREO);
_encoder = plugin->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
qDebug() << "Selected Codec Plugin:" << _codec.get();
break;
}
@ -815,8 +817,8 @@ void AudioClient::handleAudioInput() {
// TODO - codec encode goes here
QByteArray decocedBuffer(reinterpret_cast<char*>(networkAudioSamples), numNetworkBytes);
QByteArray encodedBuffer;
if (_codec) {
_codec->encode(decocedBuffer, encodedBuffer);
if (_encoder) {
_encoder->encode(decocedBuffer, encodedBuffer);
} else {
encodedBuffer = decocedBuffer;
}
@ -833,8 +835,8 @@ void AudioClient::handleRecordedAudioInput(const QByteArray& audio) {
// TODO - codec encode goes here
QByteArray encodedBuffer;
if (_codec) {
_codec->encode(audio, encodedBuffer);
if (_encoder) {
_encoder->encode(audio, encodedBuffer);
} else {
encodedBuffer = audio;
}

1
libraries/audio-client/src/AudioClient.h
View file

@ -299,6 +299,7 @@ private:
CodecPluginPointer _codec;
QString _selectedCodecName;
Encoder* _encoder { nullptr }; // for outbound mic stream
};

4
libraries/audio/src/InboundAudioStream.cpp
View file

@ -179,8 +179,8 @@ int InboundAudioStream::parseStreamProperties(PacketType type, const QByteArray&
int InboundAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties) {
QByteArray decodedBuffer;
if (_codec) {
_codec->decode(packetAfterStreamProperties, decodedBuffer);
if (_decoder) {
_decoder->decode(packetAfterStreamProperties, decodedBuffer);
} else {
decodedBuffer = packetAfterStreamProperties;
}

1
libraries/audio/src/InboundAudioStream.h
View file

@ -179,6 +179,7 @@ public:
// FIXME -- maybe make these private
CodecPluginPointer _codec;
QString _selectedCodecName;
Decoder* _decoder { nullptr };
public slots:
/// This function should be called every second for all the stats to function properly. If dynamic jitter buffers

4
libraries/audio/src/MixedProcessedAudioStream.cpp
View file

@ -44,8 +44,8 @@ int MixedProcessedAudioStream::writeLastFrameRepeatedWithFade(int samples) {
int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties) {
QByteArray decodedBuffer;
if (_codec) {
_codec->decode(packetAfterStreamProperties, decodedBuffer);
if (_decoder) {
_decoder->decode(packetAfterStreamProperties, decodedBuffer);
} else {
decodedBuffer = packetAfterStreamProperties;
}

18
libraries/plugins/src/plugins/CodecPlugin.h
View file

@ -12,9 +12,23 @@
#include "Plugin.h"
class CodecPlugin : public Plugin {
class Encoder {
public:
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) = 0;
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) = 0;
};
class Decoder {
public:
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) = 0;
// numFrames - number of samples (mono) or sample-pairs (stereo)
virtual void trackLostFrames(int numFrames) = 0;
};
class CodecPlugin : public Plugin {
public:
virtual Encoder* createEncoder(int sampleRate, int numChannels) = 0;
virtual Decoder* createDecoder(int sampleRate, int numChannels) = 0;
virtual void releaseEncoder(Encoder* encoder) = 0;
virtual void releaseDecoder(Decoder* decoder) = 0;
};

64
plugins/pcmCodec/src/PCMCodecManager.cpp
View file

@ -37,15 +37,54 @@ bool PCMCodec::isSupported() const {
return true;
}
class PCMEncoder : public Encoder {
public:
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) override {
encodedBuffer = decodedBuffer;
}
};
void PCMCodec::decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) {
decodedBuffer = encodedBuffer;
class PCMDecoder : public Decoder {
public:
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) override {
decodedBuffer = encodedBuffer;
}
virtual void trackLostFrames(int numFrames) override { }
};
Encoder* PCMCodec::createEncoder(int sampleRate, int numChannels) {
return new PCMEncoder();
}
void PCMCodec::encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) {
encodedBuffer = decodedBuffer;
Decoder* PCMCodec::createDecoder(int sampleRate, int numChannels) {
return new PCMDecoder();
}
void PCMCodec::releaseEncoder(Encoder* encoder) {
delete encoder;
}
void PCMCodec::releaseDecoder(Decoder* decoder) {
delete decoder;
}
class zLibEncoder : public Encoder {
public:
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) override {
encodedBuffer = qCompress(decodedBuffer);
}
};
class zLibDecoder : public Decoder {
public:
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) override {
decodedBuffer = qUncompress(encodedBuffer);
}
virtual void trackLostFrames(int numFrames) override { }
};
const QString zLibCodec::NAME = "zlib";
@ -69,10 +108,19 @@ bool zLibCodec::isSupported() const {
return true;
}
void zLibCodec::decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) {
decodedBuffer = qUncompress(encodedBuffer);
Encoder* zLibCodec::createEncoder(int sampleRate, int numChannels) {
return new zLibEncoder();
}
void zLibCodec::encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) {
encodedBuffer = qCompress(decodedBuffer);
Decoder* zLibCodec::createDecoder(int sampleRate, int numChannels) {
return new zLibDecoder();
}
void zLibCodec::releaseEncoder(Encoder* encoder) {
delete encoder;
}
void zLibCodec::releaseDecoder(Decoder* decoder) {
delete decoder;
}

37
plugins/pcmCodec/src/PCMCodecManager.h
View file

@ -12,9 +12,31 @@
#ifndef hifi__PCMCodecManager_h
#define hifi__PCMCodecManager_h
#include <plugins/CodecPlugin.h>
/*
class Encoder {
public:
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) = 0;
};
class Decoder {
public:
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) = 0;
// numFrames - number of samples (mono) or sample-pairs (stereo)
virtual void trackLostFrames(int numFrames) = 0;
};
class CodecPlugin : public Plugin {
public:
virtual Encoder* createEncoder(int sampleRate, int numChannels) = 0;
virtual Decoder* createDecoder(int sampleRate, int numChannels) = 0;
virtual void releaseEncoder(Encoder* encoder) = 0;
virtual void releaseDecoder(Decoder* decoder) = 0;
};
*/
class PCMCodec : public CodecPlugin {
Q_OBJECT
@ -31,8 +53,10 @@ public:
/// Called when a plugin is no longer being used. May be called multiple times.
void deactivate() override;
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) override;
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) override;
virtual Encoder* createEncoder(int sampleRate, int numChannels) override;
virtual Decoder* createDecoder(int sampleRate, int numChannels) override;
virtual void releaseEncoder(Encoder* encoder) override;
virtual void releaseDecoder(Decoder* decoder) override;
private:
static const QString NAME;
@ -54,8 +78,11 @@ public:
/// Called when a plugin is no longer being used. May be called multiple times.
void deactivate() override;
virtual void decode(const QByteArray& encodedBuffer, QByteArray& decodedBuffer) override;
virtual void encode(const QByteArray& decodedBuffer, QByteArray& encodedBuffer) override;
virtual Encoder* createEncoder(int sampleRate, int numChannels) override;
virtual Decoder* createDecoder(int sampleRate, int numChannels) override;
virtual void releaseEncoder(Encoder* encoder) override;
virtual void releaseDecoder(Decoder* decoder) override;
private:
static const QString NAME;