Fix some locks; Changed audio bitrate to 96k

src/description.cpp

@@ -651,7 +651,7 @@ void Description::Video::addVideoCodec(int payloadType, const string &codec) {
 void Description::Audio::addAudioCodec(int payloadType, const string &codec) {
     // TODO This 48000/2 should be parameterized
     RTPMap map(std::to_string(payloadType) + ' ' + codec + "/48000/2");
-    map.fmtps.emplace_back("maxaveragebitrate=510000; stereo=1; sprop-stereo=1; useinbandfec=1");
+    map.fmtps.emplace_back("maxaveragebitrate=96000; stereo=1; sprop-stereo=1; useinbandfec=1");
     addRTPMap(map);
 }
 

src/peerconnection.cpp

@@ -656,9 +656,8 @@ std::optional<std::string> PeerConnection::getMidFromSSRC(SSRC ssrc) {
     if (auto it = mMidFromSssrc.find(ssrc); it != mMidFromSssrc.end()) {
         return it->second;
     } else {
-        std::lock_guard lock(mLocalDescriptionMutex);
-        if (!mLocalDescription)
-            return nullopt;
+        std::lock_guard lockA(mRemoteDescriptionMutex);
+        if (mRemoteDescription) {
 
         for (unsigned int i = 0; i < mRemoteDescription->mediaCount(); ++i) {
             if (auto found = std::visit(
@@ -676,7 +675,10 @@ std::optional<std::string> PeerConnection::getMidFromSSRC(SSRC ssrc) {
                 return *found;
             }
         }
+	}
 
+        std::lock_guard lockB(mLocalDescriptionMutex);
+        if (mLocalDescription) {
         for (unsigned int i = 0; i < mLocalDescription->mediaCount(); ++i) {
             if (auto found = std::visit(
                     rtc::overloaded{[&](Description::Application *) -> std::optional<string> {
@@ -693,6 +695,7 @@ std::optional<std::string> PeerConnection::getMidFromSSRC(SSRC ssrc) {
                 return *found;
             }
         }
+	}
     }
     return nullopt;
 }

src/rtcp.cpp

@@ -97,7 +97,6 @@ void RtcpReceivingSession::pushREMB(unsigned int bitrate) {
 	auto remb = reinterpret_cast<RTCP_REMB *>(msg->data());
 	remb->preparePacket(mSsrc, 1, bitrate);
 	remb->setSsrc(0, mSsrc);
-//	remb->log();
 
     send(msg);
 }