Generic Rtp Client adjustmnets

HttpServer/Resources/CMakeLists.txt

@@ -12,6 +12,7 @@ target_link_libraries(Resources
     MediaServer::MediaManager
     MediaServer::MediaServer
     Media::Core
+    Media::Sdp
     nlohmann_json::nlohmann_json
 )
 

HttpServer/Resources/src/GenericRtpController.cpp

@@ -1,5 +1,7 @@
 #include <HttpServer/Resources/GenericRtpController.hpp>
 
+#include <Media/Sdp/SessionDescription.hpp>
+
 #include <nlohmann/json.hpp>
 
 #include <iostream>
@@ -52,11 +54,10 @@ namespace HttpServer
 
             nlohmann::json request = nlohmann::json::parse(requestBody);
 
-            std::string address = request["address"];
+            std::string address = request["ip"];
             uint16_t port = request["port"];
-            std::string sdp = request["sdp"];
 
-            auto pMediaTrack = co_await pGenericRtpClient->Initiate(address, port, sdp);
+            auto pMediaTrack = co_await pGenericRtpClient->Initiate(address, port);
             if (!pMediaTrack)
             {
                 std::cout << "Failure" << std::endl;
@@ -66,7 +67,7 @@ namespace HttpServer
             }
 
             auto pMediaResource = co_await pMediaManager->GetMediaResource(resourceName);
-            if(pMediaResource)
+            if (pMediaResource)
             {
                 auto pMediaResourceLock = pMediaResource->Lock();
 
@@ -82,17 +83,6 @@ namespace HttpServer
 
                 co_await pMediaManager->AddMediaResource(pNewMediaResource);
             }
-//            if (!pMediaResource)
-//            {
-//
-//                pNewMediaResource->AddTrack(pMediaTrack);
-//
-//                co_await pMediaManager->AddMediaResource(pNewMediaResource);
-//            }
-//            else
-//            {
-//                pMediaResource->AddTrack(pMediaTrack);
-//            }
 
             std::cout << "Success" << std::endl;
             pHttpResponse->setStatusCode(drogon::HttpStatusCode::k200OK);
@@ -114,7 +104,7 @@ namespace HttpServer
             }
 
             auto mediaResources = co_await pMediaManager->GetMediaResources();
-            if(mediaResources.empty())
+            if (mediaResources.empty())
             {
                 pHttpResponse->setStatusCode(drogon::HttpStatusCode::k204NoContent);
 

HttpServer/Resources/src/WebRtcController.cpp

@@ -2,6 +2,8 @@
 
 #include <MediaServer/MediaManager/MediaResource.hpp>
 
+#include <rtc/rtc.hpp>
+
 #include <memory>
 
 namespace HttpServer
@@ -26,6 +28,13 @@ namespace HttpServer
             auto pHttpResponse = drogon::HttpResponse::newHttpResponse();
             pHttpResponse->setStatusCode(drogon::HttpStatusCode::k501NotImplemented);
 
+            rtc::Configuration config;
+            config.iceServers.emplace_back("stun:stun.l.google.com:19302");
+
+            //auto pPeerConnection = std::make_shared<rtc::PeerConnection>(config);
+
+
+
             callback(pHttpResponse);
         }
 

MediaServer/GenericRtpClient/include/MediaServer/GenericRtpClient/Details/RtpClientSession.hpp

@@ -22,12 +22,10 @@ namespace MediaServer
         {
         public:
             static RtpClientSessionSharedPtr_t Create(boost::asio::io_context& ioContext,
-                                                      boost::asio::ip::udp::endpoint endpoint,
-                                                      Media::Sdp::SessionDescriptionSharedPtr_t pSessionDescription);
+                                                      boost::asio::ip::udp::endpoint endpoint);
 
             explicit RtpClientSession(boost::asio::io_context& ioContext,
-                                      boost::asio::ip::udp::endpoint endpoint,
-                                      Media::Sdp::SessionDescriptionSharedPtr_t pSessionDescription);
+                                      boost::asio::ip::udp::endpoint endpoint);
 
             virtual ~RtpClientSession();
 
@@ -36,6 +34,8 @@ namespace MediaServer
         public:
             void Attach(MediaObserverSharedPtr_t pMediaObserver) override;
 
+            std::string Name() const override;
+
         protected:
             void StartReading_();
 
@@ -49,7 +49,6 @@ namespace MediaServer
             boost::asio::io_context& m_ioContext;
             boost::asio::ip::udp::socket m_socket;
             std::array<std::byte, 8192> m_readStreamBuffer;
-            Media::Sdp::SessionDescriptionSharedPtr_t m_pSessionDescription;
         };
     }
 }

