Commit 2e22e9d8 authored by Michael Murtaugh's avatar Michael Murtaugh

Merge branch 'collage-shell-client' into generalised-features-and-shell

parents b6aecb75 105fbb91
......@@ -440,10 +440,10 @@ function cascadecollage (opts) {
var now = new Date();
collage_base = dateFormat(now, "yyyymmdd_HHMMss");
cameragif = "output/camera"+collage_base+".webm";
mkwebm(annotated_camera_frames, cameragif, opts.camera_webm_framerate, true, function () {
if (opts.cameragif) {
opts.cameragif.call(that, cameragif);
}
//mkwebm(annotated_camera_frames, cameragif, opts.camera_webm_framerate, true, function () {
// if (opts.cameragif) {
// opts.cameragif.call(that, cameragif);
// }
archivegif = "output/archive"+collage_base+".webm";
mkwebm(archive_frames, archivegif, opts.archive_webm_framerate, false, function () {
if (opts.archivegif) {
......@@ -515,7 +515,7 @@ function cascadecollage (opts) {
}
next_frame();
});
})
// })
},
// _
......
#!/bin/bash
ffmpeg -i "$1" -c:v libx264 -b:v 1000k "$2"
# && rm "$1"
#!/bin/bash
ffmpeg -i "$1" -c:v libvpx -b:v 1000k "$2" && \
rm $1
ffmpeg -i "$1" -c:v libvpx -b:v 1000k "$2" && rm "$1"
......@@ -6,4 +6,4 @@ collagegif=$3
rm -f frames/*
# rm "$cameragif" # actually this *can not* happen as it needs to be served...
#scp "$archivegif" "$collagegif" aa:/var/www/vhosts/sicv.activearchives.org/httpdocs/vitrine
scp "$archivegif" "$collagegif" aa:/var/www/vhosts/sicv.activearchives.org/httpdocs/vitrine
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment