Ticket #6023: mythweb_stream_aspect.patch

modules/stream/stream_flv.pl

@@ -41 +41 @@
     my ($vbitrate) = $sh->fetchrow_array;
     $sh->execute('WebFLV_ab');
     my ($abitrate) = $sh->fetchrow_array;
-# Someday, we can auto-detect height based on aspect ratio
-    my $height = int($width * 3/4);
-
     $sh->finish();
+# auto-detect height based on aspect ratio
+    $sh = $dbh->prepare('SELECT data FROM recordedmarkup WHERE chanid=? AND starttime=FROM_UNIXTIME(?) AND data IS NOT NULL ORDER BY data DESC');
+    $sh->execute($chanid,$starttime); 
+    $x = $sh->fetchrow_array;
+    $y = $sh->fetchrow_array if ($x);
+    if ($x && $y) {
+        $height = int($width * ($y/$x));
+    } else {
+        $height = int($width * 3/4);
+    }
+    $sh->finish();
 
     $width    = 320 unless ($width    && $width    > 1);
     $height   = 240 unless ($height   && $height   > 1);

modules/mythweb/tmpl/default/set_flvplayer.php

@@ -52 +52 @@
     <td><input type="text" name="width"
          size="5" title="FLV Width"
          value="<?php echo intVal(_or(setting('WebFLV_w'), 320)) ?>" />
-         x
-         <?php echo intVal(_or(setting('WebFLV_w'), 320) * 3/4) ?>
          <br>
-         (hard-coded at 4:3 until we can detect recording aspect)
+         (height is calculated automatically from the recording aspect ratio)
          </td>
 </tr><tr>
     <th><?php echo t('Video Bitrate') ?>:</th>