Fix tsdelay and troff (#367)

* SMPTE ST 2110-10:2022: TSDELAY shall be a positive number or zero SMPTE ST 2110-21:2022: TROFF shall be a positive number or zero * Add testSdpParametersVideoJpegXs and update other sdp parameters tests which are using the optional tsdelay and troff * Prevent GCC 4.8.4 compile error, cast data type for the bst::optional parameters * Bump up boost to 1.83.0 to match with cpprestsdk dependencies * Remove braces around sdp_parameters's bandwidth initializer * Bump cpprestsdk to 2.10.19 * Roll back boost and cpprestsdk, they will be bumped up from another PR * Apply suggestions from code review Co-authored-by: Gareth Sylvester-Bradley <[email protected]> * Update sdp unit tests with @garethsb suggestions * Remove trailing whitespace --------- Co-authored-by: Gareth Sylvester-Bradley <[email protected]>
sony · Feb 7, 2024 · b2c385f · b2c385f
1 parent 1cea679
commit b2c385f
Show file tree

Hide file tree

Showing 9 changed files with 403 additions and 61 deletions.
diff --git a/Development/cmake/NmosCppTest.cmake b/Development/cmake/NmosCppTest.cmake
@@ -49,11 +49,13 @@ set(NMOS_CPP_TEST_NMOS_TEST_SOURCES
     nmos/test/jwt_validation_test.cpp
     nmos/test/paging_utils_test.cpp
     nmos/test/query_api_test.cpp
+    nmos/test/sdp_test_utils.cpp
     nmos/test/sdp_utils_test.cpp
     nmos/test/system_resources_test.cpp
     nmos/test/video_jxsv_test.cpp
     )
 set(NMOS_CPP_TEST_NMOS_TEST_HEADERS
+    nmos/test/sdp_test_utils.h
     )
 
 set(NMOS_CPP_TEST_PPLX_TEST_SOURCES

diff --git a/Development/nmos/sdp_utils.cpp b/Development/nmos/sdp_utils.cpp
@@ -793,11 +793,11 @@ namespace nmos
         // additional parameters introduced by SMPTE specs since then...
         if (!params.range.empty()) fmtp.push_back({ sdp::fields::range, params.range.name });
         if (0 != params.par) fmtp.push_back({ sdp::fields::pixel_aspect_ratio, nmos::details::make_pixel_aspect_ratio(params.par) });
-        if (0 != params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(params.troff) });
+        if (params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(*params.troff) });
         if (0 != params.cmax) fmtp.push_back({ sdp::fields::CMAX, utility::ostringstreamed(params.cmax) });
         if (0 != params.maxudp) fmtp.push_back({ sdp::fields::max_udp_packet_size, utility::ostringstreamed(params.maxudp) });
         if (!params.tsmode.empty()) fmtp.push_back({ sdp::fields::timestamp_mode, params.tsmode.name });
-        if (0 != params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(params.tsdelay) });
+        if (params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(*params.tsdelay) });
 
         return{ session_name, sdp::media_types::video, rtpmap, fmtp, {}, {}, {}, {}, media_stream_ids, ts_refclk };
     }
@@ -814,7 +814,7 @@ namespace nmos
         sdp_parameters::fmtp_t fmtp = {};
         if (!params.channel_order.empty()) fmtp.push_back({ sdp::fields::channel_order, params.channel_order });
         if (!params.tsmode.empty()) fmtp.push_back({ sdp::fields::timestamp_mode, params.tsmode.name });
-        if (0 != params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(params.tsdelay) });
+        if (params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(*params.tsdelay) });
 
         return{ session_name, sdp::media_types::audio, rtpmap, fmtp, {}, params.packet_time, {}, {}, media_stream_ids, ts_refclk };
     }
@@ -836,9 +836,9 @@ namespace nmos
         if (0 != params.exactframerate) fmtp.push_back({ sdp::fields::exactframerate, nmos::details::make_exactframerate(params.exactframerate) });
         if (!params.tm.empty()) fmtp.push_back({ sdp::fields::TM, params.tm.name });
         if (!params.ssn.empty()) fmtp.push_back({ sdp::fields::smpte_standard_number, params.ssn.name });
