Commit: 61dd9835f0a99ff4fe3dc2b5a61f8bbae516387a - web_live_steramer (git)

Commit MetaInfo

• Revisão: 61dd9835f0a99ff4fe3dc2b5a61f8bbae516387a (tree)
• Hora: 2017-03-06 21:57:02
• Autor: dyknon <dyknon@user...>
• Commiter: dyknon

Mensagem de Log

Javascript:配信待追加, server:引数で動画指定, socket:home以下に

Mudança Sumário

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

Diff

--- a/live.pl
+++ b/live.pl
@@ -31,10 +31,13 @@ use utf8;
 use IO::Socket::UNIX;
 use JSON;
 use Encode;
+use Cwd;
 
 $| = 1;
 
-my $sockpath = "/tmp/media_server.sock";
+my $home = Cwd::getcwd();
+$home =~ s!/public_html/.*!/!;
+my $sockpath = $home."socks/media_server.sock";
 
 if(!$ENV{QUERY_STRING}){
     binmode(STDOUT, ":utf8");
@@ -90,8 +93,12 @@ if(!$ENV{QUERY_STRING}){
             this.cont.appendChild(this.fs_button);
         }
         live_streamer.prototype.keycb = function(resp){
-            if(resp === null || resp.status == "nostreams"){
+            if(resp === null){
+                this.statbox.textContent = "通信エラー(再読込してね)";
+                return;
+            }else if(resp.status == "nostreams"){
                 this.statbox.textContent = "配信なしだよ。";
+                window.setTimeout(function(t){t.keyretrycb()}, 300, this);
                 return;
             }
             this.sindex = resp.key;
@@ -101,10 +108,17 @@ if(!$ENV{QUERY_STRING}){
             this.statbox.textContent = "loading video header";
             //this.cindex++;
         };
+        live_streamer.prototype.keyretrycb = function(){
+            this.nexcb = this.keycb;
+            this.request("key", null);
+        };
         live_streamer.prototype.datacb = function(resp){
             if(resp === null){
                 this.statbox.textContent = "放送終了かな。";
                 this.ms.endOfStream();
+                window.setTimeout(function(t){
+                    new live_streamer(t.velm, t.cont, t.statbox, t.serv);
+                }, (1000*this.bufremain()+1)|0, this);
                 return;
             }else if(resp.status == "nostreams"){
                 this.statbox.textContent = "配信なしだよ。";
@@ -113,7 +127,6 @@ if(!$ENV{QUERY_STRING}){
             this.nexcb = this.updatecb;
             this.sb.addEventListener("updateend", this);
             this.sb.appendBuffer(resp);
-            this.statbox.textContent = "video data appended";
         };
         live_streamer.prototype.updatecb = function(ev){
             this.nexcb = this.datacb;

--- a/unixsock_mediaserver.pl
+++ b/unixsock_mediaserver.pl
@@ -32,7 +32,7 @@ use IO::Pipe;
 use IO::Socket::UNIX;
 use IO::Select;
 
-my $sockpath = "/tmp/media_server.sock";
+my $sockpath = $ENV{HOME}."/socks/media_server.sock";
 
 $| = 1;
 $SIG{PIPE} = "IGNORE";
@@ -658,9 +658,11 @@ $readsel = IO::Select->new();
 $writesel = IO::Select->new();
 
 my $in_handle = new IO::Pipe;
-$in_handle->reader(qw{ffmpeg -loglevel panic -i video2stream -map 0:v -map 0:a -c:v vp8 -deadline:v realtime -cpu-used:v 8 -g:v 20 -q:v 24 -qmax:v 28 -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 video2stream -map 0:v:0 -map 0:a:0 -c:v vp8 -deadline:v realtime -cpu-used:v 8 -g:v 20 -q:v 30 -qmax:v 32 -live 1 -vf realtime -c:a libvorbis -b:a 64k -cluster_size_limit 10000000 -cluster_time_limit 1000000 -s wvga -f webm -});
 #$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 -});
 binmode($in_handle, ":raw");
 StreamInHandler->new($in_handle);