Commit: 7d98aa7e9f360169e62c957460ef177822fb7303 - web_live_steramer (git)

Commit MetaInfo

• Revision: 7d98aa7e9f360169e62c957460ef177822fb7303 (tree)
• Time: 2017-03-30 21:02:02
• Author: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

再生速度で同期する気がする

Change Summary

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

Incremental Difference

--- a/live.pl
+++ b/live.pl
@@ -111,6 +111,8 @@ if(!$ENV{QUERY_STRING}){
             }
             this.sindex = resp.key;
             this.cindex = resp.key;
+            this.cache_len = resp.buflen / 1000;
+            this.skip_delay = this.cache_len*2;
             this.nexcb = this.datacb;
             this.request("head", null);
             this.statbox.textContent = "loading video header";
@@ -279,19 +281,19 @@ if($con){
             $num = $args{n};
         }
         $con->send("i".pack("Q", $num), 0);
-        $con->recv($buf, 8*4+1, 0);
-        my ($cnum, $size, $pos, $cpos, $flags) = unpack("QQQQC", $buf);
+        $con->recv($buf, 8*4+4+1, 0);
+        my ($cnum, $size, $pos, $cpos, $buf_len, $flags) = unpack("QQQQLC", $buf);
         send_json({status=>"ok", num=>$cnum, size=>$size,
-                pos=>$pos, cpos=>$cpos, flags=>$flags});
+                pos=>$pos, cpos=>$cpos, buflen=>$buf_len, flags=>$flags});
     }elsif($args{req} eq "key"){
         $con->send("k", 0);
         $con->recv($buf, 8, 0);
         my $num = unpack("Q", $buf);
         $con->send("i".pack("Q", $num), 0);
-        $con->recv($buf, 8*4+1, 0);
-        my ($cnum, $size, $pos, $cpos, $flags) = unpack("QQQQC", $buf);
+        $con->recv($buf, 8*4+4+1, 0);
+        my ($cnum, $size, $pos, $cpos, $buf_len, $flags) = unpack("QQQQLC", $buf);
         send_json({status=>"ok", key=>$num, num=>$cnum, size=>$size,
-                pos=>$pos, cpos=>$cpos, flags=>$flags});
+                pos=>$pos, cpos=>$cpos, buflen=>$buf_len, flags=>$flags});
     }elsif($args{req} eq "head"){
         if(defined($args{n})){
             if($args{n} =~ /^[0-9]+$/){
@@ -340,8 +342,8 @@ if($con){
         }elsif($args{n} =~ /^[0-9]+$/){
             $num = $args{n};
             $con->send("i".pack("Q", $num), 0);
-            $con->recv($buf, 8*4+1, 0);
-            my ($cnum, $size, $pos, $cpos, $flags) = unpack("QQQQC", $buf);
+            $con->recv($buf, 8*4+4+1, 0);
+            my ($cnum, $size, $pos, $cpos, $buf_len, $flags) = unpack("QQQQLC", $buf);
             if(!($flags & 0x01)){
                 goto IF_BAD_REQ;
             }

--- a/unixsock_mediaserver.pl
+++ b/unixsock_mediaserver.pl
@@ -33,6 +33,7 @@ use IO::Socket::UNIX;
 use IO::Select;
 
 my $sockpath = $ENV{HOME}."/socks/media_server.sock";
+our $buf_len = 5000;
 
 $| = 1;
 $SIG{PIPE} = "IGNORE";
@@ -573,8 +574,8 @@ sub read{
                 if($cluster_num){
                     $cpos = int($clusters{$cluster_num-1}{time} * 1000);
                 }
-                $self->{wbuf} = pack("QQQQC",
-                        $cluster_num, $sum, $pos, $cpos, $flags);
+                $self->{wbuf} = pack("QQQQLC",
+                        $cluster_num, $sum, $pos, $cpos, $buf_len, $flags);
             }
         }
     }else{
@@ -662,7 +663,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 -ac 2 -ar 44.1k -b:a 64k -cluster_size_limit 10000000 -cluster_time_limit 1000000 -s wvga -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 24 -qmax:v 28 -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);