Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10796 from birarda/bug/audio-codec-replication

Browse source 
check for codec changes for replicated agents
This commit is contained in:
Clément Brisset 2017-06-22 16:51:40 -07:00 committed by GitHub
commit 3ea7b82d61
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,13 +67,9 @@ void AudioMixerClientData::processPackets() {
case PacketType::MicrophoneAudioNoEcho: case PacketType::MicrophoneAudioNoEcho:
case PacketType::MicrophoneAudioWithEcho: case PacketType::MicrophoneAudioWithEcho:
case PacketType::InjectAudio: case PacketType::InjectAudio:
case PacketType::SilentAudioFrame: case PacketType::SilentAudioFrame: {
case PacketType::ReplicatedMicrophoneAudioNoEcho:
case PacketType::ReplicatedMicrophoneAudioWithEcho:
case PacketType::ReplicatedInjectAudio:
case PacketType::ReplicatedSilentAudioFrame: {
if (node->isUpstream() && !_hasSetupCodecForUpstreamNode) { if (node->isUpstream()) {
setupCodecForReplicatedAgent(packet); setupCodecForReplicatedAgent(packet);
} }
@ -692,14 +688,14 @@ void AudioMixerClientData::setupCodecForReplicatedAgent(QSharedPointer<ReceivedM
// pull the codec string from the packet // pull the codec string from the packet
auto codecString = message->readString(); auto codecString = message->readString();
if (codecString != _selectedCodecName) {
qDebug() << "Manually setting codec for replicated agent" << uuidStringWithoutCurlyBraces(getNodeID()) qDebug() << "Manually setting codec for replicated agent" << uuidStringWithoutCurlyBraces(getNodeID())
<< "-" << codecString; << "-" << codecString;
const std::pair<QString, CodecPluginPointer> codec = AudioMixer::negotiateCodec({ codecString }); const std::pair<QString, CodecPluginPointer> codec = AudioMixer::negotiateCodec({ codecString });
setupCodec(codec.second, codec.first); setupCodec(codec.second, codec.first);
_hasSetupCodecForUpstreamNode = true;
// seek back to the beginning of the message so other readers are in the right place // seek back to the beginning of the message so other readers are in the right place
message->seek(0); message->seek(0);
}
} }

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

@ -184,8 +184,6 @@ private:
bool _shouldMuteClient { false }; bool _shouldMuteClient { false };
bool _requestsDomainListData { false }; bool _requestsDomainListData { false };
bool _hasSetupCodecForUpstreamNode { false };
}; };
#endif // hifi_AudioMixerClientData_h #endif // hifi_AudioMixerClientData_h