-        if (0 != params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(params.troff) });
+        if (params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(*params.troff) });
         if (!params.tsmode.empty()) fmtp.push_back({ sdp::fields::timestamp_mode, params.tsmode.name });
-        if (0 != params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(params.tsdelay) });
+        if (params.tsdelay) fmtp.push_back({ sdp::fields::timestamp_delay, utility::ostringstreamed(*params.tsdelay) });
 
         return{ session_name, sdp::media_types::video, rtpmap, fmtp, {}, {}, {}, {}, media_stream_ids, ts_refclk };
     }
@@ -854,7 +854,7 @@ namespace nmos
         // See https://tools.ietf.org/html/rfc4566#section-6
         sdp_parameters::fmtp_t fmtp = {};
         if (!params.tp.empty()) fmtp.push_back({ sdp::fields::type_parameter, params.tp.name });
-        if (0 != params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(params.troff) });
+        if (params.troff) fmtp.push_back({ sdp::fields::TROFF, utility::ostringstreamed(*params.troff) });
 
         return{ session_name, sdp::media_types::video, rtpmap, fmtp, {}, {}, {}, {}, media_stream_ids, ts_refclk };
     }

diff --git a/Development/nmos/sdp_utils.h b/Development/nmos/sdp_utils.h
@@ -316,13 +316,13 @@ namespace nmos
 
         // additional fmtp parameters from ST 2110-21:2022
         sdp::type_parameter tp;
-        uint32_t troff; // if omitted (zero), assume default
+        bst::optional<uint32_t> troff; // if omitted, assume default
         uint32_t cmax; // if omitted (zero), assume max defined for tp
 
         // additional fmtp parameters from ST 2110-10:2022
         uint32_t maxudp; // if omitted (zero), assume the Standard UP Size Limit
         sdp::timestamp_mode tsmode; // if omitted (empty), assume sdp::timestamp_modes::NEW
-        uint32_t tsdelay;
+        bst::optional<uint32_t> tsdelay;
 
         video_raw_parameters() : depth(), width(), height(), interlace(), segmented(), troff(), cmax(), maxudp(), tsdelay() {}
 
@@ -341,11 +341,11 @@ namespace nmos
             sdp::packing_mode pm,
             sdp::smpte_standard_number ssn,
             sdp::type_parameter tp,
-            uint32_t troff,
+            bst::optional<uint32_t> troff,
             uint32_t cmax,
             uint32_t maxudp,
             sdp::timestamp_mode tsmode,
-            uint32_t tsdelay
+            bst::optional<uint32_t> tsdelay
         )
             : sampling(std::move(sampling))
             , depth(depth)
@@ -393,7 +393,7 @@ namespace nmos
 
         // additional fmtp parameters from ST 2110-10:2022
         sdp::timestamp_mode tsmode; // if omitted (empty), assume sdp::timestamp_modes::NEW
-        uint32_t tsdelay;
+        bst::optional<uint32_t> tsdelay;
 
         // ptime
         double packet_time;
@@ -406,7 +406,7 @@ namespace nmos
             uint64_t sample_rate,
             utility::string_t channel_order,
             sdp::timestamp_mode tsmode,
-            uint32_t tsdelay,
+            bst::optional<uint32_t> tsdelay,
             double packet_time
         )
             : channel_count(channel_count)
@@ -442,11 +442,11 @@ namespace nmos
         sdp::smpte_standard_number ssn;
 
         // additional fmtp parameters from ST 2110-21:2022
-        uint32_t troff; // if omitted (zero), assume default
+        bst::optional<uint32_t> troff; // if omitted, assume default
 
         // additional fmtp parameters from ST 2110-10:2022
         sdp::timestamp_mode tsmode; // if omitted (empty), assume sdp::timestamp_modes::NEW
