feat: ws_h264, 消息堆积时，仅丢弃非关键视频帧

nintha · nintha · commit 56a63312dd7f · 2021-05-29T11:36:37.000+08:00
diff --git a/src/main.rs b/src/main.rs
@@ -8,11 +8,11 @@ use river::util::spawn_and_log_error;
 #[derive(Clap, Debug)]
 #[clap(version = crate_version ! (), author = "Ninthakeey <ninthakeey@hotmail.com>")]
 struct Opts {
-    #[clap(long, default_value = "0", about = "disabled if port is 0")]
-    http_player_port: u16,
     #[clap(long, default_value = "0", about = "disabled if port is 0")]
     http_flv_port: u16,
-    #[clap(long, default_value = "0", about = "disabled if port is 0")]
+    #[clap(long, default_value = "18000", about = "disabled if port is 0")]
+    http_player_port: u16,
+    #[clap(long, default_value = "18001", about = "disabled if port is 0")]
     ws_h264_port: u16,
     #[clap(long, default_value = "0", about = "disabled if port is 0")]
     ws_fmp4_port: u16,
diff --git a/src/ws_h264.rs b/src/ws_h264.rs
@@ -83,9 +83,9 @@ fn rtmp_rx_into_mix_rx(rx: Receiver<RtmpMessage>, stream_name: String) -> impl S
 
             let mut mixes = mixes.into_iter().skip_while(|mix| !mix.is_key_frame()).collect::<Vec<Mix>>();
 
-            // 消息堆积，丢弃非关键帧
-            if rx.len() > 3 {
-                mixes.retain(|x| x.is_key_frame());
+            // 消息堆积，丢弃视频非关键帧
+            if rx.len() > 30 {
+                mixes.retain(|x| x.is_audio() || x.is_key_frame());
             }
 
             if mixes.is_empty() {
diff --git a/static/player.html b/static/player.html
@@ -45,7 +45,7 @@
 
     $(function main() {
         jmuxer = new JMuxer({
-            flushingTime: 100,
+            flushingTime: 50,
             fps: 30,
             node: 'player',
             mode: 'both', /* available values are: both, audio and video */
@@ -103,9 +103,9 @@
     function forward_latest_frame(video) {
         if (video && video.buffered && video.buffered.end(0)) {
             let latest = video.buffered.end(0);
-            if (latest - video.currentTime > 0.3) {
+            console.log(`[forward_latest_frame] latest=${latest}, video.buffered.length=${video.buffered.length}`);
+            if (latest - video.currentTime > 0.2) {
                 video.currentTime = latest;
-                console.log(`[forward_latest_frame] latest=${latest}`);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`$(function main() {`
`47`	`47`	`jmuxer = new JMuxer({`
`48`		`- flushingTime: 100,`
	`48`	`+ flushingTime: 50,`
`49`	`49`	`fps: 30,`
`50`	`50`	`node: 'player',`
`51`	`51`	`mode: 'both', /* available values are: both, audio and video */`
`@@ -103,9 +103,9 @@`
`103`	`103`	`function forward_latest_frame(video) {`
`104`	`104`	`if (video && video.buffered && video.buffered.end(0)) {`
`105`	`105`	`let latest = video.buffered.end(0);`
`106`		`- if (latest - video.currentTime > 0.3) {`
	`106`	+ console.log(`[forward_latest_frame] latest=${latest}, video.buffered.length=${video.buffered.length}`);
	`107`	`+ if (latest - video.currentTime > 0.2) {`
`107`	`108`	`video.currentTime = latest;`
`108`		- console.log(`[forward_latest_frame] latest=${latest}`);
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`