WHIP: Add OBS support, ensuring compatibility with a unique SDP. v5.0…

….158, v6.0.51 (#3581) 1. Ignore SDP GROUP LS. 2. Support ice in global session info. 3. Support audio codec "OPUS" or "opus". --------- Co-authored-by: Johnny <[email protected]>
ossrs · Jun 15, 2023 · 7f997b3 · 7f997b3
1 parent 0ce2983
commit 7f997b3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -8,6 +8,7 @@ The changelog for SRS.
 
 ## SRS 6.0 Changelog
 
+* v6.0, 2023-06-15, Merge [#3581](https://github.com/ossrs/srs/pull/3581): WHIP: Add OBS support, ensuring compatibility with a unique SDP. v6.0.51 (#3581)
 * v6.0, 2023-06-13, Merge [#3579](https://github.com/ossrs/srs/pull/3579): TOC: Welcome to the new TOC member, ZhangJunqin. v6.0.50 (#3579)
 * v6.0, 2023-06-12, Merge [#3570](https://github.com/ossrs/srs/pull/3570): GB: Correct the range of keyframe error for compile warning. v6.0.49 (#3570)
 * v6.0, 2023-06-05, Fix command injection in demonstration api-server for HTTP callback. v6.0.48
@@ -64,6 +65,7 @@ The changelog for SRS.
 
 ## SRS 5.0 Changelog
 
+* v5.0, 2023-06-15, Merge [#3581](https://github.com/ossrs/srs/pull/3581): WHIP: Add OBS support, ensuring compatibility with a unique SDP. v5.0.158 (#3581)
 * v5.0, 2023-06-05, Fix command injection in demonstration api-server for HTTP callback. v5.0.157
 * v5.0, 2023-06-05, Merge [#3565](https://github.com/ossrs/srs/pull/3565): DTLS: Use bio callback to get fragment packet. v5.0.156 (#3565)
 * v5.0, 2023-05-29, Merge [#3513](https://github.com/ossrs/srs/pull/3513): SSL: Fix SSL_get_error get the error of other coroutine. v5.0.155 (#3513)

diff --git a/trunk/src/app/srs_app_rtc_sdp.cpp b/trunk/src/app/srs_app_rtc_sdp.cpp
@@ -940,7 +940,12 @@ void SrsSdp::add_candidate(const std::string& protocol, const std::string& ip, c
 
 std::string SrsSdp::get_ice_ufrag() const
 {
-    // Becaues we use BUNDLE, so we can choose the first element.
+    // For OBS WHIP, use the global ice-ufrag.
+    if (!session_info_.ice_ufrag_.empty()) {
+        return session_info_.ice_ufrag_;
+    }
+
+    // Because we use BUNDLE, so we can choose the first element.
     for (std::vector<SrsMediaDesc>::const_iterator iter = media_descs_.begin(); iter != media_descs_.end(); ++iter) {
         const SrsMediaDesc* desc = &(*iter);
         return desc->session_info_.ice_ufrag_;
@@ -951,7 +956,12 @@ std::string SrsSdp::get_ice_ufrag() const
 
 std::string SrsSdp::get_ice_pwd() const
 {
-    // Becaues we use BUNDLE, so we can choose the first element.
+    // For OBS WHIP, use the global ice pwd.
+    if (!session_info_.ice_pwd_.empty()) {
+        return session_info_.ice_pwd_;
+    }
+
+    // Because we use BUNDLE, so we can choose the first element.
     for (std::vector<SrsMediaDesc>::const_iterator iter = media_descs_.begin(); iter != media_descs_.end(); ++iter) {
         const SrsMediaDesc* desc = &(*iter);
         return desc->session_info_.ice_pwd_;
@@ -962,7 +972,7 @@ std::string SrsSdp::get_ice_pwd() const
 
 std::string SrsSdp::get_dtls_role() const
 {
-    // Becaues we use BUNDLE, so we can choose the first element.
+    // Because we use BUNDLE, so we can choose the first element.
     for (std::vector<SrsMediaDesc>::const_iterator iter = media_descs_.begin(); iter != media_descs_.end(); ++iter) {
         const SrsMediaDesc* desc = &(*iter);
         return desc->session_info_.setup_;
@@ -1132,6 +1142,12 @@ srs_error_t SrsSdp::parse_attr_group(const std::string& value)
     srs_error_t err = srs_success;
     // @see: https://tools.ietf.org/html/rfc5888#section-5
 
+    // Overlook the OBS WHIP group LS, as it is utilized for synchronizing the playback of
+    // the relevant media streams, see https://datatracker.ietf.org/doc/html/rfc5888#section-7
+    if (srs_string_starts_with(value, "LS")) {
+        return err;
+    }
+
     std::istringstream is(value);
 
     FETCH(is, group_policy_);

diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp
@@ -684,7 +684,10 @@ std::vector<SrsRtcTrackDescription*> SrsRtcSource::get_track_desc(std::string ty
         if (! stream_desc_->audio_track_desc_) {
             return track_descs;
         }
-        if (stream_desc_->audio_track_desc_->media_->name_ == media_name) {
+
+        string name = stream_desc_->audio_track_desc_->media_->name_;
+        std::transform(name.begin(), name.end(), name.begin(), static_cast<int(*)(int)>(std::tolower));
+        if (name == media_name) {
             track_descs.push_back(stream_desc_->audio_track_desc_);
         }
     }

diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    157
+#define VERSION_REVISION    158
 
 #endif
diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    50
+#define VERSION_REVISION    51
 
 #endif