feat: add ff format cache

tnfe · May 10, 2021 · 8919401 · 8919401
1 parent 3a93202
commit 8919401
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/examples/cache.js b/examples/cache.js
@@ -20,13 +20,14 @@ const createFFTask = () => {
   const width = (576 * Math.random()) >> 0;
   const height = (1024 * Math.random()) >> 0;
 
+  console.log('wxh', width, height);
   const creator = new FFCreator({
     cacheDir,
     outputDir,
     width,
     height,
     debug: true,
-    cacheType: 'jpg',
+    cacheType: 'raw',
     cacheQuality: 70,
     cacheClarity: 80,
     audio,

diff --git a/lib/core/synthesis.js b/lib/core/synthesis.js
@@ -43,9 +43,12 @@ class Synthesis extends EventEmitter {
    */
   addInput() {
     const { conf } = this;
+    const type = conf.getVal('cacheType');
     const dir = conf.getVal('detailedCacheDir');
+
     const files = FS.getCacheFilePath(dir);
     this.command.addInput(files);
+    if (type !== 'raw') this.command.inputFormat('image2');
   }
 
   /**

diff --git a/lib/creator.js b/lib/creator.js
@@ -50,10 +50,9 @@ class FFCreator extends FFCon {
    * @private
    */
   createAppScene() {
-    let width = this.getConf('width');
-    let height = this.getConf('height');
-    width = Utils.courtship(width);
-    height = Utils.courtship(height);
+    this.resetSize();
+    const width = this.getConf('width');
+    const height = this.getConf('height');
 
     this.display = Pool.get('scene', () => new Scene({ width, height }));
     this.display.width = width;
@@ -163,13 +162,14 @@ class FFCreator extends FFCon {
    * @param {number} height - stage height
    * @public
    */
-  setSize(width, height) {
-    width = Utils.courtship(width);
-    height = Utils.courtship(height);
-    this.setConf('width', width);
-    this.setConf('height', height);
-    this.display.width = width;
-    this.display.height = height;
+  resetSize(width, height) {
+    if (!width) {
+      width = this.getConf('width');
+      height = this.getConf('height');
+    }
+
+    this.setConf('width', Utils.courtship(width));
+    this.setConf('height', Utils.courtship(height));
   }
 
   /**

diff --git a/lib/utils/fs.js b/lib/utils/fs.js
@@ -39,7 +39,7 @@ const FS = {
   },
 
   setCacheFormat(format) {
-    currFormat = format;
+    currFormat = format === 'raw' ? format : 'ff';
   },
 
   /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffcreator",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "FFCreator is a lightweight and flexible short video production library",
   "main": "lib/index.js",
   "scripts": {