@zwa73/utils 1.0.12 → 1.0.14

package/dist/UtilFfmpegTools.d.ts

@@ -42,6 +42,11 @@ declare class SFfmpegTool {
      * @param {number} silence - 保留静音时长
      */
     static trimSilence(inputWavPath: string, outputWavPath: string, threshold?: number, silence?: number): Promise<boolean>;
+    /**重采样
+     * @param {string} inputWavPath - 输入wav文件路径
+     * @param {string} outputWavPath - 输出wav文件路径
+     */
+    static resample(inputWavPath: string, outputWavPath: string, rate?: number): Promise<boolean>;
     /**wav转ogg多线程
      * @param {IOMap} iomap - 输入输出路径映射
      * @param {number} quality - 质量
@@ -74,6 +79,14 @@ declare class SFfmpegTool {
     /**删除静音子线程
      */
     private static trimSilenceCP;
+    /**重采样多线程
+     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {number} rate - 采样率
+     * @param {number} cpCount - 并发数
+     */
+    static resampleMP(ioMap: IOMap, rate?: number, cpCount?: number): Promise<void>;
+    /**重采样子线程*/
+    private static resampleCP;
 }
 export default SFfmpegTool;
 export { SFfmpegTool };

package/dist/UtilFfmpegTools.js

@@ -109,6 +109,19 @@ class SFfmpegTool {
                 .on("error", (err) => reject(err));
         });
     }
+    /**重采样
+     * @param {string} inputWavPath - 输入wav文件路径
+     * @param {string} outputWavPath - 输出wav文件路径
+     */
+    static async resample(inputWavPath, outputWavPath, rate = 22050) {
+        return new Promise((resolve, reject) => {
+            fluentFfmpeg(inputWavPath)
+                .audioFrequency(rate)
+                .save(outputWavPath)
+                .on("end", () => resolve(true))
+                .on("error", (err) => reject(err));
+        });
+    }
     //多线程处理
     /**wav转ogg多线程
      * @param {IOMap} iomap - 输入输出路径映射
@@ -172,6 +185,24 @@ class SFfmpegTool {
             await SFfmpegTool.trimSilence(inPath, outpath, threshold, silence);
         }
     }
+    /**重采样多线程
+     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {number} rate - 采样率
+     * @param {number} cpCount - 并发数
+     */
+    static async resampleMP(ioMap, rate = 22050, cpCount = 16) {
+        let cpList = MPClip(ioMap, cpCount);
+        for (let cpMap of cpList)
+            SFfmpegTool.resampleCP(cpMap, rate);
+    }
+    /**重采样子线程*/
+    static async resampleCP(ioMap, rate = 22050) {
+        for (let inPath in ioMap) {
+            let outpath = ioMap[inPath];
+            console.log("正在处理:" + outpath);
+            await SFfmpegTool.resample(inPath, outpath, rate);
+        }
+    }
 }
 exports.SFfmpegTool = SFfmpegTool;
 /**多线程任务分割器

package/dist/UtilFunctions.js

@@ -127,7 +127,7 @@ function fileSearch(folder, traitRegex) {
     let regex = new RegExp(traitRegex);
     for (let subFile of subFiles) {
         let subFilePath = path.join(folder, subFile);
-        subFilePath.replace(/\\/g, "/");
+        subFilePath = subFilePath.replace(/\\/g, "/");
         let stat = fs.lstatSync(subFilePath);
         //判断是否是文件夹，递归调用
         if (stat.isDirectory()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFfmpegTools.ts

@@ -138,6 +138,20 @@ class SFfmpegTool {
                 .on("error", (err) => reject(err));
         });
     }
+    /**重采样
+     * @param {string} inputWavPath - 输入wav文件路径
+     * @param {string} outputWavPath - 输出wav文件路径
+     */
+    static async resample(inputWavPath: string, outputWavPath: string, rate: number = 22050): Promise<boolean> {
+        return new Promise((resolve, reject) => {
+            fluentFfmpeg(inputWavPath)
+                .audioFrequency(rate)
+                .save(outputWavPath)
+                .on("end", () => resolve(true))
+                .on("error", (err) => reject(err));
+        });
+    }
+
     //多线程处理
     /**wav转ogg多线程
      * @param {IOMap} iomap - 输入输出路径映射
@@ -212,6 +226,24 @@ class SFfmpegTool {
             await SFfmpegTool.trimSilence(inPath, outpath, threshold, silence);
         }
     }
+
+    /**重采样多线程
+     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {number} rate - 采样率
+     * @param {number} cpCount - 并发数
+     */
+    static async resampleMP(ioMap: IOMap, rate: number = 22050, cpCount: number = 16) {
+        let cpList = MPClip(ioMap, cpCount);
+        for (let cpMap of cpList) SFfmpegTool.resampleCP(cpMap, rate);
+    }
+    /**重采样子线程*/
+    private static async resampleCP(ioMap: IOMap, rate: number = 22050) {
+        for (let inPath in ioMap) {
+            let outpath = ioMap[inPath];
+            console.log("正在处理:" + outpath);
+            await SFfmpegTool.resample(inPath, outpath, rate);
+        }
+    }
 }
 
 /**多线程任务分割器

package/src/UtilFunctions.ts

@@ -122,7 +122,7 @@ export function fileSearch(folder: string, traitRegex: string) {
     let regex = new RegExp(traitRegex);
     for (let subFile of subFiles) {
         let subFilePath = path.join(folder, subFile);
-		subFilePath.replace(/\\/g,"/");
+		subFilePath = subFilePath.replace(/\\/g,"/");
         let stat = fs.lstatSync(subFilePath);
 
         //判断是否是文件夹，递归调用