nodejs-audio-visualizer 2.1.4 → 3.0.0

package/dist/index.js

@@ -58,12 +58,13 @@ exports.PCM_FORMAT = {
     parseFunction: audio_1.bufferToUInt8
 };
 var FFMPEG_FORMAT = "" + exports.PCM_FORMAT.sign + exports.PCM_FORMAT.bit;
+var PROCESSING_BUFFER_SIZE = Math.pow(2, 12);
 var sleep = function (timeout) {
     return new Promise(function (resolve) { return setTimeout(resolve, timeout); });
 };
 exports.renderAudioVisualizer = function (config, onProgress, shouldStop) {
     return new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
-        var audioFilePath, backgroundImagePath, outVideoPath, backgroundImageBmpBuffer, backgroundImage, audioReader, audioBuffer, sampleRate, spectrumBusesCount, spectrumBusMargin, FPS, spectrumWidth, spectrumHeight, spectrumX, spectrumY, spectrumRotation, spectrumColor, spectrumOpacity, ffmpeg_cfr, ffmpeg_preset, frame_processing_delay, audioDuration, framesCount, audioDataStep, ffmpegVideoWriter, bpmEncoder, backgroundImageBuffer, processSpectrum, _loop_1, i, state_1;
+        var audioFilePath, backgroundImagePath, outVideoPath, backgroundImageBmpBuffer, backgroundImage, audioReader, audioBuffer, sampleRate, spectrumBusMargin, FPS, spectrumWidth, spectrumHeight, spectrumX, spectrumY, spectrumRotation, spectrumColor, spectrumEffect, spectrumOpacity, ffmpeg_cfr, ffmpeg_preset, frame_processing_delay, audioDuration, framesCount, audioDataStep, processingBuffer, ffmpegVideoWriter, bpmEncoder, backgroundImageBuffer, skipFramesCount, processSpectrum, createVisualizerFrame, i, currentFrameData, audioDataParser, spectrum, frameImage, isFrameProcessed;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -82,7 +83,6 @@ exports.renderAudioVisualizer = function (config, onProgress, shouldStop) {
                     if (!sampleRate) {
                         throw new Error('ffmpeg didn\'t show audio sample rate');
                     }
-                    spectrumBusesCount = config_1.getSpectrumBusesCount();
                     spectrumBusMargin = config_1.getSpectrumBusMargin();
                     FPS = config_1.getFPS(config);
                     spectrumWidth = config_1.getSpectrumWidthAbsolute(config, backgroundImage.width);
@@ -92,6 +92,7 @@ exports.renderAudioVisualizer = function (config, onProgress, shouldStop) {
                     spectrumRotation = config_1.getSpectrumRotation(config);
                     spectrumColor = config_1.getSpectrumColor(config) ||
                         image_1.invertColor(image_1.getImageColor(backgroundImage));
+                    spectrumEffect = config_1.getSpectrumEffect(config);
                     spectrumOpacity = config_1.getSpectrumOpacityParsed(config);
                     ffmpeg_cfr = config_1.getFfmpeg_cfr(config);
                     ffmpeg_preset = config_1.getFfmpeg_preset(config);
@@ -99,63 +100,53 @@ exports.renderAudioVisualizer = function (config, onProgress, shouldStop) {
                     audioDuration = audioBuffer.length / sampleRate;
                     framesCount = Math.trunc(audioDuration * FPS);
                     audioDataStep = Math.trunc(audioBuffer.length / framesCount);
+                    processingBuffer = new Float32Array(PROCESSING_BUFFER_SIZE).fill(0);
                     ffmpegVideoWriter = video_1.spawnFfmpegVideoWriter(__assign(__assign(__assign({ audioFilename: audioFilePath, videoFileName: outVideoPath, fps: FPS }, (!!onProgress && { onStderr: video_1.getProgress(video_1.calculateProgress(framesCount + 1, onProgress)) })), (ffmpeg_cfr && { crf: ffmpeg_cfr })), (ffmpeg_preset && { preset: ffmpeg_preset })));
                     ffmpegVideoWriter.on('exit', function (code) { return resolve(code); });
                     bpmEncoder = bpmEncoder_1.createBpmEncoder({ width: backgroundImage.width, height: backgroundImage.height });
                     backgroundImageBuffer = bpmEncoder(backgroundImage.data);
-                    processSpectrum = audio_1.createSpectrumsProcessor(spectrumBusesCount);
-                    _loop_1 = function (i) {
-                        var audioDataParser, spectrum, frameImage, isFrameProcessed;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    audioDataParser = function () {
-                                        return exports.PCM_FORMAT.parseFunction(audioBuffer, i * audioDataStep, i * audioDataStep + audioDataStep);
-                                    };
-                                    spectrum = processSpectrum(i, audioDataParser);
-                                    frameImage = image_1.createVisualizerFrame({
-                                        backgroundImageBuffer: backgroundImageBuffer,
-                                        spectrum: spectrum,
-                                        size: { width: spectrumWidth, height: spectrumHeight },
-                                        position: { x: spectrumX, y: spectrumY },
-                                        rotation: spectrumRotation,
-                                        margin: spectrumBusMargin,
-                                        color: spectrumColor,
-                                        opacity: spectrumOpacity,
-                                    });
-                                    isFrameProcessed = ffmpegVideoWriter.stdin.write(frameImage.data);
-                                    if (!!isFrameProcessed) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, video_1.waitDrain(ffmpegVideoWriter.stdin)];
-                                case 1:
-                                    _a.sent();
-                                    _a.label = 2;
-                                case 2:
-                                    if (shouldStop && shouldStop()) {
-                                        return [2 /*return*/, "break"];
-                                    }
-                                    if (!frame_processing_delay) return [3 /*break*/, 4];
-                                    return [4 /*yield*/, sleep(frame_processing_delay)];
-                                case 3:
-                                    _a.sent();
-                                    _a.label = 4;
-                                case 4: return [2 /*return*/];
-                            }
-                        });
-                    };
+                    skipFramesCount = FPS < 45 ? 1 : 2;
+                    processSpectrum = audio_1.createSpectrumsProcessor(sampleRate, skipFramesCount);
+                    createVisualizerFrame = image_1.createVisualizerFrameGenerator();
                     i = 0;
                     _a.label = 3;
                 case 3:
