H264inclient (#398)

* opt h264 in client
* decide video codec support at conf alloc, vp8 default if list is empty

Author: olofkallander

api/AllocateConference.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "bridge/CodecCapabilities.h"
 #include "utils/Optional.h"
 #include <cstdint>
 
@@ -10,6 +11,7 @@ struct AllocateConference
 {
     utils::Optional<uint32_t> lastN;
     bool useGlobalPort = true;
+    bridge::VideoCodecSpec videoCodecs = bridge::VideoCodecSpec::makeVp8();
 };
 
 } // namespace api

api/Parser.cpp

@@ -284,6 +284,25 @@ AllocateConference parseAllocateConference(const nlohmann::json& data)
         }
     }
     setIfExistsOrDefault(allocateConference.useGlobalPort, data, "global-port", true);
+    auto it = data.find("video-codecs");
+    if (it != data.end())
+    {
+        for (auto codec : data["video-codecs"])
+        {
+            if (codec == "vp8")
+            {
+                allocateConference.videoCodecs.vp8 = true;
+            }
+            else if (codec == "h264")
+            {
+                allocateConference.videoCodecs.h264 = true;
+            }
+        }
+    }
+    else
+    {
+        allocateConference.videoCodecs.vp8 = true;
+    }
 
     return allocateConference;
 }

bridge/CodecCapabilities.h

@@ -0,0 +1,36 @@
+#pragma once
+#include <string>
+
+namespace bridge
+{
+
+struct VideoCodecSpec
+{
+    bool vp8 : 1;
+    bool h264 : 1;
+
+    VideoCodecSpec() : vp8(0), h264(0) {}
+
+    static VideoCodecSpec makeVp8()
+    {
+        VideoCodecSpec v;
+        v.vp8 = 1;
+        return v;
+    }
+
+    std::string toString() const
+    {
+        std::string s;
+        if (vp8)
+        {
+            s += "vp8 ";
+        }
+        if (h264)
+        {
+            s += "h264 ";
+        }
+
+        return s;
+    }
+};
+} // namespace bridge

bridge/Mixer.cpp

@@ -156,7 +156,8 @@ Mixer::Mixer(std::string id,
     const std::vector<uint32_t>& audioSsrcs,
     const std::vector<api::SimulcastGroup>& videoSsrcs,
     const std::vector<api::SsrcPair>& videoPinSsrcs,
-    bool useGlobalPort)
+    bool useGlobalPort,
+    VideoCodecSpec videoCodecs)
     : _config(config),
       _id(std::move(id)),
       _loggableId("Mixer", logInstanceId),
@@ -169,7 +170,8 @@ Mixer::Mixer(std::string id,
       _engineMixer(std::move(engineMixer)),
       _idGenerator(idGenerator),
       _ssrcGenerator(ssrcGenerator),
-      _useGlobalPort(useGlobalPort)
+      _useGlobalPort(useGlobalPort),
+      _videoCodecs(videoCodecs)
 {
 }
 
@@ -2432,4 +2434,8 @@ void Mixer::engineBarbellRemoved(const EngineBarbell& engineBarbell)
     }
 }
 
+bool Mixer::isH264Enabled() const
+{
+    return _videoCodecs.h264;
+}
 } // namespace bridge

bridge/Mixer.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "bridge/Barbell.h"
+#include "bridge/CodecCapabilities.h"
 #include "bridge/RecordingStream.h"
 #include "bridge/Stats.h"
 #include "bridge/engine/ActiveTalker.h"
@@ -94,7 +95,8 @@ class Mixer
         const std::vector<uint32_t>& audioSsrcs,
         const std::vector<api::SimulcastGroup>& videoSsrcs,
         const std::vector<api::SsrcPair>& videoPinSsrcs,
-        bool useGlobalPort);
+        bool useGlobalPort,
+        VideoCodecSpec videoCodecs);
 
     virtual ~Mixer() = default;
 
@@ -298,6 +300,8 @@ class Mixer
     const config::Config& getConfig() const { return _config; }
     bridge::Stats::MixerBarbellStats gatherBarbellStats(const uint64_t engineIterationStartTimestamp);
 
+    bool isH264Enabled() const;
+
 private:
     struct BundleTransport
     {
@@ -332,6 +336,7 @@ class Mixer
 
     std::unordered_map<std::string, BundleTransport> _bundleTransports;
     bool _useGlobalPort;
+    const VideoCodecSpec _videoCodecs;
     transport::Endpoints _rtpPorts;
     std::unordered_map<size_t, std::unordered_map<uint32_t, std::unique_ptr<PacketCache>>> _videoPacketCaches;
     std::unordered_map<size_t, std::unordered_map<uint32_t, std::unique_ptr<PacketCache>>> _recordingRtpPacketCaches;

bridge/MixerManager.cpp

@@ -116,12 +116,12 @@ MixerManager::~MixerManager()
     logger::debug("Deleted", "MixerManager");
 }
 
