fix the outstanding bugs -- re-encoding works!

2 files changed, 14 insertions, 12 deletions

diff --git a/vmail/htdocs/index.html b/vmail/htdocs/index.html
index 69bd2fd..c8f6e19 100644
--- a/vmail/htdocs/index.html
+++ b/vmail/htdocs/index.html
@@ -364,13 +364,11 @@ stopRecordingButton.onclick = function() {
 saveRecordingButton.onclick = function() {
     this.disabled = true;
     var onSuccess = function (url) { window.location.href = url; }
-    var onError = function () { return; }
+    var onError = function () { saveRecordingButton.disabled = false; }
     var uuid = fileBaseName
-    var regex = /#t=([0-9.]+),([0-9.]+)$/
-    var matches = video.src.match(regex)
-    if (matches && matches.length == 3) {
-        var start = matches[1]
-        var stop = matches[2]
+    var start = video.beginTime
+    var stop = video.endTime
+    if (start && stop) {
         postMessageByUuidSaveByStartByEnd(uuid, start, stop, onSuccess, onError);
     } else {
         postMessageByUuidSaveByStartByEnd(uuid, 0, 0, onSuccess, onError);
diff --git a/vmail/src/WebApp.hs b/vmail/src/WebApp.hs
index 2acc0fe..7fbd1c4 100644
--- a/vmail/src/WebApp.hs
+++ b/vmail/src/WebApp.hs
@@ -369,20 +369,24 @@ saveVideoClip :: FilePath -> [FilePath] -> Float -> Float -> IO ()
 saveVideoClip outputFile inputChunks _ stopTime | stopTime == 0 = do
   let cmdScript = "cat \"$@\" > \"$output\"" :: String
   cmd_ (AddEnv "output" outputFile)
-       (["sh", "-c", cmdScript, "sh"] ++ inputChunks)
+       (["sh", "-xc", cmdScript, "sh"] ++ inputChunks)
 saveVideoClip outputFile inputChunks startTime stopTime = do
-  let cmdScript = "cat \"$@\" | ffmpeg -i - -c:v libvpx -c:a libvorbis -preset ultrafast -ss \"$start\" -t \"$stop\" \"$output\"" :: String
+  -- let cmdScript = "printf '%s\n' \"$@\" | sort -n | xargs cat | ffmpeg -i - -c:v libx264 -f mp4 -ss \"$start\" -t \"$stop\" \"$output\"" :: String
+  let cmdScript = "printf '%s\n' \"$@\" | sort -n | xargs cat | ffmpeg -i - -c:v libvpx -c:a libvorbis -ss \"$start\" -t \"$stop\" \"$output\"" :: String
   cmd_ (AddEnv "start" $ show startTime)
        (AddEnv "stop" $ show (stopTime - startTime))
        (AddEnv "output" outputFile)
-       (["sh", "-c", cmdScript, "sh"] ++ inputChunks)
+       (["sh", "-xc", cmdScript, "sh"] ++ inputChunks)
 
 saveMessage :: HandlerG SaveMessageApi
 saveMessage addr uuid start stop = do
   let inputDir = "./blobs" </> show uuid
-  let outputFile = "./htdocs" </> show uuid ++ ".webm"
-  let tempFile = outputFile ++ "~tmp.webm"
-  let outputUrl = unpack (toUrlPiece $ safeLink (Proxy :: Proxy API) (Proxy :: Proxy StaticApi)) </> show uuid ++ ".webm"
+  -- let outputExtension = "mp4"
+  let outputExtension = "webm"
+  let outputFile = "./htdocs" </> show uuid ++ "." ++ outputExtension
+  let tempFile = outputFile ++ "~tmp." ++ outputExtension
+  let currentUrl = unpack . toUrlPiece $ safeLink (Proxy :: Proxy API) (Proxy :: Proxy StaticApi)
+  let outputUrl =  currentUrl </> show uuid ++ "." ++ outputExtension
   now <- liftIO getCurrentTime
   g <- queryG
   let changes :: [MessageChange]