-                    if (!(i < framesCount)) return [3 /*break*/, 6];
-                    return [5 /*yield**/, _loop_1(i)];
+                    if (!(i < framesCount)) return [3 /*break*/, 8];
+                    currentFrameData = exports.PCM_FORMAT.parseFunction(audioBuffer, i * audioDataStep, i * audioDataStep + audioDataStep);
+                    processingBuffer.copyWithin(0, currentFrameData.length);
+                    processingBuffer.set(currentFrameData, PROCESSING_BUFFER_SIZE - currentFrameData.length);
+                    audioDataParser = function () { return Array.from(processingBuffer); };
+                    spectrum = processSpectrum(audioDataParser);
+                    frameImage = createVisualizerFrame({
+                        backgroundImageBuffer: backgroundImageBuffer,
+                        spectrum: spectrum,
+                        size: { width: spectrumWidth, height: spectrumHeight },
+                        position: { x: spectrumX, y: spectrumY },
+                        rotation: spectrumRotation,
+                        margin: spectrumBusMargin,
+                        color: spectrumColor,
+                        opacity: spectrumOpacity,
+                        spectrumEffect: spectrumEffect,
+                    });
+                    isFrameProcessed = ffmpegVideoWriter.stdin.write(frameImage.data);
+                    if (!!isFrameProcessed) return [3 /*break*/, 5];
+                    return [4 /*yield*/, video_1.waitDrain(ffmpegVideoWriter.stdin)];
                 case 4:
-                    state_1 = _a.sent();
-                    if (state_1 === "break")
-                        return [3 /*break*/, 6];
+                    _a.sent();
                     _a.label = 5;
                 case 5:
+                    if (shouldStop && shouldStop()) {
+                        return [3 /*break*/, 8];
+                    }
+                    if (!frame_processing_delay) return [3 /*break*/, 7];
+                    return [4 /*yield*/, sleep(frame_processing_delay)];
+                case 6:
+                    _a.sent();
+                    _a.label = 7;
+                case 7:
                     i++;
                     return [3 /*break*/, 3];
-                case 6:
+                case 8:
                     ffmpegVideoWriter.stdin.end();
                     return [2 /*return*/];
             }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-audio-visualizer",
