Merge pull request #8348 from ZappoMan/beltAndSuspenders

implement codec renegotiation in client

assignment-client/src/audio/AudioMixerClientData.cpp

@@ -113,7 +113,7 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
                 avatarAudioStream->setupCodec(_codec, _selectedCodecName, AudioConstants::MONO);
                 qDebug() << "creating new AvatarAudioStream... codec:" << _selectedCodecName;
 
-                connect(avatarAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioMixerClientData::sendSelectAudioFormat);
+                connect(avatarAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioMixerClientData::handleMismatchAudioFormat);
 
                 auto emplaced = _audioStreams.emplace(
                     QUuid(),
@@ -345,6 +345,11 @@ QJsonObject AudioMixerClientData::getAudioStreamStats() {
     return result;
 }
 
+void AudioMixerClientData::handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec) {
+    qDebug() << __FUNCTION__ << "sendingNode:" << *node << "currentCodec:" << currentCodec << "recievedCodec:" << recievedCodec;
+    sendSelectAudioFormat(node, currentCodec);
+}
+
 void AudioMixerClientData::sendSelectAudioFormat(SharedNodePointer node, const QString& selectedCodecName) {
     auto replyPacket = NLPacket::create(PacketType::SelectedAudioFormat);
     replyPacket->writeString(selectedCodecName);

assignment-client/src/audio/AudioMixerClientData.h

@@ -84,6 +84,7 @@ signals:
     void injectorStreamFinished(const QUuid& streamIdentifier);
 
 public slots:
+    void handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec);
     void sendSelectAudioFormat(SharedNodePointer node, const QString& selectedCodecName);
 
 private:

libraries/audio-client/src/AudioClient.cpp

@@ -119,6 +119,9 @@ AudioClient::AudioClient() :
             this, &AudioClient::processReceivedSamples, Qt::DirectConnection);
     connect(this, &AudioClient::changeDevice, this, [=](const QAudioDeviceInfo& outputDeviceInfo) { switchOutputToAudioDevice(outputDeviceInfo); });
 
+    connect(&_receivedAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioClient::handleMismatchAudioFormat);
+
+
     _inputDevices = getDeviceNames(QAudio::AudioInput);
     _outputDevices = getDeviceNames(QAudio::AudioOutput);
 
@@ -147,6 +150,12 @@ AudioClient::~AudioClient() {
     }
 }
 
+void AudioClient::handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec) {
+    qDebug() << __FUNCTION__ << "sendingNode:" << *node << "currentCodec:" << currentCodec << "recievedCodec:" << recievedCodec;
+    selectAudioFormat(recievedCodec);
+}
+
+
 void AudioClient::reset() {
     _receivedAudioStream.reset();
     _stats.reset();
@@ -532,7 +541,13 @@ void AudioClient::negotiateAudioFormat() {
 }
 
 void AudioClient::handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message) {
-    _selectedCodecName = message->readString();
+    QString selectedCodecName = message->readString();
+    selectAudioFormat(selectedCodecName);
+}
+
+void AudioClient::selectAudioFormat(const QString& selectedCodecName) {
+    
+    _selectedCodecName = selectedCodecName;
 
     qDebug() << "Selected Codec:" << _selectedCodecName;
 

libraries/audio-client/src/AudioClient.h

@@ -104,6 +104,7 @@ public:
     };
 
     void negotiateAudioFormat();
+    void selectAudioFormat(const QString& selectedCodecName);
 
     const MixedProcessedAudioStream& getReceivedAudioStream() const { return _receivedAudioStream; }
     MixedProcessedAudioStream& getReceivedAudioStream() { return _receivedAudioStream; }
@@ -153,6 +154,7 @@ public slots:
     void handleNoisyMutePacket(QSharedPointer<ReceivedMessage> message);
     void handleMuteEnvironmentPacket(QSharedPointer<ReceivedMessage> message);
     void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
+    void handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec);
 
     void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); }
     void handleAudioInput();

libraries/audio/src/InboundAudioStream.cpp

@@ -147,7 +147,7 @@ int InboundAudioStream::parseData(ReceivedMessage& message) {
                     writeDroppableSilentSamples(networkSamples);
                     // inform others of the mismatch
                     auto sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(message.getSourceID());
-                    emit mismatchedAudioCodec(sendingNode, _selectedCodecName);
+                    emit mismatchedAudioCodec(sendingNode, _selectedCodecName, codecInPacket);
                 }
             }
             break;

libraries/audio/src/InboundAudioStream.h

@@ -182,7 +182,7 @@ public:
     void cleanupCodec();
 
 signals:
-    void mismatchedAudioCodec(SharedNodePointer sendingNode, const QString& desiredCodec);
+    void mismatchedAudioCodec(SharedNodePointer sendingNode, const QString& currentCodec, const QString& recievedCodec);
 
 public slots:
     /// This function should be called every second for all the stats to function properly. If dynamic jitter buffers