Add support for files without audio stream, fix incorrect trim when p…

…layback rate and start point is changed
RuurdBijlsma · Dec 30, 2020 · 7a41e48 · 7a41e48
1 parent aa93f8f
commit 7a41e48
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/movie-maker/package.json b/movie-maker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "movie-maker",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Edit videos",
   "keywords": [
     "Edit",

diff --git a/movie-maker/src/App.vue b/movie-maker/src/App.vue
@@ -30,6 +30,8 @@
 <script>
 // TODO: Features
 // test for bugs
+// End time + playback rate change = bug
+// support for video without audio stream
 
 
 // add audio track to video

diff --git a/movie-maker/src/js/VideoFile.js b/movie-maker/src/js/VideoFile.js
@@ -55,6 +55,10 @@ export default class VideoFile extends EventEmitter {
         return this._elCache;
     }
 
+    get hasAudio() {
+        return this.audioStream !== undefined;
+    }
+
     get isAudio() {
         return this.videoStream.codec_name === 'png' || this.videoStream.codec_name === 'jpg';
     }

diff --git a/movie-maker/src/plugins/vuex/ffmpeg-module.js b/movie-maker/src/plugins/vuex/ffmpeg-module.js
@@ -38,8 +38,10 @@ export default {
             for (let i = 0; i < fragments.length; i++) {
                 let fragment = fragments[i];
                 let videoIndex = rootState.videoFiles.indexOf(fragment.video);
-                let start = fragment.start * fragment.video.duration - getters.earliestStart(fragment.video);
-                let end = fragment.end * fragment.video.duration;
+                let earliestStart = getters.earliestStart(fragment.video);
+                let start = fragment.start * fragment.video.duration - earliestStart;
+                let end = fragment.end * fragment.video.duration - earliestStart;
+                console.log({earliestStart, start, end})
                 filter.push({
                     filter: parseFilter([
                         ['trim', `start=${start}:end=${end}`],
@@ -48,6 +50,19 @@ export default {
                     inputs: `[${videoIndex}:v]`,
                     outputs: 'v' + i,
                 });
+
+                if (!fragment.video.hasAudio) {
+                    let duration = (end - start) / fragment.playbackRate;
+                    console.log("DURATION", duration)
+                    filter.push({
+                        filter: 'aevalsrc',
+                        options: {exprs: '0', duration},
+                        outputs: 'a' + i,
+                    })
+                    continue;
+                }
+                // Audio filters:
+
                 let tempoCommands = [];
                 let playbackRate = fragment.playbackRate;
                 let minTempo = 0.5;
@@ -218,7 +233,9 @@ export default {
                 ffmpeg()
                     .input(Utils.fixPath(filePath))
                     .complexFilter(filter, 'out')
-                    .on('error', (err, stdout, stderr) => reject({err, stdout, stderr}))
+                    .on('error', (err, stdout, stderr) => {
+                        console.warn(`Error processing audio wave for ${filePath}`)
+                    })
                     .on('stderr', line => {
                         line = line.trim();
                         if (line.startsWith('LRA low:'))