Merge pull request #113 from harlanc/fix_111

fix two bugs of xwebrtc library #111
harlanc · Apr 3, 2024 · fa882d2 · fa882d2
2 parents d3a9bbf + 37ba289
commit fa882d2
Show file tree

Hide file tree

Showing 8 changed files with 488 additions and 287 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/application/xiu/CHANGELOG.md b/application/xiu/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+## [0.12.6] - 2021-04-03
+- Fix bug that the whip stream can not be established successfully #111.
+- Fix the issue of not correctly recognizing Opus encoding parameters.
+- Fix the issue of not being able to read HTTP resources when pulling streams using the WHEP.
+
 ## [0.12.5]
 - Support querying more detailed statistic data by adding two new HTTP APIs.
 - Fix publishing RTSP stream error caused by network problem. by @bailb

diff --git a/confs/online/webrtc.Cargo.toml b/confs/online/webrtc.Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xwebrtc"
-version = "0.3.2"
+version = "0.3.3"
 description = "A whip/whep library."
 edition = "2021"
 authors = ["HarlanC <wawacry@qq.com>"]
@@ -17,7 +17,7 @@ bytes = "1.0.0"
 tokio = "1.4.0"
 failure = "0.1.8"
 log = "0.4"
-webrtc = "0.10.1"
+webrtc = "0.8.0"
 async-trait = "0.1.70"
 fdk-aac = "0.6.0"
 audiopus = "0.3.0-rc.0"

diff --git a/confs/online/xiu.Cargo.toml b/confs/online/xiu.Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "xiu"
 description = "A powerful live server by Rust ."
-version = "0.12.5"
+version = "0.12.6"
 authors = ["HarlanC <wawacry@qq.com"]
 repository = "https://github.com/harlanc/xiu"
 license = "MIT"
@@ -32,7 +32,7 @@ rtmp = "0.6.3"
 xrtsp = "0.2.2"
 httpflv = "0.4.3"
 hls = "0.5.3"
-xwebrtc = "0.3.2"
+xwebrtc = "0.3.3"
 commonlib = "0.1.1"
 
 [features]

diff --git a/protocol/webrtc/CHANGELOG.md b/protocol/webrtc/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+## [0.3.3] - 2021-04-03
+- Fix bug that the whip stream can not be established successfully.
+- Fix the issue of not correctly recognizing Opus encoding parameters.
+- Fix the issue of not being able to read HTTP resources when pulling streams using the WHEP.
+
 ## [0.3.2] - 2021-03-15
 - Upgrade failure library.
 - Some changes for statistics feature.

diff --git a/protocol/webrtc/Cargo.toml b/protocol/webrtc/Cargo.toml
@@ -17,7 +17,7 @@ bytes = "1.0.0"
 tokio = "1.4.0"
 failure = "0.1.8"
 log = "0.4"
-webrtc = "0.10.1"
+webrtc = "0.8.0"
 async-trait = "0.1.70"
 fdk-aac = "0.6.0"
 audiopus = "0.3.0-rc.0"

diff --git a/protocol/webrtc/src/session/mod.rs b/protocol/webrtc/src/session/mod.rs
@@ -114,12 +114,27 @@ impl WebRTCServerSession {
             let eles: Vec<&str> = http_request.uri.path.splitn(2, '/').collect();
             let pars_map = &http_request.query_pairs;
 
+            let exe_directory = if let Ok(mut exe_path) = std::env::current_exe() {
+                exe_path.pop();
+                exe_path.to_string_lossy().to_string()
+            } else {
+                "/app".to_string()
+            };
+
             let request_method = http_request.method.as_str();
             if request_method == http_method_name::GET {
                 let response = match http_request.uri.path.as_str() {
-                    "/" => Self::gen_file_response("./index.html"),
-                    "/whip.js" => Self::gen_file_response("./whip.js"),
-                    "/whep.js" => Self::gen_file_response("./whep.js"),
+                    "/" => Self::gen_file_response(
+                        format!("{}/{}", exe_directory, "index.html").as_str(),
+                    ),
+                    "/whip.js" => {
+                        Self::gen_file_response(format!("{}/{}", exe_directory, "whip.js").as_str())
+                    }
+
+                    "/whep.js" => {
+                        Self::gen_file_response(format!("{}/{}", exe_directory, "whep.js").as_str())
+                    }
+
                     _ => {
                         log::warn!(
                             "the http get path: {} is not supported.",

diff --git a/protocol/webrtc/src/whip.rs b/protocol/webrtc/src/whip.rs
@@ -200,7 +200,7 @@ pub async fn handle_whip(
                         if attr.starts_with("rtpmap:") {
                             if let Ok(codec) = parse_rtpmap(&attr) {
                                 log::info!("codec: {}", codec);
-                                match codec.name.as_str() {
+                                match codec.name.to_uppercase().as_str() {
                                     "H264" => {
                                         video_codec = codec;
                                     }