-  "version": "2.1.4",
+  "version": "3.0.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
     "src/"
   ],
   "scripts": {
-    "test": "mocha -r ts-node/register src/**/*.test.ts",
+    "test": "ts-mocha -p tsconfig.json src/**/*.test.ts",
     "dev": "ts-node-dev --respawn --transpileOnly ./example/example.ts",
     "prebuild": "rimraf dist",
     "build": "tsc -m CommonJS",
@@ -37,6 +37,7 @@
     "mocha": "^6.2.3",
     "rimraf": "^3.0.2",
     "sinon": "^7.5.0",
+    "ts-mocha": "^11.1.0",
     "ts-node": "^8.5.0",
     "ts-node-dev": "^1.0.0-pre.43",
     "typescript": "^3.7.2"
@@ -54,6 +55,7 @@
     "@types/sinon": "^7.5.0",
     "bmp-js": "^0.1.0",
     "ffmpeg-static": "^5.2.0",
+    "fft-js": "^0.0.12",
     "jimp": "^0.9.3"
   }
 }

package/src/audio.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import ffmpegPath from 'ffmpeg-static';
-import { getSpectrum } from './dsp';
+import { FREQUENCY_BANDS, getSpectrum } from './dsp';
 
 export const skipEvery = <T>(skipIndex: number) => (element: T, index: number) =>
   index % skipIndex === 0;
@@ -34,44 +34,46 @@ export const correctPeaks = (spectrums: number[], peaks: number[]) => {
   return resultSpectrum;
 };
 
