Commit: 7bc6626b5a35369008ae9d1194ac808d44739c65 - web_live_steramer (git)

Commit MetaInfo

• Revision: 7bc6626b5a35369008ae9d1194ac808d44739c65 (tree)
• Time: 2017-03-14 21:59:20
• Author: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

主に、再生同期をマシにした。他にも小変更

解像度デフォをwvgaに
次の配信開始待機の開始までの時間を伸ばした
プレイヤーがブラウザ窓の幅より大きくならないように
ボリュームが毎回100%になるのをどうにかした

Change Summary

• modified: live.pl
• modified: unixsock_mediaserver.pl

Incremental Difference

--- a/live.pl
+++ b/live.pl
@@ -51,11 +51,14 @@ if(!$ENV{QUERY_STRING}){
     <script>
         function live_streamer(videoelm, controlbox, statbox, url){
             this.velm = videoelm;
+            var defvol = this.velm.volume;
             this.cont = controlbox;
             this.statbox = statbox;
             this.serv = url;
             this.media_mime = "video/webm; codecs=\\\"vp8, vorbis\\\"";
             this.started = false;
+            this.cache_len = 5;
+            this.skip_delay = 10;
 
             if(!MediaSource
                         || !MediaSource.isTypeSupported(this.media_mime)){
@@ -64,6 +67,7 @@ if(!$ENV{QUERY_STRING}){
             }
             this.ms = new MediaSource();
             this.velm.src = URL.createObjectURL(this.ms);
+            this.velm.volume = defvol;
             this.nexcb = null;
             var lsobj = this;
             this.ms.addEventListener("sourceopen", function(){
@@ -79,7 +83,7 @@ if(!$ENV{QUERY_STRING}){
             this.vol_bar.max = 1;
             this.vol_bar.min = 0;
             this.vol_bar.step = 0.01;
-            this.vol_bar.value = 1;
+            this.vol_bar.value = defvol;
             this.velm.volume = this.vol_bar.value;
             this.vol_bar.addEventListener("change", this);
             this.cont.innerHTML = "volume: ";
@@ -100,6 +104,10 @@ if(!$ENV{QUERY_STRING}){
                 this.statbox.textContent = "配信なしだよ。";
                 window.setTimeout(function(t){t.keyretrycb()}, 300, this);
                 return;
+            }else if(resp.flags & 2){
+                this.statbox.textContent = "配信終了だよ";
+                window.setTimeout(function(t){t.keyretrycb()}, 300, this);
+                return;
             }
             this.sindex = resp.key;
             this.cindex = resp.key;
@@ -118,7 +126,7 @@ if(!$ENV{QUERY_STRING}){
                 this.ms.endOfStream();
                 window.setTimeout(function(t){
                     new live_streamer(t.velm, t.cont, t.statbox, t.serv);
-                }, (1000*this.bufremain()+1)|0, this);
+                }, (1000*this.bufremain()+500)|0, this);
                 return;
             }else if(resp.status == "nostreams"){
                 this.statbox.textContent = "配信なしだよ。";
@@ -131,7 +139,7 @@ if(!$ENV{QUERY_STRING}){
         live_streamer.prototype.updatecb = function(ev){
             this.nexcb = this.datacb;
             this.request("dat", this.cindex);
-            if(!this.started && this.buftail() > 4){
+            if(!this.started && this.buftail() >= this.cache_len){
                 this.started = true;
                 this.velm.play();
             }
@@ -139,10 +147,22 @@ if(!$ENV{QUERY_STRING}){
             stat += "time:"+this.velm.currentTime+"<br>";
             stat += "buffered:"+this.bufremain()+"<br>";
             this.statbox.innerHTML = stat;
-            if(this.bufremain() > 5){
-                this.cindex += 2;
-            }else{
-                this.cindex++;
+            this.cindex++;
+            if(this.bufremain() > this.skip_delay){
+                this.velm.currentTime += this.bufremain() - this.cache_len;
+            }else if(this.bufremain() > this.cache_len + 1.5){
+                this.velm.playbackRate = 1
+                        + (this.bufremain() - this.cache_len) / 10;
+            }else if(this.bufremain() < this.cache_len - 1.5){
+                this.velm.playbackRate = 1
+                        - (this.cache_len - this.bufremain())
+                        / (this.cache_len * 2);
+            }else if(this.velm.playbackRate > 1 &&
+                                this.bufremain() <= this.cache_len){
+                this.velm.playbackRate = 1;
+            }else if(this.velm.playbackRate < 1 &&
+                                this.bufremain() >= this.cache_len){
+                this.velm.playbackRate = 1;
             }
         };
         live_streamer.prototype.request = function(com, n){
@@ -224,7 +244,7 @@ if(!$ENV{QUERY_STRING}){
     </script>
   </head>
   <body>
-    <video id="mainvideo"></video>
+    <video id="mainvideo" style="max-width:100%;max-height:100%"></video>
     <div id="controls"></div>
     <div id="statbox"></div>
   </body>

--- a/unixsock_mediaserver.pl
+++ b/unixsock_mediaserver.pl
@@ -662,7 +662,7 @@ my $in_handle = new IO::Pipe;
 #$in_handle->reader(qw{ffmpeg -loglevel panic -f video4linux2 -r:v 10 -s vga -i /dev/video0 -map 0:v -c:v vp8 -deadline:v good -cpu-used:v 16 -g:v 10 -q:v 25 -qmax:v 28 -pix_fmt yuv420p -live 1 -vf realtime -cluster_size_limit 10000000 -cluster_time_limit 1000000 -f webm -});
 #$in_handle->reader(qw{ffmpeg -loglevel panic -s 1366x768 -r:v 20 -f x11grab -i :0+1080,880 -map 0:v -c:v vp8 -deadline:v good -cpu-used:v 8 -g:v 10 -q:v 25 -qmax:v 28 -pix_fmt yuv420p -live 1 -cluster_size_limit 10000000 -cluster_time_limit 1000000 -s wvga -vf realtime -f webm -});
 defined($ARGV[0]) || die;
-$in_handle->reader(qw{ffmpeg -loglevel panic -i}, $ARGV[0], qw{-map 0:v:0 -map 0:a:0 -c:v vp8 -deadline:v realtime -cpu-used:v 8 -g:v 20 -q:v 28 -qmax:v 30 -live 1 -vf realtime -c:a libvorbis -b:a 64k -cluster_size_limit 10000000 -cluster_time_limit 1000000 -s hd720 -f webm -});
+$in_handle->reader(qw{ffmpeg -loglevel panic -i}, $ARGV[0], qw{-map 0:v:0 -map 0:a:0 -c:v vp8 -deadline:v realtime -cpu-used:v 8 -g:v 20 -q:v 28 -qmax:v 30 -live 1 -vf realtime -c:a libvorbis -ac 2 -ar 44.1k -b:a 64k -cluster_size_limit 10000000 -cluster_time_limit 1000000 -s wvga -f webm -});
 binmode($in_handle, ":raw");
 StreamInHandler->new($in_handle);