MediaServer/GenericRtpClient/include/MediaServer/GenericRtpClient/GenericRtpClient.hpp

@@ -24,7 +24,7 @@ namespace MediaServer
 
             virtual ~GenericRtpClient();
 
-            bool InitiateNewSession(std::string ip, uint16_t port, std::string sessionDescription, std::function<void(IMediaTrackSharedPtr_t pMediaTrack)> callback) override;
+            bool InitiateNewSession(std::string ip, uint16_t port, std::function<void(IMediaTrackSharedPtr_t pMediaTrack)> callback) override;
 
         private:
             boost::asio::io_context m_ioContext;

MediaServer/GenericRtpClient/include/MediaServer/GenericRtpClient/IGenericRtpClient.hpp

@@ -3,6 +3,8 @@
 #include <Gondor/Execution/CallbackAwaiter.hpp>
 #include <Gondor/Execution/ExecutionContext.hpp>
 
+#include <Media/Sdp/SessionDescription.hpp>
+
 #include <MediaServer/MediaManager/IMediaTrack.hpp>
 
 #include <coroutine>
@@ -22,7 +24,6 @@ namespace MediaServer
 
             virtual bool InitiateNewSession(std::string ip,
                                             uint16_t port,
-                                            std::string sessionDescription,
                                             std::function<void(IMediaTrackSharedPtr_t pMediaTrack)> callback) = 0;
         };
 
@@ -34,13 +35,11 @@ namespace MediaServer
             GenericRtpStreamAwaiter(Gondor::Execution::ExecutionContextWeakPtr pExecutionContext,
                                     IGenericRtpClientSharedPtr_t pGenericRtpClient,
                                     std::string ip,
-                                    uint16_t port,
-                                    std::string sessionDescription)
+                                    uint16_t port)
                 : m_pExecutionContext{pExecutionContext}
                 , m_pGenericRtpClient{pGenericRtpClient}
                 , m_ip{ip}
                 , m_port{port}
-                , m_sessionDescription{sessionDescription}
             {
                 std::cout << "GenericRtpStreamAwaiter::GenericRtpStreamAwaiter()" << std::endl;
             }
@@ -63,7 +62,6 @@ namespace MediaServer
                                       m_pGenericRtpClient,
                                       m_ip,
                                       m_port,
-                                      m_sessionDescription,
                                       [this, handle](IMediaTrackSharedPtr_t pMediaTrack) -> void {
                                           SetValue(pMediaTrack);
                                           handle.resume();
@@ -82,15 +80,14 @@ namespace MediaServer
             IGenericRtpClientSharedPtr_t m_pGenericRtpClient;
             std::string m_ip;
             uint16_t m_port;
-            std::string m_sessionDescription;
         };
 
         class IGenericRtpClientProxy
         {
         public:
             virtual ~IGenericRtpClientProxy() = default;
 
-            virtual GenericRtpStreamAwaiter Initiate(std::string ip, uint16_t port, std::string sessionDescription) = 0;
+            virtual GenericRtpStreamAwaiter Initiate(std::string ip, uint16_t port) = 0;
         };
 
         using IGenericRtpClientProxySharedPtr_t = std::shared_ptr<IGenericRtpClientProxy>;

MediaServer/GenericRtpClient/src/Details/RtpClientSession.cpp

@@ -13,19 +13,16 @@ namespace MediaServer
     namespace Rtp
     {
         RtpClientSessionSharedPtr_t RtpClientSession::Create(boost::asio::io_context& ioContext,
-                                                             boost::asio::ip::udp::endpoint endpoint,
-                                                             Media::Sdp::SessionDescriptionSharedPtr_t pSessionDescription)
+                                                             boost::asio::ip::udp::endpoint endpoint)
         {
-            return std::make_shared<RtpClientSession>(ioContext, endpoint, pSessionDescription);
+            return std::make_shared<RtpClientSession>(ioContext, endpoint);
         }
 
         RtpClientSession::RtpClientSession(boost::asio::io_context& ioContext,
-                                           boost::asio::ip::udp::endpoint endpoint,
-                                           Media::Sdp::SessionDescriptionSharedPtr_t pSessionDescription)
+                                           boost::asio::ip::udp::endpoint endpoint)
             : m_ioContext{ioContext}
             , m_socket{m_ioContext, endpoint}
             , m_readStreamBuffer{}
-            , m_pSessionDescription{pSessionDescription}
         {
             std::cout << "RtpClientSession::RtpClientSession()" << std::endl;
         }
