MEDIA-3445: Reduce memory consumption for audio only conferences (#401)

finos · Feb 19, 2025 · c9e037a · c9e037a
1 parent 5e4d3a5
commit c9e037a
Show file tree

Hide file tree

Showing 58 changed files with 1,224 additions and 364 deletions.
diff --git a/.cppcheck-suppressions b/.cppcheck-suppressions
@@ -2,6 +2,5 @@ uninitStructMember:external/http.h
 selfInitialization:bridge/AudioStream.h
 selfInitialization:bridge/DataStream.h
 selfInitialization:bridge/VideoStream.h
-uninitvar:test/bridge/MixerTest.cpp:88
 nullPointer:test/utils/LogSpamTest.cpp:125
-uninitvar:test/bridge/MixerTest.cpp:89
+uninitvar:test/bridge/MixerTest.cpp:89
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -609,6 +609,7 @@ set(TEST_FILES
     test/codec/AudioProcessingTest.cpp
     test/concurrency/MpscTest.cpp
     test/concurrency/MpmcMapTest.cpp
+    test/concurrency/MpmcQueueTest.cpp
     test/concurrency/LockFreeListTest.cpp
     test/bwe/MatrixTests.cpp
     test/bwe/RateControllerTest.cpp
@@ -626,6 +627,7 @@ set(TEST_FILES
     test/codec/H264HeaderTest.cpp
     test/codec/Vp8HeaderTest.cpp
     test/bridge/ActiveMediaListTest.cpp
+    test/bridge/ApiRequestHandlerTest.cpp
     test/bridge/BarbellMessagesTest.cpp
     test/rtp/RtcpFeedbackTest.cpp
     test/bridge/PacketCacheTest.cpp

diff --git a/api/AllocateConference.h b/api/AllocateConference.h
@@ -11,6 +11,7 @@ struct AllocateConference
 {
     utils::Optional<uint32_t> lastN;
     bool useGlobalPort = true;
+    bool enableVideo = true;
     bridge::VideoCodecSpec videoCodecs = bridge::VideoCodecSpec::makeVp8();
 };
 

diff --git a/api/Generator.cpp b/api/Generator.cpp
@@ -291,35 +291,39 @@ nlohmann::json generateAllocateBarbellResponse(const BarbellDescription& channel
     responseJson["audio"] = audioJson;
 
     const auto& video = channelsDescription.video;
-    nlohmann::json videoJson;
 
-    videoJson["streams"] = nlohmann::json::array();
-    for (const auto& stream : video.streams)
+    if (!video.streams.empty())
     {
-        nlohmann::json streamJson;
-        streamJson["sources"] = nlohmann::json::array();
-        for (const auto level : stream.sources)
+        nlohmann::json videoJson;
+        videoJson["streams"] = nlohmann::json::array();
+
+        for (const auto& stream : video.streams)
         {
-            nlohmann::json sourceJson;
-            sourceJson["main"] = level.main;
-            if (level.feedback != 0)
+            nlohmann::json streamJson;
+            streamJson["sources"] = nlohmann::json::array();
+            for (const auto level : stream.sources)
             {
-                sourceJson["feedback"] = level.feedback;
+                nlohmann::json sourceJson;
+                sourceJson["main"] = level.main;
+                if (level.feedback != 0)
+                {
+                    sourceJson["feedback"] = level.feedback;
+                }
+                streamJson["sources"].push_back(sourceJson);
             }
-            streamJson["sources"].push_back(sourceJson);
-        }
-        streamJson["content"] = stream.content;
-        videoJson["streams"].push_back(streamJson);
+            streamJson["content"] = stream.content;
+            videoJson["streams"].push_back(streamJson);
 
-        videoJson["payload-types"] = nlohmann::json::array();
-        for (const auto& payloadType : video.payloadTypes)
-        {
-            videoJson["payload-types"].push_back(generatePayloadType(payloadType));
-        }
+            videoJson["payload-types"] = nlohmann::json::array();
+            for (const auto& payloadType : video.payloadTypes)
+            {
+                videoJson["payload-types"].push_back(generatePayloadType(payloadType));
+            }
 
-        videoJson["rtp-hdrexts"] = generateRtpHeaderExtensions(video.rtpHeaderExtensions);
+            videoJson["rtp-hdrexts"] = generateRtpHeaderExtensions(video.rtpHeaderExtensions);
+        }
 
-        responseJson["video"] = videoJson;
+        responseJson["video"] = std::move(videoJson);
     }
 
     const auto& data = channelsDescription.data;

diff --git a/api/Parser.cpp b/api/Parser.cpp
@@ -284,6 +284,7 @@ AllocateConference parseAllocateConference(const nlohmann::json& data)
         }
     }
     setIfExistsOrDefault(allocateConference.useGlobalPort, data, "global-port", true);
+    setIfExistsOrDefault(allocateConference.enableVideo, data, "enable-video", true);
     auto it = data.find("video-codecs");
     if (it != data.end())
     {
@@ -624,7 +625,7 @@ BarbellDescription parsePatchBarbell(const nlohmann::json& data, const std::stri
             }
         }
 
-        barbellDescription.audio = audioChannel;
+        barbellDescription.audio = std::move(audioChannel);
     }
 
     if (data.find("video") != data.end())
@@ -660,7 +661,7 @@ BarbellDescription parsePatchBarbell(const nlohmann::json& data, const std::stri
             videoStream.content = stream["content"];
         }
 
-        barbellDescription.video = videoChannel;
+        barbellDescription.video = std::move(videoChannel);
     }
 
     const auto& dataJson = getJsonFieldOrThrow(data, "data");

diff --git a/bridge/LegacyApiRequestHandler.cpp b/bridge/LegacyApiRequestHandler.cpp
@@ -279,9 +279,12 @@ httpd::Response LegacyApiRequestHandler::createConference(const httpd::Request&
         }
 
         const auto lastNItr = requestBodyJson.find("last-n");
-        auto mixer = lastNItr != requestBodyJson.end() && lastNItr->is_number() && lastNItr->get<int32_t>() > 0
-            ? _mixerManager.create(lastNItr->get<uint32_t>(), true)
-            : _mixerManager.create(true);
+        const auto optionalLastN =
+            lastNItr != requestBodyJson.end() && lastNItr->is_number() && lastNItr->get<int32_t>() > 0
+            ? utils::Optional<uint32_t>(lastNItr->get<uint32_t>())
+            : utils::NullOpt;
+
+        auto mixer = _mixerManager.create(optionalLastN, true, true);
 
         if (!mixer)
         {
@@ -968,7 +971,7 @@ bool LegacyApiRequestHandler::allocateChannel(const std::string& contentName,
 
     if (useBundling)
     {
-        mixer.addBundleTransportIfNeeded(endpointId, iceRole.get());
+        mixer.addBundleTransportIfNeeded(endpointId, iceRole.get(), true);
         if (contentType == ContentType::Audio)
         {
             if (!mixer.addBundledAudioStream(channelId, endpointId, channel.getMediaMode()))
@@ -1072,7 +1075,7 @@ bool LegacyApiRequestHandler::allocateSctpConnection(const std::string& conferen
     {
         iceRole.set(ice::IceRole::CONTROLLING);
     }
-    mixer.addBundleTransportIfNeeded(endpointId, iceRole.get());
+    mixer.addBundleTransportIfNeeded(endpointId, iceRole.get(), true);
     mixer.addBundledDataStream(streamId, endpointId);
 
     uint32_t totalSleepTimeMs = 0;