From 39962eaddc17f27eb1baa694ac588138439621d4 Mon Sep 17 00:00:00 2001
From: Romain LE DISEZ <romain.git@ledisez.net>
Date: Sun, 4 Jul 2010 21:53:57 +0200
Subject: Accept extension .m4v as video/mp4

---
 modules/gallery/controllers/file_proxy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/controllers/file_proxy.php')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 32690fc0..bead9f3f 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -72,10 +72,10 @@ class File_Proxy_Controller extends Controller {
       // necessary, it's easily resurrected.
 
       // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail
-      // for a movie.  In that case, the .flv or .mp4 file would have been converted to a .jpg.
+      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a .jpg.
       // So try some alternate types:
       if (preg_match('/.jpg$/', $path)) {
-        foreach (array("flv", "mp4") as $ext) {
+        foreach (array("flv", "mp4", "m4v") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path);
           $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
           if ($item->loaded()) {
-- 
cgit v1.2.3


From a8bb0462097bd83cd87bf9048b8be879cff3cd6c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 31 Jul 2010 11:51:18 -0700
Subject: Use readfile() instead of fopen()/fpassthru()/fclose() for brevity.
 I've done some tests on a 60M flv and found that there's no difference in
 memory consumption with these three approaches:

  public function test() {
    Kohana::close_buffers(false);
    $file = "/home/bharat/basketball.flv";
    if ($fd = fopen($file, "rb")) {
      while (true) {
        $bits = fread($fd, 65535);
        if (strlen($bits) == 0) {
          break;
        }
        print $bits;
        set_time_limit(30);
      }
      fclose($fd);
    }
    Kohana_Log::add("error","test: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1));
  }

  public function test2() {
    Kohana::close_buffers(false);
    $file = "/home/bharat/basketball.flv";
    $fd = fopen($file, "rb");
    fpassthru($fd);
    fclose($fd);
    Kohana_Log::add("error","test2: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1));
  }

  public function test3() {
    Kohana::close_buffers(false);
    $file = "/home/bharat/basketball.flv";
    readfile($file);
    Kohana_Log::add("error","test3: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1));
  }
---
 modules/gallery/controllers/file_proxy.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/controllers/file_proxy.php')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index bead9f3f..15b4279f 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -72,8 +72,8 @@ class File_Proxy_Controller extends Controller {
       // necessary, it's easily resurrected.
 
       // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail
-      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a .jpg.
-      // So try some alternate types:
+      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a
+      // .jpg. So try some alternate types:
       if (preg_match('/.jpg$/', $path)) {
         foreach (array("flv", "mp4", "m4v") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path);
@@ -131,10 +131,7 @@ class File_Proxy_Controller extends Controller {
     } else {
       header("Content-Type: $item->mime_type");
     }
-
     Kohana::close_buffers(false);
-    $fd = fopen($file, "rb");
-    fpassthru($fd);
-    fclose($fd);
+    readfile($file);
   }
 }
-- 
cgit v1.2.3