@@ -83,6 +80,8 @@ namespace MediaServer
             auto pMediaBuffer = Media::Core::MediaBuffer::Create(std::move(data));
             auto pFrame = Media::Core::VideoFrame::Create(pMediaBuffer);
 
+
+
             // std::cout << "Frame received!" << std::endl;
 
             StartReading_();
@@ -92,5 +91,10 @@ namespace MediaServer
         {
             std::cout << "RtpClientSession::Attach()" << std::endl;
         }
+
+        std::string RtpClientSession::Name() const
+        {
+            return "";
+        }
     }
 }

MediaServer/GenericRtpClient/src/GenericRtpClient.cpp

@@ -46,18 +46,12 @@ namespace MediaServer
             m_threadPool.join_all();
         }
 
-        bool GenericRtpClient::InitiateNewSession(std::string ip, uint16_t port, std::string sessionDescription, std::function<void(IMediaTrackSharedPtr_t pMediaTrack)> callback)
+        bool GenericRtpClient::InitiateNewSession(std::string ip, uint16_t port, std::function<void(IMediaTrackSharedPtr_t pMediaTrack)> callback)
         {
-            std::cout << "GenericRtpClient::InitiateNewClient()" << std::endl;
-            std::cout << "IP: " << ip << std::endl;
-            std::cout << "Port: " << port << std::endl;
-            std::cout << "Session Description: " << sessionDescription << std::endl;
-
             try
             {
                 auto endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(ip), port);
-                auto pSessionDescription = Media::Sdp::SessionDescription::Parse(sessionDescription);
-                auto pRtpClientSession = RtpClientSession::Create(m_ioContext, endpoint, pSessionDescription);
+                auto pRtpClientSession = RtpClientSession::Create(m_ioContext, endpoint);
 
                 pRtpClientSession->Initiate(callback);
 

MediaServer/MediaManager/include/MediaServer/MediaManager/IMediaTrack.hpp

@@ -2,6 +2,7 @@
 
 #include <vector>
 #include <memory>
+#include <string>
 
 namespace MediaServer
 {
@@ -20,6 +21,8 @@ namespace MediaServer
     public:
         virtual ~IMediaTrack() = default;
 
+        virtual std::string Name() const = 0;
+
         virtual void Attach(MediaObserverSharedPtr_t pMediaObserver) = 0;
     };
 

MediaServer/MediaServer/CMakeLists.txt

@@ -16,6 +16,12 @@ target_link_libraries(MediaServer
     Gondor::Execution
 )
 
+target_link_libraries(MediaServer
+        PUBLIC
+    Media::Sdp
+    Media::Core
+)
+
 target_link_libraries(MediaServer
         PUBLIC
     MediaServer::MediaManager

MediaServer/MediaServer/include/MediaServer/GenericRtpClientProxy.hpp

@@ -1,9 +1,10 @@
 #pragma once
 
 #include <MediaServer/GenericRtpClient/IGenericRtpClient.hpp>
-
 #include <MediaServer/GenericRtpClient/GenericRtpClient.hpp>
 
+#include <Media/Sdp/SessionDescription.hpp>
+
 #include <Gondor/Execution/ExecutionContext.hpp>
 
 #include <memory>
@@ -23,7 +24,7 @@ namespace MediaServer
                               MediaServer::Rtp::GenericRtpClientSharedPtr_t pGenericRtpClient);
         ~GenericRtpClientProxy();
 
-        MediaServer::Rtp::GenericRtpStreamAwaiter Initiate(std::string ip, uint16_t port, std::string sessionDescription) override;
+        MediaServer::Rtp::GenericRtpStreamAwaiter Initiate(std::string ip, uint16_t port) override;
 
     private:
         Gondor::Execution::ExecutionContextWeakPtr m_pExecutionContext;

MediaServer/MediaServer/src/GenericRtpClientProxy.cpp

@@ -23,10 +23,10 @@ namespace MediaServer
         std::cout << "GenericRtpClientProxy::~GenericRtpClientProxy()" << std::endl;
     }
 
-    MediaServer::Rtp::GenericRtpStreamAwaiter GenericRtpClientProxy::Initiate(std::string ip, uint16_t port, std::string sessionDescription)
+    MediaServer::Rtp::GenericRtpStreamAwaiter GenericRtpClientProxy::Initiate(std::string ip, uint16_t port)
     {
         std::cout << "GenericRtpClient::Initiate()" << std::endl;
 
-        return MediaServer::Rtp::GenericRtpStreamAwaiter(m_pExecutionContext, m_pGenericRtpClient, ip, port, sessionDescription);
+        return MediaServer::Rtp::GenericRtpStreamAwaiter(m_pExecutionContext, m_pGenericRtpClient, ip, port);
     }
 }