1.1 --- a/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 19:56:20 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/final_cut.clj	Thu Aug 23 19:58:14 2012 -0400
     1.3 @@ -155,6 +155,26 @@
     1.4        move-images screenshots ram-maps targets))))
     1.5  
     1.6  
     1.7 +;; (defn final-cut! [^File render-dir]
     1.8 +;;   (let [movie (File. render-dir "final.ogg")
     1.9 +;;         final-audio (File. render-dir "final.wav")
    1.10 +;;         final (File. render-dir "final")]
    1.11 +;;     (.delete movie)
    1.12 +;;     (.delete final-audio)
    1.13 +;;     (clojure.java.shell/sh
    1.14 +;;      "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
    1.15 +;;      (.getCanonicalPath final-audio))
    1.16 +;;     (clojure.java.shell/sh
    1.17 +;;      "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
    1.18 +;;      "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
    1.19 +;;      "-i" (.getCanonicalPath final-audio)
    1.20 +;;      "-b:a" "128k"
    1.21 +;;      "-b:v" "9000k"
    1.22 +;;      "-c:a" "libvorbis"
    1.23 +;;      "-f"   "webm"
    1.24 +;;      "-g"   "200"
    1.25 +;;      (.getCanonicalPath movie)) nil))
    1.26 +
    1.27  (defn final-cut! [^File render-dir]
    1.28    (let [movie (File. render-dir "final.ogg")
    1.29          final-audio (File. render-dir "final.wav")
    1.30 @@ -165,16 +185,17 @@
    1.31       "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
    1.32       (.getCanonicalPath final-audio))
    1.33      (clojure.java.shell/sh
    1.34 -     "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
    1.35 +     "ffmpeg"
    1.36 +     "-framerate" "60" 
    1.37       "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
    1.38       "-i" (.getCanonicalPath final-audio)
    1.39       "-b:a" "128k"
    1.40       "-b:v" "9000k"
    1.41       "-c:a" "libvorbis"
    1.42 -     "-f"   "webm"
    1.43 -     "-g"   "200"
    1.44 +     "-c:v" "libtheora"
    1.45 +     "-r" "60"
    1.46       (.getCanonicalPath movie)) nil))
    1.47 -     
    1.48 +
    1.49    
    1.50  (comment
    1.51