refactor: make signaling service base

CMakeLists.txt

@@ -128,6 +128,7 @@ else()
         capture
         track
         v4l2_codecs
+        signaling
     )
     target_link_libraries(${PROJECT_NAME}
         ${WEBRTC_LINK_LIBS}

src/CMakeLists.txt

@@ -3,6 +3,7 @@ project(src)
 add_subdirectory(capture)
 add_subdirectory(track)
 add_subdirectory(v4l2_codecs)
+add_subdirectory(signaling)
 
 add_library(${PROJECT_NAME})
 target_sources(${PROJECT_NAME}
@@ -11,7 +12,6 @@ target_sources(${PROJECT_NAME}
     customized_video_encoder_factory.cpp
     data_channel_subject.cpp
     parser.cpp
-    signal_server.cpp
 )
 
-target_link_libraries(${PROJECT_NAME} capture track v4l2_codecs)
+target_link_libraries(${PROJECT_NAME} capture track v4l2_codecs signaling)

src/conductor.h

@@ -105,9 +105,7 @@ class Conductor : public webrtc::PeerConnectionObserver
     typedef std::function<void(webrtc::RTCError)> OnFailureFunc;
     typedef std::function<void(webrtc::SessionDescriptionInterface *desc)> OnCreateSuccessFunc;
 
-    typedef std::function<void(std::string)> InvokeSdpFunc;
     typedef std::function<void(std::string, int, std::string)> InvokeIceFunc;
-    InvokeSdpFunc invoke_answer_sdp;
     InvokeIceFunc invoke_answer_ice;
     OnSetSuccessFunc complete_signaling;
 

src/main.cpp

@@ -7,7 +7,7 @@
 #include "args.h"
 #include "conductor.h"
 #include "parser.h"
-#include "signal_server.h"
+#include "signaling/signalr_server.h"
 
 int main(int argc, char *argv[])
 {
@@ -20,10 +20,10 @@ int main(int argc, char *argv[])
         conductor->CreatePeerConnection();
 
         std::cout << "=> main: start signalr! url: " << args.signaling_url << std::endl;
-        SignalServer signalr(args.signaling_url, conductor);
-        signalr.WithReconnect()
-                .DisconnectWhenCompleted()
-                .JoinAsServer();
+        SignalrService signalr(args.signaling_url, conductor);
+        signalr.AutoReconnect()
+                .DisconnectOnCompleted()
+                .Connect();
 
         std::cout << "=> main: wait for ready streaming!" << std::endl;
         std::unique_lock<std::mutex> lock(conductor->mtx);

src/signaling/CMakeLists.txt

@@ -0,0 +1,7 @@
+project(signaling)
+
+aux_source_directory(${PROJECT_SOURCE_DIR} TRACK_FILES)
+
+add_library(${PROJECT_NAME} ${TRACK_FILES})
+
+target_link_libraries(${PROJECT_NAME})

src/signaling/signaling_service.cpp

@@ -0,0 +1,28 @@
+#include "signaling_service.h"
+
+SignalingService::SignalingService(std::shared_ptr<Conductor> conductor) 
+    : conductor_(conductor) {
+    InitIceCallback();
+}
+
+void SignalingService::OnRemoteSdp(std::string sdp) {
+    conductor_->SetOfferSDP(sdp, [this]() {
+        conductor_->CreateAnswer([this](webrtc::SessionDescriptionInterface *desc) {
+            std::string answer_sdp;
+            desc->ToString(&answer_sdp);
+            AnswerLocalSdp(answer_sdp);
+        }, nullptr);
+    }, nullptr);
+}
+
+void SignalingService::OnRemoteIce(std::string sdp_mid, int sdp_mline_index, std::string candidate) {
+    // bug: Failed to apply the received candidate. connect but without datachannel!?
+    // conductor_->AddIceCandidate(sdp_mid, sdp_mline_index, candidate);
+}
+
+void SignalingService::InitIceCallback() {
+    conductor_->invoke_answer_ice = 
+        [this](std::string sdp_mid, int sdp_mline_index, std::string candidate) {
+            AnswerLocalIce(sdp_mid, sdp_mline_index, candidate);
+        };
+}

src/signaling/signaling_service.h

@@ -0,0 +1,28 @@
+#ifndef SIGNALING_SERVICE_H_
+#define SIGNALING_SERVICE_H_
+
+#include "conductor.h"
+
+#include <string>
+
+class SignalingService {
+public:
+    SignalingService(std::shared_ptr<Conductor> conductor);
+    virtual ~SignalingService() {};
+
+protected:
+    std::shared_ptr<Conductor> conductor_;
+    void OnRemoteSdp(std::string sdp);
+    void OnRemoteIce(std::string sdp_mid, int sdp_mline_index, std::string candidate);
+    virtual void AnswerLocalSdp(std::string sdp) = 0;
+    virtual void AnswerLocalIce(std::string sdp_mid,
+                                int sdp_mline_index,
+                                std::string candidate) = 0;
+    virtual void Connect() = 0;
+    virtual void Disconnect() = 0;
+
+private:
+    void InitIceCallback();
+};
+
+#endif