@ain1084/audio-worklet-stream 1.0.5 → 2.0.1

package/dist/write-strategy/worker-strategy.js

@@ -4,7 +4,7 @@
  */
 class Context {
     _node;
-    _config;
+    _bufferContext;
     _fillerParam;
     _worker;
     /**
@@ -13,7 +13,7 @@ class Context {
      */
     constructor(params) {
         this._node = params.node;
-        this._config = params.config;
+        this._bufferContext = params.context;
         this._worker = new params.workerConstructor();
         this._fillerParam = params.fillerParam;
         this._worker.onmessage = this.handleWorkerMessage.bind(this);
@@ -45,7 +45,7 @@ class Context {
         return new Promise((resolve) => {
             const message = {
                 type: 'init',
-                config: this._config,
+                config: this._bufferContext,
                 fillerParams: this._fillerParam,
             };
             this._worker.postMessage(message);
@@ -84,12 +84,12 @@ export class WorkerBufferWriteStrategy {
     _context = null;
     /**
      * Creates an instance of WorkerBufferWriteStrategy.
-     * @param config - The configuration for the filler frame buffer.
+     * @param bufferContext - The context for the filler frame buffer.
      * @param workerConstructor - The constructor for the Worker.
      * @param fillerParam - The parameters for the FrameBufferFiller.
      */
-    constructor(config, workerConstructor, fillerParam) {
-        this._createPlayContext = (node) => Context.create({ node, config, workerConstructor, fillerParam });
+    constructor(bufferContext, workerConstructor, fillerParam) {
+        this._createPlayContext = (node) => Context.create({ node, context: bufferContext, workerConstructor, fillerParam });
     }
     /**
      * Initializes the strategy.

package/dist/write-strategy/worker-strategy.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ain1084/audio-worklet-stream",
-  "version": "1.0.5",
+  "version": "2.0.1",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -39,18 +39,18 @@
     "docs": "typedoc"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin": "^2.9.0",
-    "@types/audioworklet": "^0.0.62",
-    "@types/node": "^22.8.4",
-    "@typescript-eslint/parser": "^8.12.2",
-    "eslint": "^9.13.0",
-    "globals": "^15.11.0",
-    "typedoc": "^0.26.10",
+    "@stylistic/eslint-plugin": "^2.10.1",
+    "@types/audioworklet": "^0.0.64",
+    "@types/node": "^22.9.0",
+    "@typescript-eslint/parser": "^8.13.0",
+    "eslint": "^9.14.0",
+    "globals": "^15.12.0",
+    "typedoc": "^0.26.11",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.12.2",
+    "typescript-eslint": "^8.13.0",
     "vite": "^5.4.10"
   },
   "dependencies": {
-    "@ain1084/array-buffer-partitioner": "^0.0.3"
+    "@ain1084/audio-frame-buffer": "^0.2.0"
   }
 }

package/src/{frame-buffer/buffer-config.ts → filler-frame-buffer-context.ts}

@@ -1,4 +1,4 @@
-import { createArrayBufferViews } from '@ain1084/array-buffer-partitioner'
+import { type FrameBufferContext, createFrameBufferContext } from '@ain1084/audio-frame-buffer'
 
 /**
  * The default number of chunks in the frame buffer when
@@ -21,16 +21,6 @@ const DEFAULT_FRAME_BUFFER_CHUNKS = 5
  */
 const AUDIO_WORKLET_BLOCK_SIZE = 128
 
-/**
- * Parameters for creating a FrameBuffer.
- * @property frameBufferSize - The size of the frame buffer.
- * @property channelCount - The number of audio channels.
- */
-export type FrameBufferParams = Readonly<{
-  frameBufferSize: number
-  channelCount: number
-}>
-
 /**
  * Parameters for creating a FillerFrameBuffer.
  * @property channelCount - The number of audio channels.
@@ -45,69 +35,35 @@ export type FillerFrameBufferParams = Readonly<{
   frameBufferChunks?: number
 }>
 
-/**
- * Configuration for a FrameBuffer.
- * This configuration is returned by the createFrameBufferConfig function.
- * @property sampleBuffer - The shared buffer for audio data frames.
- * @property samplesPerFrame - The number of samples per frame.
- * @property usedFramesInBuffer - The usage count of the frames in the buffer.
- * @property totalReadFrames - The total frames read from the buffer.
- * @property totalWriteFrames - The total frames written to the buffer.
- */
-export type FrameBufferConfig = Readonly<{
-  sampleBuffer: Float32Array
-  samplesPerFrame: number
-  usedFramesInBuffer: Uint32Array
-  totalReadFrames: BigUint64Array
-  totalWriteFrames: BigUint64Array
-}>
-
 /**
  * Configuration for a FillerFrameBuffer.
  * This configuration is returned by the createFillerFrameBufferConfig function.
  * @property sampleRate - The sample rate of the audio context.
  * @property fillInterval - The interval in milliseconds for filling the buffer.
  */
-export type FillerFrameBufferConfig = FrameBufferConfig & Readonly<{
+export type FillerFrameBufferContext = FrameBufferContext & Readonly<{
   sampleRate: number
   fillInterval: number
 }>
 
-/**
- * Creates a FrameBufferConfig instance.
- * @param params - The parameters for the FrameBuffer.
- * @returns A new instance of FrameBufferConfig.
- */
-export const createFrameBufferConfig = (params: FrameBufferParams): FrameBufferConfig => {
-  return {
-    ...createArrayBufferViews(SharedArrayBuffer, {
-      sampleBuffer: [Float32Array, params.frameBufferSize * params.channelCount],
-      usedFramesInBuffer: [Uint32Array, 1],
-      totalReadFrames: [BigUint64Array, 1],
-      totalWriteFrames: [BigUint64Array, 1],
-    }),
-    samplesPerFrame: params.channelCount,
-  }
-}
-
 /**
  * Creates a FillerFrameBufferConfig instance.
  * @param params - The parameters for the FillerFrameBuffer.
  * @returns A new instance of FillerFrameBufferConfig.
  */
-export const createFillerFrameBufferConfig = (params: FillerFrameBufferParams): FillerFrameBufferConfig => {
+export const createFillerFrameBufferContext = (params: FillerFrameBufferParams): FillerFrameBufferContext => {
   const sampleRate = params.sampleRate
   // Check if 'sampleRate' is a positive integer
   if (sampleRate === undefined || (!Number.isInteger(sampleRate) || sampleRate <= 0)) {
     throw new Error('Invalid sampleRate: must be a positive integer.')
   }
   const intervalMillisecond = params.fillInterval ?? DEFAULT_FILL_INTERVAL_MS
-  const frameBufferSize = Math.floor(
+  const frameCount = Math.floor(
     sampleRate * intervalMillisecond / 1000 + (AUDIO_WORKLET_BLOCK_SIZE - 1),
   ) & ~(AUDIO_WORKLET_BLOCK_SIZE - 1)
   const frameBufferChunkCount = params.frameBufferChunks ?? DEFAULT_FRAME_BUFFER_CHUNKS
-  const config = createFrameBufferConfig(
-    { frameBufferSize: frameBufferSize * frameBufferChunkCount, channelCount: params.channelCount })
+  const config = createFrameBufferContext(
+    { frameCount: frameCount * frameBufferChunkCount, channelCount: params.channelCount })
   return {
     ...config,
     sampleRate,

package/src/{frame-buffer/buffer-filler.ts → frame-buffer-filler.ts}

@@ -1,4 +1,4 @@
-import type { FrameBufferWriter } from './buffer-writer'
+import type { FrameBufferWriter } from '@ain1084/audio-frame-buffer'
 
 /**
  * FrameBufferFiller interface
@@ -7,7 +7,7 @@ import type { FrameBufferWriter } from './buffer-writer'
 export interface FrameBufferFiller {
   /**
    * Fill the buffer with audio frames using the provided writer.
-   * @param writer - An instance of FrameBufferWriter used to write audio frames to the buffer.
+   * @param writer - An instance of {@link https://ain1084.github.io/audio-frame-buffer/classes/FrameBufferWriter.html | FrameBufferWriter} used to write audio frames to the buffer.
    * @returns A boolean indicating whether to continue playback.
    */
   fill(writer: FrameBufferWriter): boolean

package/src/index.ts

@@ -1,7 +1,7 @@
 export { StopEvent, UnderrunEvent } from './events'
 export type { OutputStreamNode } from './output-stream-node'
-export type { FrameBufferWriter } from './frame-buffer/buffer-writer'
-export type { FrameBufferFiller } from './frame-buffer/buffer-filler'
+export type { FrameBufferWriter } from '@ain1084/audio-frame-buffer'
+export type { FrameBufferFiller } from './frame-buffer-filler'
 export { StreamNodeFactory,
   type ManualBufferNodeParams,
   type TimedBufferNodeParams,

package/src/output-stream-node.ts

@@ -2,7 +2,7 @@ import type { MessageToProcessor, MessageToAudioNode } from './output-message'
 import { PROCESSOR_NAME } from './constants'
 import { StopEvent, UnderrunEvent } from './events'
 import { BufferWriteStrategy } from './write-strategy/strategy'
-import { FrameBufferConfig } from './frame-buffer/buffer-config'
+import { FrameBufferContext } from '@ain1084/audio-frame-buffer'
 
 /**
  * Stream state
@@ -32,21 +32,21 @@ export class OutputStreamNode extends AudioWorkletNode {
   /**
    * Creates an instance of OutputStreamNode.
    * @param baseAudioContext - The audio context to use.
-   * @param bufferConfig - The configuration for the buffer.
+   * @param bufferContext - The context for the audio frame buffer.
    * @param strategy - The strategy for writing to the buffer.
    */
   private constructor(
     baseAudioContext: BaseAudioContext,
-    bufferConfig: FrameBufferConfig,
+    bufferContext: FrameBufferContext,
     strategy: BufferWriteStrategy,
   ) {
     super(baseAudioContext, PROCESSOR_NAME, {
-      outputChannelCount: [bufferConfig.samplesPerFrame],
-      processorOptions: bufferConfig,
+      outputChannelCount: [bufferContext.samplesPerFrame],
+      processorOptions: bufferContext,
     })
     this._strategy = strategy
-    this._totalWriteFrames = bufferConfig.totalWriteFrames
-    this._totalReadFrames = bufferConfig.totalReadFrames
+    this._totalWriteFrames = bufferContext.totalWriteFrames
+    this._totalReadFrames = bufferContext.totalReadFrames
     this.port.onmessage = this.handleMessage.bind(this)
   }
 
@@ -54,12 +54,12 @@ export class OutputStreamNode extends AudioWorkletNode {
    * @internal
    * Creates an instance of OutputStreamNode.
    * @param audioContext - The audio context to use.
-   * @param config - The configuration for the buffer.
+   * @param context - The context for the audio frame buffer.
    * @param strategy - The strategy for writing to the buffer.
    * @returns A promise that resolves to an instance of OutputStreamNode.
    */
-  public static async create(audioContext: BaseAudioContext, config: FrameBufferConfig, strategy: BufferWriteStrategy): Promise<OutputStreamNode> {
-    const node = new OutputStreamNode(audioContext, config, strategy)
+  public static async create(audioContext: BaseAudioContext, context: FrameBufferContext, strategy: BufferWriteStrategy): Promise<OutputStreamNode> {
+    const node = new OutputStreamNode(audioContext, context, strategy)
     if (!(await strategy.onInit(node))) {
       throw new Error('Failed to onInit.')
     }

package/src/output-stream-processor.ts

@@ -1,7 +1,6 @@
-import { FrameBufferReader } from './frame-buffer/buffer-reader'
+import { FrameBufferReader, type FrameBufferContext } from '@ain1084/audio-frame-buffer'
 import { PROCESSOR_NAME } from './constants'
 import type { MessageToAudioNode, MessageToProcessor } from './output-message'
-import type { FrameBufferConfig } from './frame-buffer/buffer-config'
 
 /**
  * OutputStreamProcessor class
@@ -20,7 +19,7 @@ class OutputStreamProcessor extends AudioWorkletProcessor {
    */
   constructor(options: AudioWorkletNodeOptions) {
     super()
-    this._frameReader = new FrameBufferReader(options.processorOptions as FrameBufferConfig)
+    this._frameReader = new FrameBufferReader(options.processorOptions as FrameBufferContext)
     this.port.onmessage = this.handleMessage.bind(this)
   }
 
@@ -79,13 +78,13 @@ class OutputStreamProcessor extends AudioWorkletProcessor {
   process(_inputs: Float32Array[][], outputs: Float32Array[][]): boolean {
     const output = outputs[0]
     const samplesPerFrame = output.length
-    const readFrames = this._frameReader.read((buffer, offset) => {
-      const bufferFrameCount = buffer.length / samplesPerFrame
+    const readFrames = this._frameReader.read((segment, offset) => {
+      const bufferFrameCount = segment.frameCount
       const frameCount = Math.min(bufferFrameCount, output[0].length - offset)
       // Deinterleaves interleaved audio frame data and writes it to the output.
       output.forEach((outputChannel, channelIndex) => {
         for (let i = channelIndex, j = 0; j < frameCount; i += samplesPerFrame, ++j) {
-          outputChannel[offset + j] = buffer[i]
+          outputChannel[offset + j] = segment.samples[i]
         }
       })
       return frameCount

package/src/stream-node-factory.ts

@@ -1,10 +1,10 @@
 import processor from './output-stream-processor?worker&url'
 import { ManualBufferWriteStrategy } from './write-strategy/manual-strategy'
-import { createFillerFrameBufferConfig, createFrameBufferConfig } from './frame-buffer/buffer-config'
+import { createFillerFrameBufferContext } from './filler-frame-buffer-context'
 import type { OutputStreamNode } from './output-stream-node'
 import { TimedBufferWriteStrategy } from './write-strategy/timed-strategy'
-import type { FrameBufferFiller } from './frame-buffer/buffer-filler'
-import { FrameBufferWriter } from './frame-buffer/buffer-writer'
+import type { FrameBufferFiller } from './frame-buffer-filler'
+import { FrameBufferWriter, createFrameBufferContext } from '@ain1084/audio-frame-buffer'
 import { WorkerBufferWriteStrategy } from './write-strategy/worker-strategy'
 
 /**
@@ -14,8 +14,8 @@ import { WorkerBufferWriteStrategy } from './write-strategy/worker-strategy'
 export type ManualBufferNodeParams = {
   /** The number of audio channels. */
   readonly channelCount: number
-  /** The size of the frame buffer in frames. */
-  readonly frameBufferSize: number
+  /** The count of the frame buffer in frames. */
+  readonly frameCount: number
 }
 
 /**
@@ -97,12 +97,12 @@ export class StreamNodeFactory {
     if (params.channelCount <= 0 || !Number.isInteger(params.channelCount)) {
       throw new Error('Invalid channelCount: must be a positive integer.')
     }
-    if (params.frameBufferSize <= 0 || !Number.isInteger(params.frameBufferSize)) {
-      throw new Error('Invalid frameBufferSize: must be a positive integer.')
+    if (params.frameCount <= 0 || !Number.isInteger(params.frameCount)) {
+      throw new Error('Invalid frameCount: must be a positive integer.')
     }
-    const config = createFrameBufferConfig({ ...params })
-    const strategy = new ManualBufferWriteStrategy(config)
-    return [await this._outputStreamNodeFactory.create(this.audioContext, config, strategy), strategy.writer]
+    const context = createFrameBufferContext({ ...params })
+    const strategy = new ManualBufferWriteStrategy(context)
+    return [await this._outputStreamNodeFactory.create(this.audioContext, context, strategy), strategy.writer]
   }
 
   /**
@@ -119,7 +119,7 @@ export class StreamNodeFactory {
     }
     StreamNodeFactory.validateTimedBufferNodeParams(params)
     const paramsWithSampleRate = StreamNodeFactory.applySampleRateToParams(params, this._audioContext.sampleRate)
-    const config = createFillerFrameBufferConfig(paramsWithSampleRate)
+    const config = createFillerFrameBufferContext(paramsWithSampleRate)
     return this._outputStreamNodeFactory.create(this.audioContext, config,
       new TimedBufferWriteStrategy(config, frameFiller))
   }
@@ -135,7 +135,7 @@ export class StreamNodeFactory {
   ): Promise<OutputStreamNode> {
     StreamNodeFactory.validateTimedBufferNodeParams(params)
     const paramsWithSampleRate = StreamNodeFactory.applySampleRateToParams(params, this._audioContext.sampleRate)
-    const config = createFillerFrameBufferConfig(paramsWithSampleRate)
+    const config = createFillerFrameBufferContext(paramsWithSampleRate)
     return this._outputStreamNodeFactory.create(this._audioContext, config,
       new WorkerBufferWriteStrategy<FillerParams>(config, worker, params.fillerParams))
   }

package/src/write-strategy/manual-strategy.ts

@@ -1,6 +1,5 @@
 import type { BufferWriteStrategy } from './strategy'
-import type { FrameBufferConfig } from '../frame-buffer/buffer-config'
-import { FrameBufferWriter } from '../frame-buffer/buffer-writer'
+import { type FrameBufferContext, FrameBufferWriter } from '@ain1084/audio-frame-buffer'
 
 /**
   * ManualBufferWriteStrategy class
@@ -11,10 +10,10 @@ export class ManualBufferWriteStrategy implements BufferWriteStrategy {
 
   /**
    * Creates an instance of ManualBufferWriteStrategy.
-   * @param config - The configuration for the frame buffer.
+   * @param bufferContext - The configuration for the frame buffer.
    */
-  constructor(config: FrameBufferConfig) {
-    this._writer = new FrameBufferWriter(config)
+  constructor(bufferContext: FrameBufferContext) {
+    this._writer = new FrameBufferWriter(bufferContext)
   }
 
   /**

package/src/write-strategy/timed-strategy.ts

@@ -1,7 +1,7 @@
 import type { BufferWriteStrategy } from './strategy'
-import type { FillerFrameBufferConfig } from '../frame-buffer/buffer-config'
-import { FrameBufferWriter } from '../frame-buffer/buffer-writer'
-import type { FrameBufferFiller } from '../frame-buffer/buffer-filler'
+import type { FillerFrameBufferContext } from '../filler-frame-buffer-context'
+import { FrameBufferWriter } from '@ain1084/audio-frame-buffer'
+import type { FrameBufferFiller } from '../frame-buffer-filler'
 import type { OutputStreamNode } from '../output-stream-node'
 
 /**
@@ -59,13 +59,13 @@ export class TimedBufferWriteStrategy implements BufferWriteStrategy {
 
   /**
    * Creates an instance of TimedBufferWriteStrategy.
-   * @param config - The configuration for the filler frame buffer.
+   * @param bufferContext - The configuration for the filler frame buffer.
    * @param filler - The FrameBufferFiller instance.
    */
-  constructor(config: FillerFrameBufferConfig, filler: FrameBufferFiller) {
-    this._writer = new FrameBufferWriter(config)
+  constructor(bufferContext: FillerFrameBufferContext, filler: FrameBufferFiller) {
+    this._writer = new FrameBufferWriter(bufferContext)
     this._filler = filler
-    this._interval = config.fillInterval
+    this._interval = bufferContext.fillInterval
     this._isContinuePlayback = this._filler.fill(this._writer)
   }
 

package/src/write-strategy/worker/message.ts

@@ -1,4 +1,4 @@
-import type { FillerFrameBufferConfig } from '../../frame-buffer/buffer-config'
+import type { FillerFrameBufferContext } from '../../filler-frame-buffer-context'
 
 /**
  * Message sent from the main thread to the worker.
@@ -6,7 +6,7 @@ import type { FillerFrameBufferConfig } from '../../frame-buffer/buffer-config'
  * @typeParam FillerParams - The type of the parameters for the FrameBufferFiller.
  *
  * For 'init' messages:
- * @property config - The configuration for the filler frame buffer.
+ * @property context - The context for the filler frame buffer.
  * @property fillerParams - The parameters for the FrameBufferFiller.
  *
  * For 'start' messages:
@@ -23,7 +23,7 @@ import type { FillerFrameBufferConfig } from '../../frame-buffer/buffer-config'
  * ```
  */
 export type MessageToWorker<FillerParams> =
-  | { type: 'init', config: FillerFrameBufferConfig, fillerParams: FillerParams }
+  | { type: 'init', config: FillerFrameBufferContext, fillerParams: FillerParams }
   | { type: 'start' }
   | { type: 'stop' }
 

package/src/write-strategy/worker/worker.ts

@@ -1,6 +1,6 @@
-import type { FillerFrameBufferConfig } from '../../frame-buffer/buffer-config'
-import type { FrameBufferFiller } from '../../frame-buffer/buffer-filler'
-import { FrameBufferWriter } from '../../frame-buffer/buffer-writer'
+import type { FillerFrameBufferContext } from '../../filler-frame-buffer-context'
+import type { FrameBufferFiller } from '../../frame-buffer-filler'
+import { FrameBufferWriter } from '@ain1084/audio-frame-buffer'
 import { MessageToStrategy, MessageToWorker } from './message'
 
 /**
@@ -16,13 +16,13 @@ class Context {
 
   /**
    * Creates an instance ofContext.
-   * @param config - The configuration for the filler frame buffer.
+   * @param context - The configuration for the filler frame buffer.
    * @param frameBufferFiller - The FrameBufferFiller instance.
    */
-  constructor(config: FillerFrameBufferConfig, frameBufferFiller: FrameBufferFiller) {
-    this._frameBufferWriter = new FrameBufferWriter(config)
+  constructor(context: FillerFrameBufferContext, frameBufferFiller: FrameBufferFiller) {
+    this._frameBufferWriter = new FrameBufferWriter(context)
     this._frameBufferFiller = frameBufferFiller
-    this._fillInterval = config.fillInterval
+    this._fillInterval = context.fillInterval
     this._isContinuePlayback = this.fillBuffer()
   }
 
@@ -117,15 +117,15 @@ export class BufferFillWorker<FillerParams> {
 
   /**
    * Initializes the worker context.
-   * @param config - The configuration for the filler frame buffer.
+   * @param bufferContext - The configuration for the filler frame buffer.
    * @param params - The parameters for the FrameBufferFiller.
    */
-  private async init(config: FillerFrameBufferConfig, params: FillerParams) {
+  private async init(bufferContext: FillerFrameBufferContext, params: FillerParams) {
     if (this._context) {
       throw new Error('Error: Context is already created.')
     }
     await this._init?.()
-    this._context = new Context(config, new this._frameBufferFillerGenerator(params))
+    this._context = new Context(bufferContext, new this._frameBufferFillerGenerator(params))
     self.postMessage({ type: 'init-done' } as MessageToStrategy)
   }
 

package/src/write-strategy/worker-strategy.ts

@@ -1,18 +1,18 @@
 import type { BufferWriteStrategy } from './strategy'
-import type { FillerFrameBufferConfig } from '../frame-buffer/buffer-config'
+import type { FillerFrameBufferContext } from '../filler-frame-buffer-context'
 import type { MessageToStrategy, MessageToWorker } from './worker/message'
 import type { OutputStreamNode } from '../output-stream-node'
 
 /**
  * Parameters for creating a PlayContext.
  * @property node - The OutputStreamNode instance.
- * @property config - The FillerFrameBufferConfig instance.
+ * @property context - The FillerFrameBufferContext instance.
  * @property workerConstructor - The constructor for the Worker.
  * @property fillerParam - The parameters for the FrameBufferFiller.
  */
 type PlayerContextParams<FillerParams> = Readonly<{
   node: OutputStreamNode
-  config: FillerFrameBufferConfig
+  context: FillerFrameBufferContext
   workerConstructor: new () => Worker
   fillerParam: FillerParams
 }>
@@ -23,7 +23,7 @@ type PlayerContextParams<FillerParams> = Readonly<{
  */
 class Context<FillerParams> {
   private readonly _node: OutputStreamNode
-  private readonly _config: FillerFrameBufferConfig
+  private readonly _bufferContext: FillerFrameBufferContext
   private readonly _fillerParam: FillerParams
   private readonly _worker: Worker
 
@@ -33,7 +33,7 @@ class Context<FillerParams> {
    */
   private constructor(params: PlayerContextParams<FillerParams>) {
     this._node = params.node
-    this._config = params.config
+    this._bufferContext = params.context
     this._worker = new params.workerConstructor()
     this._fillerParam = params.fillerParam
     this._worker.onmessage = this.handleWorkerMessage.bind(this)
@@ -68,7 +68,7 @@ class Context<FillerParams> {
     return new Promise<void>((resolve) => {
       const message: MessageToWorker<FillerParams> = {
         type: 'init',
-        config: this._config,
+        config: this._bufferContext,
         fillerParams: this._fillerParam,
       }
       this._worker.postMessage(message)
@@ -111,12 +111,12 @@ export class WorkerBufferWriteStrategy<FillerParam> implements BufferWriteStrate
 
   /**
    * Creates an instance of WorkerBufferWriteStrategy.
-   * @param config - The configuration for the filler frame buffer.
+   * @param bufferContext - The context for the filler frame buffer.
    * @param workerConstructor - The constructor for the Worker.
    * @param fillerParam - The parameters for the FrameBufferFiller.
    */
-  constructor(config: FillerFrameBufferConfig, workerConstructor: new () => Worker, fillerParam: FillerParam) {
-    this._createPlayContext = (node: OutputStreamNode) => Context.create<FillerParam>({ node, config, workerConstructor, fillerParam })
+  constructor(bufferContext: FillerFrameBufferContext, workerConstructor: new () => Worker, fillerParam: FillerParam) {
+    this._createPlayContext = (node: OutputStreamNode) => Context.create<FillerParam>({ node, context: bufferContext, workerConstructor, fillerParam })
   }
 
   /**

package/dist/frame-buffer/buffer-config.d.ts

@@ -1,60 +0,0 @@
-/**
- * Parameters for creating a FrameBuffer.
- * @property frameBufferSize - The size of the frame buffer.
- * @property channelCount - The number of audio channels.
- */
-export type FrameBufferParams = Readonly<{
-    frameBufferSize: number;
-    channelCount: number;
-}>;
-/**
- * Parameters for creating a FillerFrameBuffer.
- * @property channelCount - The number of audio channels.
- * @property fillInterval - The interval in milliseconds for filling the buffer.
- * @property sampleRate - The sample rate of the audio context.
- * @property frameBufferChunks - The number of chunks in the frame buffer.
- */
-export type FillerFrameBufferParams = Readonly<{
-    channelCount: number;
-    fillInterval?: number;
-    sampleRate?: number;
-    frameBufferChunks?: number;
-}>;
-/**
- * Configuration for a FrameBuffer.
- * This configuration is returned by the createFrameBufferConfig function.
- * @property sampleBuffer - The shared buffer for audio data frames.
- * @property samplesPerFrame - The number of samples per frame.
- * @property usedFramesInBuffer - The usage count of the frames in the buffer.
- * @property totalReadFrames - The total frames read from the buffer.
- * @property totalWriteFrames - The total frames written to the buffer.
- */
-export type FrameBufferConfig = Readonly<{
-    sampleBuffer: Float32Array;
-    samplesPerFrame: number;
-    usedFramesInBuffer: Uint32Array;
-    totalReadFrames: BigUint64Array;
-    totalWriteFrames: BigUint64Array;
-}>;
-/**
- * Configuration for a FillerFrameBuffer.
- * This configuration is returned by the createFillerFrameBufferConfig function.
- * @property sampleRate - The sample rate of the audio context.
- * @property fillInterval - The interval in milliseconds for filling the buffer.
- */
-export type FillerFrameBufferConfig = FrameBufferConfig & Readonly<{
-    sampleRate: number;
-    fillInterval: number;
-}>;
-/**
- * Creates a FrameBufferConfig instance.
- * @param params - The parameters for the FrameBuffer.
- * @returns A new instance of FrameBufferConfig.
- */
-export declare const createFrameBufferConfig: (params: FrameBufferParams) => FrameBufferConfig;
-/**
- * Creates a FillerFrameBufferConfig instance.
- * @param params - The parameters for the FillerFrameBuffer.
- * @returns A new instance of FillerFrameBufferConfig.
- */
-export declare const createFillerFrameBufferConfig: (params: FillerFrameBufferParams) => FillerFrameBufferConfig;

package/dist/frame-buffer/buffer-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"buffer-config.js","sourceRoot":"","sources":["../../src/frame-buffer/buffer-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAA;AAE1E;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,EAAE,CAAA;AAEnC;;;;GAIG;AACH,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAErC;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,GAAG,CAAA;AAsDpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAyB,EAAqB,EAAE;IACtF,OAAO;QACL,GAAG,sBAAsB,CAAC,iBAAiB,EAAE;YAC3C,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC;YAC1E,kBAAkB,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YACpC,eAAe,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;YACpC,gBAAgB,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;SACtC,CAAC;QACF,eAAe,EAAE,MAAM,CAAC,YAAY;KACrC,CAAA;AACH,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAA+B,EAA2B,EAAE;IACxG,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;IACpC,8CAA8C;IAC9C,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IACD,MAAM,mBAAmB,GAAG,MAAM,CAAC,YAAY,IAAI,wBAAwB,CAAA;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,UAAU,GAAG,mBAAmB,GAAG,IAAI,GAAG,CAAC,wBAAwB,GAAG,CAAC,CAAC,CACzE,GAAG,CAAC,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAA;IACnC,MAAM,qBAAqB,GAAG,MAAM,CAAC,iBAAiB,IAAI,2BAA2B,CAAA;IACrF,MAAM,MAAM,GAAG,uBAAuB,CACpC,EAAE,eAAe,EAAE,eAAe,GAAG,qBAAqB,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAA;IAClG,OAAO;QACL,GAAG,MAAM;QACT,UAAU;QACV,YAAY,EAAE,mBAAmB;KAClC,CAAA;AACH,CAAC,CAAA"}