-export const smoothValues = (spectrums: number[], prevSpectrums?: number[]) => {
-  if (!prevSpectrums) {
-    return spectrums;
-  }
-  const resultSpectrum: number[] = [];
-  for(let i = 0; i < spectrums.length; i++) {
-    const currValue = spectrums[i];
-    const currPrevValue = prevSpectrums[i] || 0;
-    const avgValue = (currValue + currPrevValue) / 2;
-    resultSpectrum.push(avgValue);
-  }
-  return resultSpectrum;
+const oldMax = 1;
+const newMin = 0.6;
+const getInterpolationFactor = (skippedFramesCount: number, skipFramesCount: number) => {
+  const interpolationFactor = 1 - (skippedFramesCount / skipFramesCount);
+  const interpolationFactorInRange = (interpolationFactor * (oldMax - newMin)) + newMin;
+  return interpolationFactorInRange;
 };
 
-export const createSpectrumsProcessor = (busesCount: number) => {
+export const createSpectrumsProcessor = (sampleRate: number, skipFramesCount: number) => {
   let prevAudioDataNormalized: number[] = [];
   let prevPeaks: number[] = [];
-  let prevSpectrums: number[] = [];
-  const skipFrameIndex = 2;
-
-  return (frameIndex: number, parseAudioData: () => number[]) => {
-    const isFrameSkiped = 
-      frameIndex && (frameIndex % skipFrameIndex === 0);
-    const audioDataNomrmalized = isFrameSkiped ?
-      prevAudioDataNormalized :
-      normalizeAudioData(parseAudioData());
-    prevAudioDataNormalized = audioDataNomrmalized;
+  let skippedFramesCount = 0;
+  let targetSpectrum: number[] = [];
+  let previousSpectrum: number[] = [];
 
-    const spectrum = getSpectrum(audioDataNomrmalized);
-    const skipIndex = Math.trunc(spectrum.length / busesCount);
-    const spectrumReduced = spectrum.filter(skipEvery(skipIndex));
-    const peaks = getPeaks(spectrumReduced, prevPeaks);
-    const correctedSpectrum = correctPeaks(spectrumReduced, peaks);
-    const smoothSpectrum = smoothValues(correctedSpectrum, prevSpectrums);
-    prevSpectrums = smoothSpectrum;
-    prevPeaks = peaks;
+  return (parseAudioData: () => number[]) => {
+    if (skippedFramesCount === 0) {
+      skippedFramesCount = skipFramesCount;
+      const audioDataNomrmalized = normalizeAudioData(parseAudioData());
+      prevAudioDataNormalized = audioDataNomrmalized;
 
-    return smoothSpectrum;
+      const spectrum = getSpectrum(audioDataNomrmalized, sampleRate);
+      const peaks = getPeaks(spectrum, prevPeaks);
+      const correctedSpectrum =
+        prevPeaks.length === 0 ?
+          Array(FREQUENCY_BANDS.length).fill(0) :
+          correctPeaks(spectrum, peaks);
+     
+      prevPeaks = peaks;
+      previousSpectrum = [...targetSpectrum];
+      targetSpectrum = correctedSpectrum;
+    } else {
+      skippedFramesCount--;
+    }
+    const interpolationFactor = getInterpolationFactor(skippedFramesCount, skipFramesCount);
+    const interpolatedSpectrum = targetSpectrum.map((target, i) => {
+      const prev = previousSpectrum[i] || target;
+      return prev + (target - prev) * interpolationFactor;
+    });
+    return interpolatedSpectrum;
   };
 };
 

package/src/config.ts

@@ -1,20 +1,22 @@
 import path from 'path';
 import { Config, SpectrumSizeValue, PositionAliasName, RotationAliasName } from './index';
+import { FREQUENCY_BANDS } from './dsp';
 
 export const defaults = {
-  fps: 60,
-  spectrumWidth: '40%',
-  spectrumHeight: '10%',
+  fps: 30,
+  spectrumWidth: '33%',
+  spectrumHeight: 160,
   spectrumX: 'center',
-  spectrumY: 'top',
-  spectrumRotation: 'down',
-  spectrumBusesCount: 64,
-  spectrumBusMargin: 4,
-  spectrumOpacity: '100%',
+  spectrumY: 'middle',
+  spectrumRotation: 'mirror',
+  spectrumBusMargin: 12,
+  spectrumOpacity: '80%',
 };
 
 type RelativePositionValue = 0 | 0.5 | 1;
 
+export type SpectrumEffect = 'volume' | 'smooth';
+
 interface PositionAlias {
   name: PositionAliasName;
   value: RelativePositionValue;
@@ -29,7 +31,7 @@ const postitionAliases: PositionAlias[] = [
   { name: 'bottom', value: 1 },
 ];
 
-export const rotationAliasValues = ['up', 'down'] as const;
+export const rotationAliasValues = ['up', 'down', 'mirror'] as const;
 
 export const checkIsPercentValue = (value: string) =>
   RegExp(/\d+%/).test(value)
@@ -46,14 +48,15 @@ export const getOutVideoPath = (config: Config) =>
 export const getFPS = (config: Config) =>
   config.outVideo.fps || defaults.fps;
 
-export const getSpectrumBusesCount = () => defaults.spectrumBusesCount;
-
 export const getSpectrumBusMargin = () => defaults.spectrumBusMargin;
 
 const getSpectrumWidth = (config: Config) =>
   (config.outVideo.spectrum && config.outVideo.spectrum.width) ||
   defaults.spectrumWidth;
 
+export const getSpectrumEffect = (config: Config) =>
+  config.outVideo.spectrum?.effect;
+
 const getSpectrumSizeAbsolute = (
   spectrumSize: SpectrumSizeValue,
   backgroundImageSize: number,
@@ -81,7 +84,7 @@ export const getSpectrumWidthAbsolute = (
   const spectrumWidth = getSpectrumWidth(config);
   const spectrumWidthAbsolute = getSpectrumSizeAbsolute(spectrumWidth, backgroundImageWidth, 'width');
   const spectrumWidthWithoutMargin =
-    Math.trunc(spectrumWidthAbsolute / defaults.spectrumBusesCount) - defaults.spectrumBusMargin / 2;
+    Math.trunc(spectrumWidthAbsolute / FREQUENCY_BANDS.length) - defaults.spectrumBusMargin / 2;
   if (spectrumWidthWithoutMargin <= 0) {
     throw new Error(`Spectrum width '${spectrumWidth}' is too small.`);
   }

package/src/dsp.ts

@@ -1,4 +1,62 @@
-import { createSpectrumAnalyzer } from './spectrum';
+import { fft, util } from 'fft-js';
+
+export interface SpectrumPoint {
+  frequency: number;
+  magnitude: number;
+}
+
+export interface FrequencyBus {
+  startFreq: number;
+  endFreq: number;
+  magnitude: number;
+}
+
+// Common frequency bands (in Hz)
+export const FREQUENCY_BANDS = [
+  { name: 'Sub Bass 1', start: 20, end: 30 },
+  { name: 'Sub Bass 2', start: 30, end: 40 },
+  { name: 'Sub Bass 3', start: 50, end: 60 },
+  { name: 'Sub Bass 4', start: 20, end: 60 },
+  { name: 'Bass 1', start: 60, end: 107.5 },
+  { name: 'Bass 2', start: 107.5, end: 155 },
+  { name: 'Bass 3', start: 155, end: 202.5 },
+  { name: 'Bass 4', start: 202.5, end: 250 },
+  { name: 'Low Mids 1', start: 250, end: 312.5 },
+  { name: 'Low Mids 2', start: 312.5, end: 375 },
+  { name: 'Low Mids 3', start: 375, end: 437.5 },
+  { name: 'Low Mids 4', start: 437.5, end: 500 },
+  { name: 'Mids 1', start: 500, end: 875 },
+  { name: 'Mids 2', start: 875, end: 1250 },
+  { name: 'Mids 3', start: 1250, end: 1625 },
+  { name: 'Mids 4', start: 1625, end: 2000 },
+  { name: 'High Mids 1', start: 2000, end: 2500 },
+  { name: 'High Mids 2', start: 2500, end: 3000 },
+  { name: 'High Mids 3', start: 3000, end: 3500 },
+  { name: 'High Mids 4', start: 3500, end: 4000 },
+  { name: 'Presence 1', start: 4000, end: 5000 },
+  { name: 'Presence 2', start: 5000, end: 6000 },
+  { name: 'Brilliance 1', start: 6000, end: 13000 },
+  { name: 'Brilliance 2', start: 13000, end: 20000 },
+];
+
+const combineToBuses = (spectrum: SpectrumPoint[]): number[] => {
+  return FREQUENCY_BANDS.map(band => {
+    const pointsInBand = spectrum.filter(point => 
+      point.frequency >= band.start && point.frequency < band.end
+    );
+    
+    // If no points found in this band, return zero magnitude
+    if (pointsInBand.length === 0) {
+      return 0;
+    }
+
+    // Average the magnitudes in this frequency band
+    const avgMagnitude = pointsInBand.reduce((sum, point) => 
+      sum + point.magnitude, 0) / pointsInBand.length;
+
+    return avgMagnitude;
+  });
+};
 
 export const brutForceFFTSignalLength = (PCMDataLength: number) => {
   let exponent = 1;
@@ -11,16 +69,27 @@ export const brutForceFFTSignalLength = (PCMDataLength: number) => {
   }
 };
 
-export const getSpectrum = (PCMData: number[]) => {
+export const getSpectrum = (PCMData: number[], sampleRate: number): number[] => {
   const signalLength = brutForceFFTSignalLength(PCMData.length);
   const signalStartIndex = Math.trunc(PCMData.length / 2 - signalLength / 2);
   const signal = PCMData.slice(signalStartIndex, signalStartIndex + signalLength);
 
-  const spectrumAnalyzer = createSpectrumAnalyzer(signalLength);
-  const spectrum = spectrumAnalyzer(signal);
+  // Use fft-js to compute the FFT
+  const phasors = fft(signal);
+  const frequencies = util.fftFreq(phasors, sampleRate);
+  const magnitudes = util.fftMag(phasors);
+
+  // Create combined spectrum array with both frequency and magnitude
+  let spectrum: SpectrumPoint[] = frequencies.map((freq: number, i: number) => ({
+    frequency: freq,
+    magnitude: magnitudes[i]
+  }));
+
+  // Apply frequency-dependent scaling
   for (let i = 0; i < spectrum.length; i++) {
-    // attenuates low freqs and boosts highs
-    spectrum[i] *= -1 * Math.log((signalLength / 2 - i) * (0.5 / signalLength / 2)) * signalLength;
+    spectrum[i].magnitude *= -1 * Math.log((signalLength / 2 - i) * (0.5 / signalLength / 2)) * signalLength;
   }
-  return spectrum;
+
+  // Combine frequencies into buses
+  return combineToBuses(spectrum);
 }

package/src/image.ts

@@ -2,6 +2,7 @@ import { RotationAliasName } from './index';
 import { decode, BmpDecoder } from 'bmp-js';
 import { EncodedBmp } from './bpmEncoder';
 import Jimp from 'jimp';
+import { SpectrumEffect } from './config';
 
 export interface Color {
   red: number;
@@ -111,6 +112,27 @@ interface DrawSpectrumProps {
   opacity: number;
 }
 
+const getRectY = (rotation: RotationAliasName, top: number, height: number, rectHeight: number) => {
+  switch (rotation) {
+    case 'up':
+      return top + height - rectHeight;
+    case 'mirror':
+      return top + Math.trunc((height - rectHeight) / 2);
+    default:
+      return top;
+  }
+};
+
+const minRectHeight = 2;
+
+const getRectHeight = (height: number, spectrumValue: number) => {
+  const rectHeight = Math.trunc(height * spectrumValue);
+  if (rectHeight < minRectHeight) {
+    return minRectHeight;
+  }
+  return rectHeight;
+};
+
 const drawSpectrum = ({
   imageDstBuffer,
   spectrum,
@@ -133,8 +155,8 @@ const drawSpectrum = ({
     }
 
     const rectX = left + busWidth * spectrumX;
-    const rectHeight = Math.trunc(height * spectrumValue);
-    const rectY = (rotation === 'up') ? top + height - rectHeight : top;
+    const rectHeight = getRectHeight(height, spectrumValue);
+    const rectY = getRectY(rotation, top, height, rectHeight);
     drawRect({
       imageDstBuffer,
       position: { x: rectX + margin, y: rectY },
@@ -154,33 +176,67 @@ interface CreateVisualizerFrameProps {
   margin: number;
   color: Color | string;
   opacity: number;
+  spectrumEffect?: SpectrumEffect;
 }
 
-export const createVisualizerFrame = ({
-  backgroundImageBuffer,
-  spectrum,
-  size,
-  position,
-  rotation,
-  margin,
-  color,
-  opacity,
-}: CreateVisualizerFrameProps) => {
-  const imageDstBuffer = Object.assign({}, backgroundImageBuffer);
-  imageDstBuffer.data = Buffer.from(backgroundImageBuffer.data);
+export const createVisualizerFrameGenerator = () => {
+  let prevSpectrum: number[] | null = null;
 
-  const rgbSpectrumColor = (typeof color === 'string') ? hexToRgb(color) : color;
-  drawSpectrum({
-    imageDstBuffer,
+  return ({
+    backgroundImageBuffer,
     spectrum,
     size,
     position,
     rotation,
     margin,
-    color: rgbSpectrumColor,
+    color,
     opacity,
-  });
-  return imageDstBuffer;
+    spectrumEffect,
+  }: CreateVisualizerFrameProps) => {
+    const imageDstBuffer = Object.assign({}, backgroundImageBuffer);
+    imageDstBuffer.data = Buffer.from(backgroundImageBuffer.data);
+  
+    
+    const rgbSpectrumColor = (typeof color === 'string') ? hexToRgb(color) : color;
+    if (spectrumEffect === 'volume') {
+      drawSpectrum({
+       imageDstBuffer,
+       spectrum,
+       size,
+       position: { x: position.x + 2, y: position.y + 2 },
+       rotation,
+       margin,
+       color: rgbSpectrumColor,
+       opacity: opacity * 0.5,
+      }); 
+    }
+    if (spectrumEffect === 'smooth' && prevSpectrum) {
+      drawSpectrum({
+       imageDstBuffer,
+       spectrum: prevSpectrum,
+       size,
+       position,
+       rotation,
+       margin,
+       color: rgbSpectrumColor,
+       opacity: opacity * 0.3,
+      }); 
+    }
+    drawSpectrum({
+      imageDstBuffer,
+      spectrum,
+      size,
+      position,
+      rotation,
+      margin,
+      color: rgbSpectrumColor,
+      opacity,
+    });
+  
+    prevSpectrum = spectrum;
+  
+    return imageDstBuffer;
+  };
 };
 
 export const convertToBmp = async (filePath: string) =>

package/src/index.ts

@@ -3,7 +3,6 @@ import {
   getBackgroundImagePath,
   getOutVideoPath,
   getFPS,
-  getSpectrumBusesCount,
   getSpectrumBusMargin,
   getSpectrumWidthAbsolute,
   getSpectrumHeightAbsolute,
@@ -15,10 +14,12 @@ import {
   getFfmpeg_preset,
   getFrame_processing_delay,
   rotationAliasValues,
-  getSpectrumRotation
+  getSpectrumRotation,
+  getSpectrumEffect,
+  SpectrumEffect,
 } from './config';
 import { createAudioBuffer, bufferToUInt8, createSpectrumsProcessor } from './audio';
-import { parseImage, createVisualizerFrame, getImageColor, invertColor, Color, convertToBmp } from './image';
+import { parseImage, getImageColor, invertColor, Color, convertToBmp, createVisualizerFrameGenerator } from './image';
 import { spawnFfmpegVideoWriter, getProgress, calculateProgress, waitDrain } from './video';
 import { createBpmEncoder } from './bpmEncoder';
 
@@ -28,6 +29,7 @@ export const PCM_FORMAT = {
   parseFunction: bufferToUInt8
 };
 const FFMPEG_FORMAT = `${PCM_FORMAT.sign}${PCM_FORMAT.bit}`;
+const PROCESSING_BUFFER_SIZE = Math.pow(2, 12);
 
 export interface Config {
   audio: {
@@ -45,6 +47,7 @@ export interface Config {
       x?: number | PositionAliasName;
       y?: number | PositionAliasName;
       rotation?: RotationAliasName;
+      effect?: SpectrumEffect;
       color?: Color | string;
       opacity?: string;
     }
@@ -86,7 +89,6 @@ export const renderAudioVisualizer = (config: Config, onProgress?: (progress: nu
       throw new Error('ffmpeg didn\'t show audio sample rate');
     }
 
-    const spectrumBusesCount = getSpectrumBusesCount();
     const spectrumBusMargin = getSpectrumBusMargin();
     const FPS = getFPS(config);
     const spectrumWidth =
@@ -102,6 +104,7 @@ export const renderAudioVisualizer = (config: Config, onProgress?: (progress: nu
     const spectrumColor =
       getSpectrumColor(config) ||
       invertColor(getImageColor(backgroundImage));
+    const spectrumEffect = getSpectrumEffect(config);
     const spectrumOpacity = getSpectrumOpacityParsed(config);
     const ffmpeg_cfr = getFfmpeg_cfr(config);
     const ffmpeg_preset = getFfmpeg_preset(config);
@@ -110,6 +113,7 @@ export const renderAudioVisualizer = (config: Config, onProgress?: (progress: nu
     const audioDuration = audioBuffer.length / sampleRate;
     const framesCount = Math.trunc(audioDuration * FPS);
     const audioDataStep = Math.trunc(audioBuffer.length / framesCount);
+    const processingBuffer = new Float32Array(PROCESSING_BUFFER_SIZE).fill(0);
 
     const ffmpegVideoWriter = spawnFfmpegVideoWriter({
       audioFilename: audioFilePath,
@@ -123,11 +127,16 @@ export const renderAudioVisualizer = (config: Config, onProgress?: (progress: nu
 
     const bpmEncoder = createBpmEncoder({ width: backgroundImage.width, height: backgroundImage.height });
     const backgroundImageBuffer = bpmEncoder(backgroundImage.data);
-    const processSpectrum = createSpectrumsProcessor(spectrumBusesCount);
+    const skipFramesCount = FPS < 45 ? 1 : 2;
+    const processSpectrum = createSpectrumsProcessor(sampleRate, skipFramesCount);
+    const createVisualizerFrame = createVisualizerFrameGenerator();
     for (let i = 0; i < framesCount; i++) {
-      const audioDataParser = () =>
-        PCM_FORMAT.parseFunction(audioBuffer, i * audioDataStep, i * audioDataStep + audioDataStep);
-      const spectrum = processSpectrum(i, audioDataParser);
+      const currentFrameData = PCM_FORMAT.parseFunction(audioBuffer, i * audioDataStep, i * audioDataStep + audioDataStep);
+      processingBuffer.copyWithin(0, currentFrameData.length);
+      processingBuffer.set(currentFrameData, PROCESSING_BUFFER_SIZE - currentFrameData.length);
+
+      const audioDataParser = () => Array.from(processingBuffer);
+      const spectrum = processSpectrum(audioDataParser);
       const frameImage = createVisualizerFrame({
         backgroundImageBuffer,
         spectrum,
@@ -137,6 +146,7 @@ export const renderAudioVisualizer = (config: Config, onProgress?: (progress: nu
         margin: spectrumBusMargin,
         color: spectrumColor,
         opacity: spectrumOpacity,
+        spectrumEffect,
       });
       const isFrameProcessed = ffmpegVideoWriter.stdin.write(frameImage.data);
       if (!isFrameProcessed) {