-        uint32_t tsdelay;
+        bst::optional<uint32_t> tsdelay;
 
         video_smpte291_parameters() : vpid_code(), troff(), tsdelay() {}
 
@@ -456,9 +456,9 @@ namespace nmos
             nmos::rational exactframerate,
             sdp::transmission_model tm,
             sdp::smpte_standard_number ssn,
-            uint32_t troff,
+            bst::optional<uint32_t> troff,
             sdp::timestamp_mode tsmode,
-            uint32_t tsdelay
+            bst::optional<uint32_t> tsdelay
         )
             : did_sdids(std::move(did_sdids))
             , vpid_code(vpid_code)
@@ -482,13 +482,13 @@ namespace nmos
     {
         // additional fmtp parameters from ST 2110-21:2017
         sdp::type_parameter tp;
-        uint32_t troff; // if omitted (zero), assume default
+        bst::optional<uint32_t> troff; // if omitted, assume default
 
         video_SMPTE2022_6_parameters() : troff() {}
 
         video_SMPTE2022_6_parameters(
             sdp::type_parameter tp,
-            uint32_t troff
+            bst::optional<uint32_t> troff
         )
             : tp(std::move(tp))
             , troff(troff)

diff --git a/Development/nmos/test/sdp_test_utils.cpp b/Development/nmos/test/sdp_test_utils.cpp
@@ -0,0 +1,31 @@
+#include "nmos/test/sdp_test_utils.h"
+
+#include "bst/test/test.h"
+#include "nmos/sdp_utils.h"
+
+namespace nmos
+{
+    typedef std::multimap<utility::string_t, utility::string_t> comparable_fmtp_t;
+
+    inline comparable_fmtp_t comparable_fmtp(const nmos::sdp_parameters::fmtp_t& fmtp)
+    {
+        return comparable_fmtp_t{ fmtp.begin(), fmtp.end() };
+    }
+
+    void check_sdp_parameters(const nmos::sdp_parameters& lhs, const nmos::sdp_parameters& rhs)
+    {
+        BST_REQUIRE_EQUAL(lhs.session_name, rhs.session_name);
+        BST_REQUIRE_EQUAL(lhs.rtpmap.payload_type, rhs.rtpmap.payload_type);
+        BST_REQUIRE_EQUAL(lhs.rtpmap.encoding_name, rhs.rtpmap.encoding_name);
+        BST_REQUIRE_EQUAL(lhs.rtpmap.clock_rate, rhs.rtpmap.clock_rate);
+        if (0 != lhs.rtpmap.encoding_parameters)
+            BST_REQUIRE_EQUAL(lhs.rtpmap.encoding_parameters, rhs.rtpmap.encoding_parameters);
+        else
+            BST_REQUIRE((0 == rhs.rtpmap.encoding_parameters || 1 == rhs.rtpmap.encoding_parameters));
+        BST_REQUIRE_EQUAL(comparable_fmtp(lhs.fmtp), comparable_fmtp(rhs.fmtp));
+        BST_REQUIRE_EQUAL(lhs.packet_time, rhs.packet_time);
+        BST_REQUIRE_EQUAL(lhs.max_packet_time, rhs.max_packet_time);
+        BST_REQUIRE_EQUAL(lhs.bandwidth.bandwidth_type, rhs.bandwidth.bandwidth_type);
+        BST_REQUIRE_EQUAL(lhs.bandwidth.bandwidth, rhs.bandwidth.bandwidth);
+    }
+}
diff --git a/Development/nmos/test/sdp_test_utils.h b/Development/nmos/test/sdp_test_utils.h
@@ -0,0 +1,11 @@
+#ifndef NMOS_SDP_TEST_UTILS_H
+#define NMOS_SDP_TEST_UTILS_H
+
+namespace nmos
+{
+    struct sdp_parameters;
+
+    void check_sdp_parameters(const nmos::sdp_parameters& lhs, const nmos::sdp_parameters& rhs);
+}
+
+#endif