EXP. remove microphone stream 3

client/demo/src/105_speaker_setting.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from "react"
+import React, { useEffect, useMemo } from "react"
 import { useAppState } from "./001_provider/001_AppStateProvider";
 import { AnimationTypes, HeaderButton, HeaderButtonProps } from "./components/101_HeaderButton";
 

client/demo/src/107_advanced_setting.tsx

@@ -1,4 +1,4 @@
-import { BufferSize, CrossFadeOverlapSize, DownSamplingMode, InputSampleRate, Protocol, SampleRate } from "@dannadori/voice-changer-client-js"
+import { CrossFadeOverlapSize, DownSamplingMode, InputSampleRate, Protocol, SampleRate } from "@dannadori/voice-changer-client-js"
 import React, { useMemo } from "react"
 import { useAppState } from "./001_provider/001_AppStateProvider";
 import { AnimationTypes, HeaderButton, HeaderButtonProps } from "./components/101_HeaderButton";
@@ -102,27 +102,6 @@ export const useAdvancedSetting = (): AdvancedSettingState => {
         )
     }, [appState.workletNodeSetting.workletNodeSetting.sendingSampleRate, appState.workletNodeSetting.updateWorkletNodeSetting, appState.serverSetting.updateServerSettings])
 
-    const bufferSizeRow = useMemo(() => {
-        return (
-
-            <div className="body-row split-3-7 left-padding-1 guided">
-                <div className="body-item-title left-padding-1">Buffer Size</div>
-                <div className="body-select-container">
-                    <select className="body-select" value={appState.clientSetting.clientSetting.bufferSize} onChange={(e) => {
-                        appState.clientSetting.updateClientSetting({ ...appState.clientSetting.clientSetting, bufferSize: Number(e.target.value) as BufferSize })
-                    }}>
-                        {
-                            Object.values(BufferSize).map(x => {
-                                return <option key={x} value={x}>{x}</option>
-                            })
-                        }
-                    </select>
-                </div>
-            </div>
-        )
-    }, [appState.clientSetting.clientSetting.bufferSize, appState.clientSetting.updateClientSetting])
-
-
     const crossFadeOverlapSizeRow = useMemo(() => {
         return (
             <div className="body-row split-3-7 left-padding-1 guided">
@@ -242,7 +221,6 @@ export const useAdvancedSetting = (): AdvancedSettingState => {
                 <div className="body-row divider"></div>
                 {sampleRateRow}
                 {sendingSampleRateRow}
-                {bufferSizeRow}
                 <div className="body-row divider"></div>
                 {crossFadeOverlapSizeRow}
                 {crossFadeOffsetRateRow}
@@ -254,7 +232,7 @@ export const useAdvancedSetting = (): AdvancedSettingState => {
 
             </>
         )
-    }, [mmvcServerUrlRow, protocolRow, sampleRateRow, sendingSampleRateRow, bufferSizeRow, crossFadeOverlapSizeRow, crossFadeOffsetRateRow, crossFadeEndRateRow, workletSettingRow, downSamplingModeRow])
+    }, [mmvcServerUrlRow, protocolRow, sampleRateRow, sendingSampleRateRow, crossFadeOverlapSizeRow, crossFadeOffsetRateRow, crossFadeEndRateRow, workletSettingRow, downSamplingModeRow])
 
 
     const advancedSetting = useMemo(() => {

client/lib/src/AudioStreamer.ts

@@ -1,243 +0,0 @@
-// import { io, Socket } from "socket.io-client";
-// import { DefaultEventsMap } from "@socket.io/component-emitter";
-// import { Duplex, DuplexOptions } from "readable-stream";
-// import { AudioStreamerSetting, DefaultAudioStreamerSetting, DownSamplingMode, VOICE_CHANGER_CLIENT_EXCEPTION } from "./const";
-
-
-// export type Callbacks = {
-//     onVoiceReceived: (data: ArrayBuffer) => void
-// }
-// export type AudioStreamerListeners = {
-//     notifySendBufferingTime: (time: number) => void
-//     notifyResponseTime: (time: number) => void
-//     notifyException: (code: VOICE_CHANGER_CLIENT_EXCEPTION, message: string) => void
-// }
-
-// export class AudioStreamer extends Duplex {
-//     private setting: AudioStreamerSetting = DefaultAudioStreamerSetting
-
-//     private callbacks: Callbacks
-//     private audioStreamerListeners: AudioStreamerListeners
-//     private socket: Socket<DefaultEventsMap, DefaultEventsMap> | null = null
-//     private requestChunks: ArrayBuffer[] = []
-
-//     // performance monitor
-//     private bufferStart = 0;
-
-//     constructor(callbacks: Callbacks, audioStreamerListeners: AudioStreamerListeners, options?: DuplexOptions) {
-//         super(options);
-//         this.callbacks = callbacks
-//         this.audioStreamerListeners = audioStreamerListeners
-//         this.createSocketIO()
-//     }
-
-//     private createSocketIO = () => {
-//         if (this.socket) {
-//             this.socket.close()
-//         }
-//         if (this.setting.protocol === "sio") {
-//             this.socket = io(this.setting.serverUrl + "/test");
-//             this.socket.on('connect_error', (err) => {
-//                 this.audioStreamerListeners.notifyException(VOICE_CHANGER_CLIENT_EXCEPTION.ERR_SIO_CONNECT_FAILED, `[SIO] rconnection failed ${err}`)
-//             })
-//             this.socket.on('connect', () => {
-//                 console.log(`[SIO] sonnect to ${this.setting.serverUrl}`)
-//                 console.log(`[SIO] ${this.socket?.id}`)
-//             });
-//             this.socket.on('response', (response: any[]) => {
-//                 const cur = Date.now()
-//                 const responseTime = cur - response[0]
-//                 const result = response[1] as ArrayBuffer
-//                 if (result.byteLength < 128 * 2) {
-//                     this.audioStreamerListeners.notifyException(VOICE_CHANGER_CLIENT_EXCEPTION.ERR_SIO_INVALID_RESPONSE, `[SIO] recevied data is too short ${result.byteLength}`)
-//                 } else {
-//                     this.callbacks.onVoiceReceived(response[1])
-//                     this.audioStreamerListeners.notifyResponseTime(responseTime)
-//                 }
-//             });
-//         }
-//     }
-
-
-//     // Option Change
-//     updateSetting = (setting: AudioStreamerSetting) => {
-//         console.log(`[AudioStreamer] Updating AudioStreamer Setting,`, this.setting, setting)
-//         let recreateSocketIoRequired = false
-//         if (this.setting.serverUrl != setting.serverUrl || this.setting.protocol != setting.protocol) {
-//             recreateSocketIoRequired = true
-//         }
-//         this.setting = setting
-//         if (recreateSocketIoRequired) {
-//             this.createSocketIO()
-//         }
-//     }
-
-//     getSettings = (): AudioStreamerSetting => {
-//         return this.setting
-//     }
-
-//     getSocketId = () => {
-//         return this.socket?.id
-//     }
-
-//     // Main Process
-//     //// Pipe from mic stream 
-//     _write = (chunk: AudioBuffer, _encoding: any, callback: any) => {
-//         const buffer = chunk.getChannelData(0);
-//         this._write_realtime(buffer)
-//         callback();
-//     }
-
-//     _averageDownsampleBuffer(buffer: Float32Array, originalSampleRate: number, destinationSamplerate: number) {
-//         if (originalSampleRate == destinationSamplerate) {
-//             return buffer;
-//         }
-//         if (destinationSamplerate > originalSampleRate) {
-//             throw "downsampling rate show be smaller than original sample rate";
-//         }
-//         const sampleRateRatio = originalSampleRate / destinationSamplerate;
-//         const newLength = Math.round(buffer.length / sampleRateRatio);
-//         const result = new Float32Array(newLength);
-//         let offsetResult = 0;
-//         let offsetBuffer = 0;
-//         while (offsetResult < result.length) {
-//             var nextOffsetBuffer = Math.round((offsetResult + 1) * sampleRateRatio);
-//             // Use average value of skipped samples
-//             var accum = 0, count = 0;
-//             for (var i = offsetBuffer; i < nextOffsetBuffer && i < buffer.length; i++) {
-//                 accum += buffer[i];
-//                 count++;
-//             }
-//             result[offsetResult] = accum / count;
-//             // Or you can simply get rid of the skipped samples:
-//             // result[offsetResult] = buffer[nextOffsetBuffer];
-//             offsetResult++;
-//             offsetBuffer = nextOffsetBuffer;
-//         }
-//         return result;
-//     }
-
-
-//     private _write_realtime = async (buffer: Float32Array) => {
-
-//         let downsampledBuffer: Float32Array | null = null
-//         if (this.setting.sendingSampleRate == 48000) {
-//             downsampledBuffer = buffer
-//         } else if (this.setting.downSamplingMode == DownSamplingMode.decimate) {
-//             //////// (Kind 1) 間引き //////////
-//             // bufferSize個のデータ（48Khz）が入ってくる。
-//             //// 48000Hz で入ってくるので間引いて24000Hzに変換する。
-//             downsampledBuffer = new Float32Array(buffer.length / 2);
-//             for (let i = 0; i < buffer.length; i++) {
-//                 if (i % 2 == 0) {
-//                     downsampledBuffer[i / 2] = buffer[i]
-//                 }
-//             }
-//         } else {
-//             //////// (Kind 2) 平均 //////////
-//             // downsampledBuffer = this._averageDownsampleBuffer(buffer, 48000, 24000)
-//             downsampledBuffer = this._averageDownsampleBuffer(buffer, 48000, this.setting.sendingSampleRate)
-//         }
-
-//         // Float to signed16
-//         const arrayBuffer = new ArrayBuffer(downsampledBuffer.length * 2)
-//         const dataView = new DataView(arrayBuffer);
-//         for (let i = 0; i < downsampledBuffer.length; i++) {
-//             let s = Math.max(-1, Math.min(1, downsampledBuffer[i]));
-//             s = s < 0 ? s * 0x8000 : s * 0x7FFF
-//             dataView.setInt16(i * 2, s, true);
-//         }
-
-
-//         // 256byte(最低バッファサイズ256から間引いた個数x2byte)をchunkとして管理
-//         // const chunkByteSize = 256 // (const.ts ★1)
-//         // const chunkByteSize = 256 * 2 // (const.ts ★1)
-//         const chunkByteSize = (256 * 2) * (this.setting.sendingSampleRate / 48000) // (const.ts ★1)
-//         for (let i = 0; i < arrayBuffer.byteLength / chunkByteSize; i++) {
-//             const ab = arrayBuffer.slice(i * chunkByteSize, (i + 1) * chunkByteSize)
-//             this.requestChunks.push(ab)
-//         }
-
-
-//         //// リクエストバッファの中身が、リクエスト送信数と違う場合は処理終了。
-//         if (this.requestChunks.length < this.setting.inputChunkNum) {
-//             return
-//         }
-
-//         // リクエスト用の入れ物を作成
-//         const windowByteLength = this.requestChunks.reduce((prev, cur) => {
-//             return prev + cur.byteLength
-//         }, 0)
-//         const newBuffer = new Uint8Array(windowByteLength);
-
-//         // リクエストのデータをセット
-//         this.requestChunks.reduce((prev, cur) => {
-//             newBuffer.set(new Uint8Array(cur), prev)
-//             return prev + cur.byteLength
-//         }, 0)
-
-//         // console.log("send buff length", newBuffer.length)
-
-//         this.sendBuffer(newBuffer)
-//         this.requestChunks = []
-
-//         this.audioStreamerListeners.notifySendBufferingTime(Date.now() - this.bufferStart)
-//         this.bufferStart = Date.now()
-//     }
-
-//     private sendBuffer = async (newBuffer: Uint8Array) => {
-//         const timestamp = Date.now()
-//         if (this.setting.protocol === "sio") {
-//             if (!this.socket) {
-//                 console.warn(`sio is not initialized`)
-//                 return
-//             }
-//             // console.log("emit!")
-//             this.socket.emit('request_message', [
-//                 timestamp,
-//                 newBuffer.buffer]);
-//         } else {
-//             const res = await postVoice(
-//                 this.setting.serverUrl + "/test",
-//                 timestamp,
-//                 newBuffer.buffer)
-
-//             if (res.byteLength < 128 * 2) {
-//                 this.audioStreamerListeners.notifyException(VOICE_CHANGER_CLIENT_EXCEPTION.ERR_REST_INVALID_RESPONSE, `[REST] recevied data is too short ${res.byteLength}`)
-//             } else {
-//                 this.callbacks.onVoiceReceived(res)
-//                 this.audioStreamerListeners.notifyResponseTime(Date.now() - timestamp)
-//             }
-//         }
-//     }
-// }
-
-// export const postVoice = async (
-//     url: string,
-//     timestamp: number,
-//     buffer: ArrayBuffer) => {
-//     const obj = {
-//         timestamp,
-//         buffer: Buffer.from(buffer).toString('base64')
-//     };
-//     const body = JSON.stringify(obj);
-
-//     const res = await fetch(`${url}`, {
-//         method: "POST",
-//         headers: {
-//             'Accept': 'application/json',
-//             'Content-Type': 'application/json'
-//         },
-//         body: body
-//     })
-
-//     const receivedJson = await res.json()
-//     const changedVoiceBase64 = receivedJson["changedVoiceBase64"]
-//     const buf = Buffer.from(changedVoiceBase64, "base64")
-//     const ab = new ArrayBuffer(buf.length);
-//     const view = new Uint8Array(ab);
-//     for (let i = 0; i < buf.length; ++i) {
-//         view[i] = buf[i];
-//     }
-//     return ab
-// }

client/lib/src/VoiceChangerClient.ts

@@ -194,7 +194,6 @@ export class VoiceChangerClient {
         let reconstructInputRequired = false
         if (
             this.setting.audioInput != setting.audioInput ||
-            this.setting.bufferSize != setting.bufferSize ||
             this.setting.echoCancel != setting.echoCancel ||
             this.setting.noiseSuppression != setting.noiseSuppression ||
             this.setting.noiseSuppression2 != setting.noiseSuppression2 ||

client/lib/src/VoiceChangerWorkletNode.ts

@@ -133,7 +133,6 @@ export class VoiceChangerWorkletNode extends AudioWorkletNode {
                 downsampledBuffer = inputData
             } else if (this.setting.downSamplingMode == DownSamplingMode.decimate) {
                 //////// (Kind 1) 間引き //////////
-                // bufferSize個のデータ（48Khz）が入ってくる。
                 //// 48000Hz で入ってくるので間引いて24000Hzに変換する。
                 downsampledBuffer = new Float32Array(inputData.length / 2);
                 for (let i = 0; i < inputData.length; i++) {

client/lib/src/const.ts

@@ -176,17 +176,6 @@ export const SampleRate = {
 } as const
 export type SampleRate = typeof SampleRate[keyof typeof SampleRate]
 
-export const BufferSize = {
-    "256": 256,
-    "512": 512,
-    "1024": 1024,
-    "2048": 2048,
-    "4096": 4096,
-    "8192": 8192,
-    "16384": 16384
-} as const
-export type BufferSize = typeof BufferSize[keyof typeof BufferSize]
-
 export type Speaker = {
     "id": number,
     "name": string,
@@ -199,7 +188,6 @@ export type Correspondence = {
 export type VoiceChangerClientSetting = {
     audioInput: string | MediaStream | null,
     sampleRate: SampleRate, // 48000Hz
-    bufferSize: BufferSize, // 256, 512, 1024, 2048, 4096, 8192, 16384 (for mic stream)
     echoCancel: boolean,
     noiseSuppression: boolean,
     noiseSuppression2: boolean
@@ -213,7 +201,6 @@ export type VoiceChangerClientSetting = {
 export const DefaultVoiceChangerClientSetting: VoiceChangerClientSetting = {
     audioInput: null,
     sampleRate: 48000,
-    bufferSize: 1024,
     speakers: [
         {
             "id": 0,