diff --git a/client/lib/src/AudioStreamer.ts b/client/lib/src/AudioStreamer.ts index acb4d928..b3432252 100644 --- a/client/lib/src/AudioStreamer.ts +++ b/client/lib/src/AudioStreamer.ts @@ -240,7 +240,7 @@ export const postVoice = async ( srcId: number, dstId: number, timestamp: number, - convertSize: number, + convertChunkNum: number, crossFadeLowerValue: number, crossFadeOffsetRate: number, crossFadeEndRate: number, @@ -250,7 +250,7 @@ export const postVoice = async ( srcId, dstId, timestamp, - convertSize, + convertChunkNum, crossFadeLowerValue, crossFadeOffsetRate, crossFadeEndRate, diff --git a/client/lib/webpack.common.js b/client/lib/webpack.common.js index 61ddc4e4..1d9dfd19 100644 --- a/client/lib/webpack.common.js +++ b/client/lib/webpack.common.js @@ -28,6 +28,7 @@ module.exports = { }, plugins: [ new webpack.ProvidePlugin({ + Buffer: ["buffer", "Buffer"], process: "process/browser", }), ], diff --git a/server/restapi/MMVC_Rest_VoiceChanger.py b/server/restapi/MMVC_Rest_VoiceChanger.py index 14aaf18a..8fd509f9 100644 --- a/server/restapi/MMVC_Rest_VoiceChanger.py +++ b/server/restapi/MMVC_Rest_VoiceChanger.py @@ -14,7 +14,10 @@ class VoiceModel(BaseModel): srcId: int dstId: int timestamp: int - prefixChunkSize: int + convertChunkNum: int + crossFadeLowerValue: float + crossFadeOffsetRate:float + crossFadeEndRate:float buffer: str class MMVC_Rest_VoiceChanger: @@ -31,7 +34,10 @@ class MMVC_Rest_VoiceChanger: srcId = voice.srcId dstId = voice.dstId timestamp = voice.timestamp - prefixChunkSize = voice.prefixChunkSize + convertChunkNum = voice.convertChunkNum + crossFadeLowerValue = voice.crossFadeLowerValue + crossFadeOffsetRate = voice.crossFadeOffsetRate + crossFadeEndRate = voice.crossFadeEndRate buffer = voice.buffer wav = base64.b64decode(buffer) @@ -46,7 +52,7 @@ class MMVC_Rest_VoiceChanger: self.tlock.acquire() changedVoice = self.voiceChangerManager.changeVoice( - gpu, srcId, dstId, timestamp, prefixChunkSize, unpackedData) + gpu, srcId, dstId, timestamp, convertChunkNum, crossFadeLowerValue, crossFadeOffsetRate, crossFadeEndRate, unpackedData) self.tlock.release() changedVoiceBase64 = base64.b64encode(changedVoice).decode('utf-8') @@ -55,7 +61,7 @@ class MMVC_Rest_VoiceChanger: "srcId": srcId, "dstId": dstId, "timestamp": timestamp, - "prefixChunkSize": prefixChunkSize, + "convertChunkNum": voice.convertChunkNum, "changedVoiceBase64": changedVoiceBase64 } diff --git a/server/voice_changer/VoiceChanger.py b/server/voice_changer/VoiceChanger.py index 3567c2c8..3053b2ed 100755 --- a/server/voice_changer/VoiceChanger.py +++ b/server/voice_changer/VoiceChanger.py @@ -85,7 +85,8 @@ class VoiceChanger(): print("Cur", self.cur_strength) # ひとつ前の結果とサイズが変わるため、記録は消去する。 - delattr(self,"prev_audio1") + if hasattr(self, 'prev_audio1') == True: + delattr(self,"prev_audio1") try: