feat: change pushLive to upStreaming

drawcall · Sep 23, 2021 · 0064602 · 0064602
1 parent 381aa14
commit 0064602
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/examples/live.js b/examples/live.js
@@ -29,7 +29,7 @@ const createFFTask = () => {
     log: true,
     preset: 'veryfast',
     vprofile: 'baseline',
-    pushLive: true,
+    upStreaming: true,
     audio,
   });
 

diff --git a/lib/conf/conf.js b/lib/conf/conf.js
@@ -28,7 +28,7 @@ class Conf {
     this.copyByDefaultVal(conf, 'vprofile', 'main');
     this.copyByDefaultVal(conf, 'debug', false);
     this.copyByDefaultVal(conf, 'audioLoop', true);
-    this.copyByDefaultVal(conf, 'pushLive', false);
+    this.copyByDefaultVal(conf, 'upStreaming', false);
     this.copyByDefaultVal(conf, 'cacheFormat', 'mp4');
     this.copyByDefaultVal(conf, 'hasTransition', false);
     this.copyByDefaultVal(conf, 'defaultOutputOptions', true);

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
@@ -35,13 +35,13 @@ class Renderer extends FFBase {
   start() {
     const { creator } = this;
     const log = creator.getConf('log');
-    const pushLive = creator.getConf('pushLive');
+    const upStreaming = creator.getConf('upStreaming');
 
     Perf.setEnabled(log);
     Perf.start();
 
     const { scenes } = creator;
-    if (ScenesUtil.isSingle(creator) || pushLive) {
+    if (ScenesUtil.isSingle(creator) || upStreaming) {
       const scene = scenes[0];
       scene.addAudio();
       this.singleStart(scene);

diff --git a/lib/core/synthesis.js b/lib/core/synthesis.js
@@ -40,9 +40,9 @@ class Synthesis extends FFBase {
    */
   start() {
     const { creator, conf } = this;
-    const pushLive = conf.getVal('pushLive');
+    const upStreaming = conf.getVal('upStreaming');
 
-    if (pushLive) {
+    if (upStreaming) {
       this.liveOutput();
     } else if (ScenesUtil.isSingle(creator)) {
       this.mvOutput();

diff --git a/lib/creator.js b/lib/creator.js
@@ -169,10 +169,10 @@ class FFCreator extends FFCon {
    * @public
    */
   generateOutput() {
-    const pushLive = this.getConf('pushLive');
+    const upStreaming = this.getConf('upStreaming');
     let outputDir = this.getConf('outputDir');
 
-    if (this.inCenter && outputDir && !pushLive) {
+    if (this.inCenter && outputDir && !upStreaming) {
       outputDir = outputDir.replace(/\/$/, '');
       const output = `${outputDir}/${Utils.uid()}.mp4`;
       this.setConf('output', output);

diff --git a/lib/node/scene.js b/lib/node/scene.js
@@ -109,9 +109,9 @@ class FFScene extends FFCon {
   createNewCommand() {
     const conf = this.rootConf();
     const threads = conf.getVal('threads');
-    const pushLive = conf.getVal('pushLive');
+    const upStreaming = conf.getVal('upStreaming');
     const command = FFmpegUtil.createCommand({ threads });
-    if (!pushLive) {
+    if (!upStreaming) {
       command.setDuration(this.duration);
     }
 
@@ -138,9 +138,9 @@ class FFScene extends FFCon {
 
   addCommandOptions(command) {
     const conf = this.rootConf();
-    const pushLive = conf.getVal('pushLive');
+    const upStreaming = conf.getVal('upStreaming');
 
-    if (pushLive) {
+    if (upStreaming) {
       FFmpegUtil.addDefaultOptions({ command, conf, audio: true });
     } else {
       FFmpegUtil.addDefaultOptions({ command, conf, audio: false });
@@ -157,9 +157,9 @@ class FFScene extends FFCon {
     let filepath;
     const conf = this.rootConf();
     const output = conf.getVal('output');
-    const pushLive = conf.getVal('pushLive');
+    const upStreaming = conf.getVal('upStreaming');
 
-    if (pushLive) {
+    if (upStreaming) {
       filepath = output;
       command.outputOptions(['-f', 'flv']);
     } else {

diff --git a/lib/utils/ffmpeg.js b/lib/utils/ffmpeg.js
@@ -77,7 +77,7 @@ const FFmpegUtil = {
     const crf = conf.getVal('crf');
     const preset = conf.getVal('preset');
     const vprofile = conf.getVal('vprofile');
-    const pushLive = conf.getVal('pushLive');
+    const upStreaming = conf.getVal('upStreaming');
 
     let outputOptions = []
       //---- misc ----
@@ -118,7 +118,7 @@ const FFmpegUtil = {
     }
 
     //---- live stream ----
-    if (!pushLive) {
+    if (!upStreaming) {
       outputOptions = outputOptions.concat(['-map', '0']);
     }
 

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