Add seek delay option

Author: javalikescript

Ffmpeg.lua

@@ -4,7 +4,7 @@ local Promise = require('jls.lang.Promise')
 local StringBuffer = require('jls.lang.StringBuffer')
 local File = require('jls.io.File')
 local strings = require('jls.util.strings')
-local TableList = require('jls.util.TableList')
+local List = require('jls.util.List')
 local LocalDateTime = require('jls.util.LocalDateTime')
 
 local function getExecutableName(name)
@@ -51,6 +51,7 @@ return class.create(function(ffmpeg)
         self.ffprobePath = getExecutableName('ffprobe')
       end
     end
+    self.seekDelayMs = options.seekDelay or 0
   end
 
   function ffmpeg:check()
@@ -93,24 +94,30 @@ return class.create(function(ffmpeg)
   function ffmpeg:computeArguments(destFilename, destOptions, srcFilename, srcOptions, globalOptions)
     local args = {self.ffmpegPath, '-hide_banner'}
     if globalOptions then
-      TableList.concat(args, globalOptions)
+      List.concat(args, globalOptions)
     end
     if srcOptions then
-      TableList.concat(args, srcOptions)
+      List.concat(args, srcOptions)
     end
     if srcFilename then
-      TableList.concat(args, '-i', srcFilename)
+      if type(srcFilename) == 'table' then
+        for _, filename in ipairs(srcFilename) do
+          List.concat(args, '-i', filename)
+        end
+      else
+        List.concat(args, '-i', srcFilename)
+      end
     end
     if destOptions then
-      TableList.concat(args, destOptions)
+      List.concat(args, destOptions)
     end
     if destFilename then
-      TableList.concat(args, '-y', destFilename)
+      List.concat(args, '-y', destFilename)
     end
     return args
   end
 
-  function ffmpeg:createCommand(part, filename, options, seekDelay)
+  function ffmpeg:createCommand(part, filename, options, parameters)
     --[[
       '-ss position (input/output)'
       When used as an input option (before -i), seeks in this input file to position.
@@ -132,25 +139,25 @@ return class.create(function(ffmpeg)
     local srcOptions = {}
     local destOptions = {}
     if part.from ~= nil then
-      local delay = seekDelay or 0
+      local delay = (parameters and parameters.seekDelay) or self.seekDelayMs or 0
       if (delay >= 0) and (delay < part.from) then
-        TableList.concat(srcOptions, '-ss', formatTime(part.from - delay))
-        TableList.concat(destOptions, '-ss', math.floor(delay))
+        List.concat(srcOptions, '-ss', formatTime(part.from - delay))
+        List.concat(destOptions, '-ss', math.floor(delay))
       elseif delay == -1 then
-        TableList.concat(srcOptions, '-ss', formatTime(part.from))
+        List.concat(srcOptions, '-ss', formatTime(part.from))
       else
-        TableList.concat(destOptions, '-ss', formatTime(part.from))
+        List.concat(destOptions, '-ss', formatTime(part.from))
       end
     end
     if part.to ~= nil then
       if part.from ~= nil then
-        TableList.concat(destOptions, '-t', formatTime(part.to - part.from))
-        --TableList.concat(destOptions, '-to', formatTime(part.to))
+        List.concat(destOptions, '-t', formatTime(part.to - part.from))
+        --List.concat(destOptions, '-to', formatTime(part.to))
       else
-        TableList.concat(destOptions, '-t', formatTime(part.to))
+        List.concat(destOptions, '-t', formatTime(part.to))
       end
     end
-    TableList.concat(destOptions, options)
+    List.concat(destOptions, options)
     local sourceFile = self.sources[part.sourceId]
     return self:computeArguments(filename, destOptions, sourceFile:getPath(), srcOptions)
   end
@@ -159,17 +166,30 @@ return class.create(function(ffmpeg)
     return File:new(self.cacheDir, filename)
   end
 
-  function ffmpeg:createCommands(filename, parts, destOptions, seekDelayMs)
+  function ffmpeg:deleteTempFiles()
+    local tmpFiles = self.cacheDir:listFiles(function(file)
+      return file:isFile() and (file:getExtension() == 'tmp')
+    end)
+    for _, file in ipairs(tmpFiles) do
+      file:delete()
+    end
+  end
+
+  function ffmpeg:createCommands(destFilename, parts, destOptions, parameters)
     local commands = {}
+    local filename = destFilename
+    if parameters.subtitles then
+      filename = self:createTempFile('full.tmp'):getPath()
+    end
     if #parts == 1 then
-      table.insert(commands, self:createCommand(parts[1], filename, destOptions, seekDelayMs))
+      table.insert(commands, self:createCommand(parts[1], filename, destOptions, parameters))
     elseif #parts > 1 then
       local concatScript = StringBuffer:new()
       concatScript:append('# fcut')
       for i, part in ipairs(parts) do
         local partName = 'part_'..tostring(i)..'.tmp'
         local outFilename = self:createTempFile(partName):getPath()
-        table.insert(commands, self:createCommand(part, outFilename, destOptions, seekDelayMs))
+        table.insert(commands, self:createCommand(part, outFilename, destOptions, parameters))
         local concatPartname = string.gsub(outFilename, '[\\+]', '/')
         --local concatPartname = partName -- to be safe
         concatScript:append('\nfile ', concatPartname)
@@ -178,6 +198,9 @@ return class.create(function(ffmpeg)
       concatFile:write(concatScript:toString());
       table.insert(commands, self:computeArguments(filename, {'-c', 'copy', '-map', '0'}, concatFile:getPath(), {'-f', 'concat', '-safe', '0'}))
     end
+    if parameters.subtitles then
+      table.insert(commands, self:computeArguments(destFilename, {'-c', 'copy', '-c:s', 'mov_text', '-map', '0'}, List.concat({}, filename, parameters.subtitles)))
+    end
     return commands
   end
 
@@ -217,9 +240,9 @@ return class.create(function(ffmpeg)
     local time = LocalDateTime:new():plusSeconds(sec or 0):toTimeString()
     local args = {self.ffmpegPath, '-hide_banner', '-v', '0', '-ss', time, '-i', sourceFile:getPath(), '-f', 'mjpeg', '-vcodec', 'mjpeg', '-vframes', '1', '-an'}
     if width and height then
-      TableList.concat(args, '-s', tostring(width)..'x'..tostring(height))
+      List.concat(args, '-s', tostring(width)..'x'..tostring(height))
     end
-    TableList.concat(args, '-y', file:getPath())
+    List.concat(args, '-y', file:getPath())
     return args
   end
 

fcut.lua

@@ -19,7 +19,7 @@ local FileHttpHandler = require('jls.net.http.handler.FileHttpHandler')
 local RestHttpHandler = require('jls.net.http.handler.RestHttpHandler')
 local ZipFileHttpHandler = require('jls.net.http.handler.ZipFileHttpHandler')
 local TableHttpHandler = require('jls.net.http.handler.TableHttpHandler')
-local WebSocketUpgradeHandler = require('jls.net.http.ws').WebSocketUpgradeHandler
+local WebSocketUpgradeHandler = require('jls.net.http.WebSocket').UpgradeHandler
 
 -- Project required modules
 
@@ -87,6 +87,8 @@ local config = tables.createArgumentTable(arg, {
   emptyPath = 'config',
   schema = CONFIG_SCHEMA,
   aliases = {
+    ffmpeg = 'ffmpeg.ffmpeg',
+    ffprobe = 'ffmpeg.ffprobe',
     h = 'help',
     ll = 'loglevel',
     p = 'project',
@@ -133,7 +135,7 @@ end
 logger:info('Cache directory is '..cacheDir:getPath())
 
 local ffmpeg = Ffmpeg:new(cacheDir)
-ffmpeg:configure(config)
+ffmpeg:configure(config.ffmpeg)
 
 -- Application local functions
 
@@ -218,6 +220,7 @@ local function endExport(exportContext, webSocket, exitCode)
   return webSocket:sendTextMessage('\n -- exit code '..tostring(exitCode)..' ------\n\n'):finally(function()
     logger:info('end export')
     Map.deleteValues(exportContexts, exportContext)
+    ffmpeg:deleteTempFiles()
     return webSocket:close()
   end)
 end
@@ -292,6 +295,7 @@ local httpContexts = {
     end,
     ['checkFFmpeg?method=POST'] = function(exchange)
       local status, reason = ffmpeg:check()
+      -- TODO get ffmpeg version
       return {
         status = status,
         reason = reason,
@@ -351,7 +355,7 @@ local httpContexts = {
       return false
     end,
     ['export(requestJson)?method=POST&Content-Type=application/json'] = function(exchange, parameters)
-      local commands = ffmpeg:createCommands(parameters.filename, parameters.parts, parameters.options or {}, parameters.seekDelayMs)
+      local commands = ffmpeg:createCommands(parameters.filename, parameters.parts, parameters.options or {}, parameters.parameters or {})
       local exportId = strings.formatInteger(system.currentTimeMillis(), 64)
       logger:info('export '..exportId..' '..tostring(#commands)..' command(s)')
       exportContexts[exportId] = {
@@ -386,7 +390,7 @@ local httpContexts = {
 if config.webview.disable then
   local httpServer = require('jls.net.http.HttpServer'):new()
   httpServer:bind(config.webview.address, config.webview.port):next(function()
-    httpServer:createContexts(httpContexts)
+    httpServer:addContexts(httpContexts)
     if config.webview.port == 0 then
       print('FCut HTTP Server available at http://localhost:'..tostring(select(2, httpServer:getAddress())))
     end
@@ -409,7 +413,7 @@ else
     url = url..'extensions/'..config.extension..'/'
   end
   require('jls.util.WebView').open(url, {
-    title = 'Fast Cut (Preview)',
+    title = 'Fast Cut',
     resizable = true,
     bind = true,
     width = config.webview.width,

fcutSchema.lua

@@ -47,13 +47,26 @@ return {
       maximum = 32,
     },
     ffmpeg = {
-      title = 'The ffmpeg path',
-      type = 'string',
-      default = (require('jls.lang.system').isWindows() and 'ffmpeg\\ffmpeg.exe' or '/usr/bin/ffmpeg'),
-    },
-    ffprobe = {
-      title = 'The ffprobe path, the default value is computed from the ffmpeg path',
-      type = 'string',
+      type = 'object',
+      additionalProperties = false,
+      properties = {
+        ffmpeg = {
+          title = 'The ffmpeg path',
+          type = 'string',
+          default = (require('jls.lang.system').isWindows() and 'ffmpeg\\ffmpeg.exe' or '/usr/bin/ffmpeg'),
+        },
+        ffprobe = {
+          title = 'The ffprobe path, the default value is computed from the ffmpeg path',
+          type = 'string',
+        },
+        seekDelay = {
+          title = 'Seek delay in milli seconds',
+          type = 'integer',
+          default = 0,
+          minimum = -2,
+          maximum = 60000,
+        },
+      }
     },
     loglevel = {
       title = 'The log level',

htdocs/fcut.html

@@ -2,7 +2,7 @@
 <html><head lang="en">
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="UTF-8">
-  <title>Fast Cut (Preview)</title>
+  <title>Fast Cut</title>
   <link rel="stylesheet" href="fcut.css">
   <link rel="stylesheet" href="page.css">
   <link rel="stylesheet" href="FileChooser.css">
@@ -26,7 +26,7 @@
           <span class="bar-flex-row-content"></span>
           <button v-on:click="pages.navigateTo('help')"><i class="fas fa-question"></i></button>
         </div>
-        <h2>Fast FFmpeg Cutter (Preview)</h2>
+        <h2>Fast FFmpeg Cutter</h2>
         <div class="flow">
           <button v-on:click="addSources().then(function() { pages.navigateTo('preview'); })" class="home"><i class="far fa-file-video"></i> Select Videos</button>
           <i class="fas fa-chevron-right"></i>
@@ -245,6 +245,12 @@ <h2>Export</h2>
           <div class="input-bar">
             <label><input type="checkbox" v-model="exportMapAllStreams" /> Map all streams</label>
           </div>
+          <!--
+            <div class="input-bar">
+              <label>Subtitles:</label>
+              <button v-on:click="selectFiles(true, false, '.srt').then(function(filenames) { subtitles = filenames; })"><i class="fas fa-add"></i></button>
+            </div>
+          -->
           <br />
           <div class="bar-flex-row">
             <label>File:</label>