Mercurial > cortex

changeset 312:e0e1561cbd22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
re-encoded all videos and fixed all bad keyframes
author Robert McIntyre <rlm@mit.edu>
date Tue, 21 Feb 2012 15:22:15 -0700
parents 7f3b77238045
children b46ccfd128a2
files org/integration.org org/touch.org
diffstat 2 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/integration.org	Tue Feb 21 14:56:33 2012 -0700
     1.2 +++ b/org/integration.org	Tue Feb 21 15:22:15 2012 -0700
     1.3 @@ -693,12 +693,15 @@
     1.4  sox --ignore-length main.wav main-delayed.wav delay 24 
     1.5  
     1.6  mogrify -resize 755x final/*
     1.7 +#+end_src
     1.8 +
     1.9 +#+begin_src sh :results silent
    1.10 +cd /home/r/proj/cortex/render/hand
    1.11  
    1.12  ffmpeg -r 60 -i final/%07d.png -i main-delayed.wav -b:a 128k \
    1.13           -b:v 9000k -c:a libvorbis -c:v libtheora hand.ogg 
    1.14  #+end_src
    1.15  
    1.16 -
    1.17  * Source Listing
    1.18    - [[../src/cortex/test/integration.clj][cortex.test.integration]]
    1.19    - [[../src/cortex/video/magick8.clj][cortex.video.magick8]]

     2.1 --- a/org/touch.org	Tue Feb 21 14:56:33 2012 -0700
     2.2 +++ b/org/touch.org	Tue Feb 21 15:22:15 2012 -0700
     2.3 @@ -615,10 +615,16 @@
     2.4  #+end_src
     2.5  
     2.6  #+begin_src sh :results silent
     2.7 -cd /home/r/proj/cortex/render/touch-cube/
     2.8 +cd ~/proj/cortex/render/touch-cube/
     2.9  ffmpeg -r 60 -i out/%07d.png -b:v 9000k -c:v libtheora basic-touch.ogg
    2.10  #+end_src
    2.11  
    2.12 +#+begin_src sh :results silent
    2.13 +cd ~/proj/cortex/render/touch-cube/
    2.14 +ffmpeg -r 30 -i blender-intro/%07d.png -b:v 9000k -c:v libtheora touch-cube.ogg
    2.15 +#+end_src
    2.16 +
    2.17 +
    2.18  * Adding Touch to the Worm
    2.19  
    2.20  #+name: test-touch-2
    2.21 @@ -699,6 +705,12 @@
    2.22         main-view touch targets))))
    2.23  #+end_src
    2.24  
    2.25 +#+begin_src sh :results silent
    2.26 +cd ~/proj/cortex/render/worm-touch
    2.27 +ffmpeg -r 60 -i out/%07d.png -b:v 9000k -c:v libtheora worm-touch.ogg
    2.28 +#+end_src
    2.29 +
    2.30 +
    2.31  * Headers 
    2.32  
    2.33  #+name: touch-header