Ticket #4644: streamhandler.diff

(a) handler.pl.vr vs. (b) /var/www/localhost/htdocs/mythweb/modules/stream/handler.pl

@@ -157 +140 @@
         CORE::exit;
     }
     elsif ($ENV{'REQUEST_URI'} =~ /\.flv$/i) {
+    # Find out the video dimensions (this is a quick hack)
+        if (!open(FINFO,"$ffmpeg -y -i $filename -r 24 -f flv -ac 2 -ar 11025 -ab 64k -b 256k -vframes 1 -ss 65 /dev/null 2> /dev/stdout|")) {
+            print header(), 
+                "Error: Can not get ffmpeg output for file $filename..\n";
+            CORE::exit;
+        }
+
+        my $horz;
+        my $vert;
+
+        while (<FINFO>) {
+            if (/Stream #0.0/) {
+                ($horz, $vert) = /\s(\d+)x(\d+),/;
+                last;
+            }
+        }
+        $ratio = $vert / $horz;
+        $newhorz = 320;
+        $newvert = int($newhorz * $ratio);
+
+        $newvert += $newvert % 8; # make the new vert a multiple of 8
+        if ( $newvert > 240 ) {
+            $newvert = 240;
+        }
+
+        close FINFO;
+
     # Print the movie
-    $ffmpeg_pid = open(DATA, "$ffmpeg -y -i $filename -s ${width}x$height -r 24 -f flv -ac 2 -ar 11025 -ab ${abitrate}k -b ${vbitrate}k /dev/stdout 2>/dev/null |");
+        $ffmpeg_pid = open(DATA, "$ffmpeg -y -i $filename -s " . $newhorz . "x" . $newvert . " -r 24 -f flv -ac 2 -ar 11025 -ab 64k -b 256k /dev/stdout 2>/dev/null |");
         unless ($ffmpeg_pid) {
             print header(),
                   "Can't do ffmpeg:  $!";
@@ -213 +223 @@
 # Open the file for reading
     unless (sysopen DATA, $filename, O_RDONLY) {
         print header(),
-              "Can't read $basname:  $!";
+              "Can't read $basename:  $!";
         CORE::exit;
     }