Created lib for srt

cpp/apps/st2110_extractor/main.cpp

@@ -180,7 +180,7 @@ namespace
             config.pcap_file, config.profile,    config.storage_folder, pcap, get_stream_info, &factory,
             &updater,         progress_callback, config.extract_frames};
 
-        const auto is_srt = true;
+        const auto is_srt = false;
 
         run_full_analysis(is_srt, context);
     }

cpp/apps/stream_pre_processor/main.cpp

@@ -139,7 +139,7 @@ int main(int argc, char* argv[])
                 console->info("Processing {}.", pcap_id->get<std::string>());
                 try
                 {
-                    const auto is_srt = true;
+                    const auto is_srt = false;
 
                     const json analysis_result =
                         analyze_stream(pcap_path->get<std::string>(), pcap_id->get<std::string>(), is_srt);

cpp/libs/CMakeLists.txt

@@ -2,6 +2,7 @@ add_subdirectory(test_lib)
 add_subdirectory(core)
 add_subdirectory(net)
 add_subdirectory(rtp)
+add_subdirectory(srt)
 add_subdirectory(pcap)
 add_subdirectory(st2110)
 add_subdirectory(ptp)

cpp/libs/preprocessor/CMakeLists.txt

@@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.9)
 
 list_declare_library(ebu_list_preprocessor)
 
-target_link_libraries(${PROJECT_NAME} ebu_list_analysis ebu_list_pcap ebu_list_ptp)
+target_link_libraries(${PROJECT_NAME} ebu_list_analysis ebu_list_pcap ebu_list_ptp ebu_list_srt)

cpp/libs/srt/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.9)
+
+list_declare_library(ebu_list_srt)
+
+target_link_libraries(${PROJECT_NAME} ebu_list_core ebu_list_net ebu_list_analysis ebu_list_st2110)

cpp/libs/srt/unit_tests/main.cpp

@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN // This tells Catch to provide a main()
+#include "catch2/catch.hpp"

cpp/libs/srt/unit_tests/utils.cpp

@@ -0,0 +1,21 @@
+#include "utils.h"
+
+using namespace ebu_list;
+using namespace ebu_list::srt;
+using namespace ebu_list::st2110;
+
+//------------------------------------------------------------------------------
+
+detector::status_description test::run_srt_format_detector(srt_format_detector& srt_d, udp_source& s)
+{
+    for(;;)
+    {
+        auto packet = s.next();
+        if(!packet)
+            return detector::status_description{/*.state*/ detector::state::invalid,
+                                                           /*.error_code*/ "UNIT_TESTING"};
+
+        const auto result = srt_d.handle_data(std::move(packet.value()));
+        if(result.state == detector::state::valid || result.state == detector::state::invalid) return result;
+    }
+}

cpp/libs/srt/unit_tests/utils.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "ebu/list/st2110/format_detector.h"
+#include "ebu/list/srt/srt_format_detector.h"
+#include "udp_source.h"
+
+namespace ebu_list::test
+{
+    st2110::detector::status_description run_srt_format_detector(srt::srt_format_detector& srt_d, udp_source& s);
+}

cpp/libs/st2110/unit_tests/utils.cpp

@@ -1,7 +1,6 @@
 #include "utils.h"
 
 using namespace ebu_list;
-using namespace ebu_list::srt;
 using namespace ebu_list::st2110;
 
 //------------------------------------------------------------------------------
@@ -19,17 +18,3 @@ detector::status_description test::run_detector(detector& d, rtp_source& s)
         if(result.state == detector::state::valid || result.state == detector::state::invalid) return result;
     }
 }
-
-detector::status_description test::run_srt_format_detector(srt_format_detector& srt_d, udp_source& s)
-{
-    for(;;)
-    {
-        auto packet = s.next();
-        if(!packet)
-            return detector::status_description{/*.state*/ detector::state::invalid,
-                                                           /*.error_code*/ "UNIT_TESTING"};
-
-        const auto result = srt_d.handle_data(std::move(packet.value()));
-        if(result.state == detector::state::valid || result.state == detector::state::invalid) return result;
-    }
-}

cpp/libs/st2110/unit_tests/utils.h

@@ -1,12 +1,9 @@
 #pragma once
 
 #include "ebu/list/st2110/format_detector.h"
-#include "ebu/list/srt/srt_format_detector.h"
 #include "rtp_source.h"
-#include "udp_source.h"
 
 namespace ebu_list::test
 {
     st2110::detector::status_description run_detector(st2110::detector& d, rtp_source& s);
-    st2110::detector::status_description run_srt_format_detector(srt::srt_format_detector& srt_d, udp_source& s);
 }