-Mixer* MixerManager::create(bool useGlobalPort)
+Mixer* MixerManager::create(bool useGlobalPort, VideoCodecSpec videoCodecs)
 {
-    return create(_config.defaultLastN, useGlobalPort);
+    return create(_config.defaultLastN, useGlobalPort, videoCodecs);
 }
 
-Mixer* MixerManager::create(uint32_t lastN, bool useGlobalPort)
+Mixer* MixerManager::create(uint32_t lastN, bool useGlobalPort, VideoCodecSpec videoCodecs)
 {
     lastN = std::min(lastN, maxLastN);
     logger::info("Create mixer, last-n %u", "MixerManager", lastN);
@@ -190,7 +190,8 @@ Mixer* MixerManager::create(uint32_t lastN, bool useGlobalPort)
             audioSsrcs,
             videoSsrcs,
             videoPinSsrcs,
-            useGlobalPort));
+            useGlobalPort,
+            videoCodecs));
     if (!mixerEmplaceResult.second)
     {
         logger::error("Failed to create mixer", "MixerManager");

bridge/MixerManager.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "bridge/CodecCapabilities.h"
 #include "bridge/MixerManagerAsync.h"
 #include "bridge/Stats.h"
 #include "bridge/engine/EngineMixer.h"
@@ -60,8 +61,8 @@ class MixerManager final : public MixerManagerAsync
 
     ~MixerManager();
 
-    bridge::Mixer* create(bool useGlobalPort);
-    bridge::Mixer* create(uint32_t lastN, bool useGlobalPort);
+    bridge::Mixer* create(bool useGlobalPort, VideoCodecSpec videoCodecs = VideoCodecSpec());
+    bridge::Mixer* create(uint32_t lastN, bool useGlobalPort, VideoCodecSpec videoCodecs = VideoCodecSpec());
     void remove(const std::string& id);
     std::vector<std::string> getMixerIds();
     std::unique_lock<std::mutex> getMixer(const std::string& id, Mixer*& outMixer);

bridge/endpointActions/AllocateConference.cpp

@@ -21,20 +21,23 @@ httpd::Response allocateConference(ActionContext* context, RequestLogger& reques
     const auto allocateConference = api::Parser::parseAllocateConference(requestBodyJson);
 
     auto mixer = allocateConference.lastN.isSet()
-        ? context->mixerManager.create(allocateConference.lastN.get(), allocateConference.useGlobalPort)
-        : context->mixerManager.create(allocateConference.useGlobalPort);
+        ? context->mixerManager.create(allocateConference.lastN.get(),
+              allocateConference.useGlobalPort,
+              allocateConference.videoCodecs)
+        : context->mixerManager.create(allocateConference.useGlobalPort, allocateConference.videoCodecs);
 
     if (!mixer)
     {
         throw httpd::RequestErrorException(httpd::StatusCode::INTERNAL_SERVER_ERROR, "Conference creation has failed");
     }
 
-    logger::info("Allocate conference %s, mixer %s, last-n %d, global-port %c",
+    logger::info("Allocate conference %s, mixer %s, last-n %d, global-port %c, codec %s",
         "ApiRequestHandler",
         mixer->getId().c_str(),
         mixer->getLoggableId().c_str(),
         allocateConference.lastN.isSet() ? allocateConference.lastN.get() : -1,
-        allocateConference.useGlobalPort ? 't' : 'f');
+        allocateConference.useGlobalPort ? 't' : 'f',
+        allocateConference.videoCodecs.toString().c_str());
 
     nlohmann::json responseJson;
     responseJson["id"] = mixer->getId();

bridge/endpointActions/ConferenceActions.cpp

@@ -242,13 +242,13 @@ httpd::Response generateAllocateEndpointResponse(ActionContext* context,
             responseVideo.transport.set(responseTransport);
         }
 
-        if (context->config.codec.videoCodec.get() == "H264")
+        if (context->config.codec.videoCodec.get() == "H264" || mixer.isH264Enabled())
         {
             addH264VideoProperties(responseVideo,
                 context->config.codec.h264ProfileLevelId.get(),
                 context->config.codec.h264PacketizationMode.get());
         }
-        else
+        else if (context->config.codec.videoCodec.get() == "VP8")
         {
             addVp8VideoProperties(responseVideo);
         }

config/Config.h

@@ -139,6 +139,7 @@ class Config : public ConfigReader
 
     CFG_GROUP()
     CFG_PROP(std::string, videoCodec, "VP8");
+    // webRTC profiles: 42001f, 42e01f, 4d001f, 64001f, f4001f
     CFG_PROP(std::string, h264ProfileLevelId, "42001f");
     CFG_PROP(uint32_t, h264PacketizationMode, 1);