Ticket #8206: pseudostreaming.4.patch

modules/stream/handler.pl

@@ -30 +30 @@
     elsif ($ENV{'REQUEST_URI'} =~ /\.flvp$/i) {
         require "modules/$Path[0]/stream_flvp.pl";
     }
-    elsif ($ENV{'REQUEST_URI'} =~ /\.flv$/i) {
+    elsif ($ENV{'REQUEST_URI'} =~ /\.flv\?.+$/i) {
         require "modules/$Path[0]/stream_flv.pl";
     }
 # Mpeg4?

modules/stream/stream_flv.pl

@@ -29 +29 @@
     }
     sub shutdown_handler {
         kill(1, $ffmpeg_pid) if ($ffmpeg_pid);
-        kill(-1, $ffmpeg_pgid) if ($ffmpeg_pid);
+
+        # this cause an internal server error
+        # kill(-1, $ffmpeg_pgid) if ($ffmpeg_pid);
     }
 
 # Find ffmpeg
@@ -72 +74 @@
     $vbitrate = 256 unless ($vbitrate && $vbitrate > 1);
     $abitrate = 64  unless ($abitrate && $abitrate > 1);
 
+    if ("$ENV{'REQUEST_URI'}" =~ /start\=(\d+)$/i) {
+            $start = $1; }
+    else {
+            $start = 0; }
+
     my $ffmpeg_command = $ffmpeg
                         .' -y'
+                        .' -ss '.shell_escape("$start")
                         .' -i '.shell_escape($filename)
                         .' -s '.shell_escape("${width}x${height}")
                         .' -g 30'
@@ -98 +106 @@
     $dur = `ffmpeg -i $filename 2>&1 | grep "Duration" | cut -d ' ' -f 4 | sed s/,//`;
     if ($dur && $dur =~ /\d*:\d*:.*/) {
         @times = split(':',$dur);
-        $lengthSec = $times[0]*3600+$times[1]*60+$times[2];
+        $lengthSec = ($times[0]*3600+$times[1]*60+$times[2])-$start;
         $size = int($lengthSec*($vbitrate*1000+$abitrate*1000)/8);
         print header(-type => 'video/x-flv','Content-Length' => $size);
     } else {
         print header(-type => 'video/x-flv');
     }
 
+
+
+
     my $buffer;
     if (read DATA, $buffer, 53) {
         print $buffer;

modules/tv/tmpl/default/detail.php

@@ -554 +554 @@
             <script>
                 flowplayer(
                     "player",
-                    "<?php echo root_url ?>tv/flowplayer-3.1.1.swf", {
+                    "<?php echo root_url ?>tv/flowplayer-3.1.5.swf", {
                     playlist: [
                         // this first PNG clip works as a splash image
                         {
@@ -563 +563 @@
                             },
                         // Then we have the video
                         {
+                            provider: "pseudo", 
                             url: "<?php echo video_url($program, 'flv'); ?>",
                             duration: <?php echo $program->length ?>,
                             autoPlay: false,
@@ -571 +572 @@
                             // waste bandwidth and CPU on the remote machine.
                             autoBuffering: false
                             }
-                        ]}
+                      
+                    ], 
+                    plugins: {  
+                        pseudo: { 
+                            url: "flowplayer.mythpseudostreaming.swf" 
+                        } 
+                    } 
+                    } 
+
                     );
             </script>
 <?php       } elseif (file_exists('modules/tv/MFPlayer.swf')) { ?>
@@ -689 +698 @@
 <?php   } else { ?>
                 <a href="<?php echo $program->url ?>" title="<?php echo t('Direct Download') ?>"
                     ><img src="<?php echo $program->thumb_url($flv_w,0) ?>" width="<?php echo $flv_w ?>"></a>
-<?php   } ?></td>
+<?php   } ?>
             </div>
             <div class="x-links">
                 <a href="<?php echo video_url($program, 'asx') ?>" title="<?php echo t('ASX Stream') ?>"