PublicMirrors/voice-changer
1
0
Fork 0
mirror of https://github.com/w-okada/voice-changer.git synced 2025-02-02 16:23:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: for win exe

Browse Source
This commit is contained in:
wataru 2023-02-12 22:14:34 +09:00
parent 17ac07e263
commit 83646c130b
11 changed files with 56 additions and 627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/demo/dist/index.html vendored
View File

@ -1,10 +1 @@
<!DOCTYPE html> <!doctype html><html style="width:100%;height:100%;overflow:hidden"><head><meta charset="utf-8"/><title>Voice Changer Client Demo</title><script defer="defer" src="index.js"></script></head><body style="width:100%;height:100%;margin:0"><div id="app" style="width:100%;height:100%"></div></body></html>
<html style="width: 100%; height: 100%; overflow: hidden">
<head>
<meta charset="utf-8" />
<title>Voice Changer Client Demo</title>
<script defer src="index.js"></script></head>
<body style="width: 100%; height: 100%; margin: 0px">
<div id="app" style="width: 100%; height: 100%"></div>
</body>
</html>

597
client/demo/dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

31
client/demo/dist/index.js.LICENSE.txt vendored Normal file
View File

@ -0,0 +1,31 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
/**
* @license React
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/**
* @license React
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/**
* @license React
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

14
client/demo/package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@dannadori/voice-changer-client-js": "^1.0.67", "@dannadori/voice-changer-client-js": "^1.0.68",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0" "react-dom": "^18.2.0"
}, },
@ -3211,9 +3211,9 @@
} }
}, },
"node_modules/@dannadori/voice-changer-client-js": { "node_modules/@dannadori/voice-changer-client-js": {
"version": "1.0.67", "version": "1.0.68",
"resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.67.tgz", "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.68.tgz",
"integrity": "sha512-PsxNpaKpKuJfwZSWJBhtaEb0q8E+IgM9V9fYGSAUWbhLq9eVlDxjKa4xZHEQZrAJk06XxBNe2rUZp4f3MvQusQ==", "integrity": "sha512-fVObPH5/bKTSi8ZqsYgTRmphgpShOkmuaDgBS87PAnO3AunvlKTcNn6kmmEoDpdarmdy7ih5g/qzRbQCQh1Rtg==",
"dependencies": { "dependencies": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",
"amazon-chime-sdk-js": "^3.10.0", "amazon-chime-sdk-js": "^3.10.0",
@ -13543,9 +13543,9 @@
} }
}, },
"@dannadori/voice-changer-client-js": { "@dannadori/voice-changer-client-js": {
"version": "1.0.67", "version": "1.0.68",
"resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.67.tgz", "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.68.tgz",
"integrity": "sha512-PsxNpaKpKuJfwZSWJBhtaEb0q8E+IgM9V9fYGSAUWbhLq9eVlDxjKa4xZHEQZrAJk06XxBNe2rUZp4f3MvQusQ==", "integrity": "sha512-fVObPH5/bKTSi8ZqsYgTRmphgpShOkmuaDgBS87PAnO3AunvlKTcNn6kmmEoDpdarmdy7ih5g/qzRbQCQh1Rtg==",
"requires": { "requires": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",
"amazon-chime-sdk-js": "^3.10.0", "amazon-chime-sdk-js": "^3.10.0",

2
client/demo/package.json
View File

@ -50,7 +50,7 @@
"webpack-dev-server": "^4.11.1" "webpack-dev-server": "^4.11.1"
}, },
"dependencies": { "dependencies": {
"@dannadori/voice-changer-client-js": "^1.0.67", "@dannadori/voice-changer-client-js": "^1.0.68",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0" "react-dom": "^18.2.0"
} }

2
client/demo/src/101_server_setting.tsx
View File

@ -90,7 +90,7 @@ export const useServerSettingArea = (props: UseServerSettingProps): ServerSettin
const configFilenameText = props.clientState.serverSetting.fileUploadSetting.configFile?.filename || props.clientState.serverSetting.fileUploadSetting.configFile?.file?.name || "" const configFilenameText = props.clientState.serverSetting.fileUploadSetting.configFile?.filename || props.clientState.serverSetting.fileUploadSetting.configFile?.file?.name || ""
const onnxModelFilenameText = props.clientState.serverSetting.fileUploadSetting.onnxModel?.filename || props.clientState.serverSetting.fileUploadSetting.onnxModel?.file?.name || "" const onnxModelFilenameText = props.clientState.serverSetting.fileUploadSetting.onnxModel?.filename || props.clientState.serverSetting.fileUploadSetting.onnxModel?.file?.name || ""
const pyTorchFilenameText = props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.filename || props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.file?.name || "" const pyTorchFilenameText = props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.filename || props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.file?.name || ""
const correspondenceFileText = JSON.stringify(props.clientState.clientSetting.setting.correspondences.map(x => { return x.dirname })) const correspondenceFileText = props.clientState.clientSetting.setting.correspondences ? JSON.stringify(props.clientState.clientSetting.setting.correspondences.map(x => { return x.dirname })) : ""
return ( return (
<> <>

12
client/demo/src/103_speaker_setting.tsx
View File

@ -10,7 +10,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
const [editSpeakerTargetName, setEditSpeakerTargetName] = useState<string>("") const [editSpeakerTargetName, setEditSpeakerTargetName] = useState<string>("")
const srcIdRow = useMemo(() => { const srcIdRow = useMemo(() => {
const selected = props.clientState.clientSetting.setting.correspondences.find(x => { const selected = props.clientState.clientSetting.setting.correspondences?.find(x => {
return x.sid == props.clientState.serverSetting.setting.srcId return x.sid == props.clientState.serverSetting.setting.srcId
}) })
return ( return (
@ -24,7 +24,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
// props.clientState.clientSetting.setting.speakers.map(x => { // props.clientState.clientSetting.setting.speakers.map(x => {
// return <option key={x.id} value={x.id}>{x.name}({x.id})</option> // return <option key={x.id} value={x.id}>{x.name}({x.id})</option>
// }) // })
props.clientState.clientSetting.setting.correspondences.map(x => { props.clientState.clientSetting.setting.correspondences?.map(x => {
return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option> return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option>
}) })
@ -40,7 +40,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
}, [props.clientState.clientSetting.setting.speakers, props.clientState.serverSetting.setting.srcId, props.clientState.clientSetting.setting.correspondences, props.clientState.serverSetting.setSrcId]) }, [props.clientState.clientSetting.setting.speakers, props.clientState.serverSetting.setting.srcId, props.clientState.clientSetting.setting.correspondences, props.clientState.serverSetting.setSrcId])
const dstIdRow = useMemo(() => { const dstIdRow = useMemo(() => {
const selected = props.clientState.clientSetting.setting.correspondences.find(x => { const selected = props.clientState.clientSetting.setting.correspondences?.find(x => {
return x.sid == props.clientState.serverSetting.setting.dstId return x.sid == props.clientState.serverSetting.setting.dstId
}) })
return ( return (
@ -54,7 +54,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
// props.clientState.clientSetting.setting.speakers.map(x => { // props.clientState.clientSetting.setting.speakers.map(x => {
// return <option key={x.id} value={x.id}>{x.name}({x.id})</option> // return <option key={x.id} value={x.id}>{x.name}({x.id})</option>
// }) // })
props.clientState.clientSetting.setting.correspondences.map(x => { props.clientState.clientSetting.setting.correspondences?.map(x => {
return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option> return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option>
}) })
} }
@ -116,10 +116,10 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
const f0FactorRow = useMemo(() => { const f0FactorRow = useMemo(() => {
const src = props.clientState.clientSetting.setting.correspondences.find(x => { const src = props.clientState.clientSetting.setting.correspondences?.find(x => {
return x.sid == props.clientState.serverSetting.setting.srcId return x.sid == props.clientState.serverSetting.setting.srcId
}) })
const dst = props.clientState.clientSetting.setting.correspondences.find(x => { const dst = props.clientState.clientSetting.setting.correspondences?.find(x => {
return x.sid == props.clientState.serverSetting.setting.dstId return x.sid == props.clientState.serverSetting.setting.dstId
}) })

4
client/lib/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@dannadori/voice-changer-client-js", "name": "@dannadori/voice-changer-client-js",
"version": "1.0.67", "version": "1.0.68",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@dannadori/voice-changer-client-js", "name": "@dannadori/voice-changer-client-js",
"version": "1.0.67", "version": "1.0.68",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",

2
client/lib/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@dannadori/voice-changer-client-js", "name": "@dannadori/voice-changer-client-js",
"version": "1.0.67", "version": "1.0.68",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"directories": { "directories": {

6
client/lib/src/const.ts
View File

@ -141,14 +141,14 @@ export type ServerSettingKey = typeof ServerSettingKey[keyof typeof ServerSettin
export const DefaultVoiceChangerServerSetting: VoiceChangerServerSetting = { export const DefaultVoiceChangerServerSetting: VoiceChangerServerSetting = {
convertChunkNum: 32, //（★１） convertChunkNum: 32, //（★１）
minConvertSize: 0, minConvertSize: 0,
srcId: 107, srcId: 0,
dstId: 100, dstId: 101,
gpu: 0, gpu: 0,
crossFadeLowerValue: 0.1, crossFadeLowerValue: 0.1,
crossFadeOffsetRate: 0.1, crossFadeOffsetRate: 0.1,
crossFadeEndRate: 0.9, crossFadeEndRate: 0.9,
crossFadeOverlapRate: 0.5, crossFadeOverlapRate: 0.5,
framework: "ONNX", framework: "PyTorch",
f0Factor: 1.0, f0Factor: 1.0,
onnxExecutionProvider: "CPUExecutionProvider" onnxExecutionProvider: "CPUExecutionProvider"

2
server/voice_changer/VoiceChanger.py
View File

@ -82,7 +82,7 @@ class VocieChangerSettings():
crossFadeOverlapRate: float = 0.9 crossFadeOverlapRate: float = 0.9
convertChunkNum: int = 32 convertChunkNum: int = 32
minConvertSize: int = 0 minConvertSize: int = 0
framework: str = "ONNX" # PyTorch or ONNX framework: str = "PyTorch" # PyTorch or ONNX
f0Factor: float = 1.0 f0Factor: float = 1.0
pyTorchModelFile: str = "" pyTorchModelFile: str = ""