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

add ddsp-svc solver selector

Browse Source
This commit is contained in:
wataru 2023-05-14 01:04:29 +09:00
parent 5205bf77ad
commit da98fd2478
16 changed files with 137 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/demo/dist/assets/gui_settings/DDSP-SVC.json vendored
View File

@ -129,11 +129,15 @@
"options": {} "options": {}
}, },
{ {
"name": "diffEnablerRow", "name": "diffEnabler",
"options": {} "options": {}
}, },
{ {
"name": "diffSettingRow", "name": "diffMethod",
"options": {}
},
{
"name": "diffSetting",
"options": {} "options": {}
} }
], ],

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

File diff suppressed because one or more lines are too long

46
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.125", "@dannadori/voice-changer-client-js": "^1.0.126",
"@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0",
@ -24,7 +24,7 @@
"@babel/preset-env": "^7.21.5", "@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.18.6", "@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.5", "@babel/preset-typescript": "^7.21.5",
"@types/node": "^20.1.2", "@types/node": "^20.1.4",
"@types/react": "^18.2.6", "@types/react": "^18.2.6",
"@types/react-dom": "^18.2.4", "@types/react-dom": "^18.2.4",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -47,7 +47,7 @@
"ts-loader": "^9.4.2", "ts-loader": "^9.4.2",
"tsconfig-paths": "^4.2.0", "tsconfig-paths": "^4.2.0",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"webpack": "^5.82.0", "webpack": "^5.82.1",
"webpack-cli": "^5.1.1", "webpack-cli": "^5.1.1",
"webpack-dev-server": "^4.15.0" "webpack-dev-server": "^4.15.0"
} }
@ -3170,9 +3170,9 @@
} }
}, },
"node_modules/@dannadori/voice-changer-client-js": { "node_modules/@dannadori/voice-changer-client-js": {
"version": "1.0.125", "version": "1.0.126",
"resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.125.tgz", "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.126.tgz",
"integrity": "sha512-15NC8JKXV/50Y4EPLOuYRbruUIm/uuvz9rFmwPhyomrfZYdp/+GrNMMRPe8Ex2xJ4nLjqT6nf0ipa0UFJQCQLg==", "integrity": "sha512-vIXXu0rPlbd220r30SsAVduFlK2jCM2985pHQ/biVeVM7l+qXEIY+Qbr5H1Usx5jHnVCnpjULbRQKhByPeoHTA==",
"dependencies": { "dependencies": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",
"amazon-chime-sdk-js": "^3.14.0", "amazon-chime-sdk-js": "^3.14.0",
@ -3833,9 +3833,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.1.2", "version": "20.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz",
"integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==" "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q=="
}, },
"node_modules/@types/prop-types": { "node_modules/@types/prop-types": {
"version": "15.7.5", "version": "15.7.5",
@ -10895,9 +10895,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.82.0", "version": "5.82.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz",
"integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
@ -10909,7 +10909,7 @@
"acorn-import-assertions": "^1.7.6", "acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.13.0", "enhanced-resolve": "^5.14.0",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1", "eslint-scope": "5.1.1",
"events": "^3.2.0", "events": "^3.2.0",
@ -13995,9 +13995,9 @@
} }
}, },
"@dannadori/voice-changer-client-js": { "@dannadori/voice-changer-client-js": {
"version": "1.0.125", "version": "1.0.126",
"resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.125.tgz", "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.126.tgz",
"integrity": "sha512-15NC8JKXV/50Y4EPLOuYRbruUIm/uuvz9rFmwPhyomrfZYdp/+GrNMMRPe8Ex2xJ4nLjqT6nf0ipa0UFJQCQLg==", "integrity": "sha512-vIXXu0rPlbd220r30SsAVduFlK2jCM2985pHQ/biVeVM7l+qXEIY+Qbr5H1Usx5jHnVCnpjULbRQKhByPeoHTA==",
"requires": { "requires": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",
"amazon-chime-sdk-js": "^3.14.0", "amazon-chime-sdk-js": "^3.14.0",
@ -14542,9 +14542,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "20.1.2", "version": "20.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz",
"integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==" "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q=="
}, },
"@types/prop-types": { "@types/prop-types": {
"version": "15.7.5", "version": "15.7.5",
@ -19763,9 +19763,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "5.82.0", "version": "5.82.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz",
"integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
@ -19777,7 +19777,7 @@
"acorn-import-assertions": "^1.7.6", "acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.13.0", "enhanced-resolve": "^5.14.0",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1", "eslint-scope": "5.1.1",
"events": "^3.2.0", "events": "^3.2.0",

6
client/demo/package.json
View File

@ -24,7 +24,7 @@
"@babel/preset-env": "^7.21.5", "@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.18.6", "@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.5", "@babel/preset-typescript": "^7.21.5",
"@types/node": "^20.1.2", "@types/node": "^20.1.4",
"@types/react": "^18.2.6", "@types/react": "^18.2.6",
"@types/react-dom": "^18.2.4", "@types/react-dom": "^18.2.4",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -47,12 +47,12 @@
"ts-loader": "^9.4.2", "ts-loader": "^9.4.2",
"tsconfig-paths": "^4.2.0", "tsconfig-paths": "^4.2.0",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"webpack": "^5.82.0", "webpack": "^5.82.1",
"webpack-cli": "^5.1.1", "webpack-cli": "^5.1.1",
"webpack-dev-server": "^4.15.0" "webpack-dev-server": "^4.15.0"
}, },
"dependencies": { "dependencies": {
"@dannadori/voice-changer-client-js": "^1.0.125", "@dannadori/voice-changer-client-js": "^1.0.126",
"@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0",

8
client/demo/public/assets/gui_settings/DDSP-SVC.json
View File

@ -129,11 +129,15 @@
"options": {} "options": {}
}, },
{ {
"name": "diffEnablerRow", "name": "diffEnabler",
"options": {} "options": {}
}, },
{ {
"name": "diffSettingRow", "name": "diffMethod",
"options": {}
},
{
"name": "diffSetting",
"options": {} "options": {}
} }
], ],

7
client/demo/src/components/demo/002_ComponentGenerator.tsx
View File

@ -52,6 +52,7 @@ import { ModelSlotRow2, ModelSlotRow2Props } from "./components/301-h_ModelSlotR
import { DefaultTuneRow2, DefaultTuneRow2Props } from "./components/301-i_DefaultTuneRowv2" import { DefaultTuneRow2, DefaultTuneRow2Props } from "./components/301-i_DefaultTuneRowv2"
import { DiffEnablerRow, DiffEnablerRowProps } from "./components/611_DiffEnablerRow" import { DiffEnablerRow, DiffEnablerRowProps } from "./components/611_DiffEnablerRow"
import { DiffSettingRow, DiffSettingRowProps } from "./components/612_DiffSettingRow" import { DiffSettingRow, DiffSettingRowProps } from "./components/612_DiffSettingRow"
import { DiffMethodRow, DiffMethodRowProps } from "./components/613_DiffMethodRow"
export const catalog: { [key: string]: (props: any) => JSX.Element } = {} export const catalog: { [key: string]: (props: any) => JSX.Element } = {}
@ -114,8 +115,10 @@ const initialize = () => {
addToCatalog("noiseScale", (props: NoiseScaleRowProps) => { return <NoiseScaleRow {...props} /> }) addToCatalog("noiseScale", (props: NoiseScaleRowProps) => { return <NoiseScaleRow {...props} /> })
addToCatalog("silentThreshold", (props: SilentThresholdRowProps) => { return <SilentThresholdRow {...props} /> }) addToCatalog("silentThreshold", (props: SilentThresholdRowProps) => { return <SilentThresholdRow {...props} /> })
addToCatalog("indexRatio", (props: IndexRatioRowProps) => { return <IndexRatioRow {...props} /> }) addToCatalog("indexRatio", (props: IndexRatioRowProps) => { return <IndexRatioRow {...props} /> })
addToCatalog("diffEnablerRow", (props: DiffEnablerRowProps) => { return <DiffEnablerRow {...props} /> }) addToCatalog("diffEnabler", (props: DiffEnablerRowProps) => { return <DiffEnablerRow {...props} /> })
addToCatalog("diffSettingRow", (props: DiffSettingRowProps) => { return <DiffSettingRow {...props} /> }) addToCatalog("diffSetting", (props: DiffSettingRowProps) => { return <DiffSettingRow {...props} /> })
addToCatalog("diffMethod", (props: DiffMethodRowProps) => { return <DiffMethodRow {...props} /> })

2
client/demo/src/components/demo/components/602_DstIdRow.tsx
View File

@ -140,7 +140,7 @@ export const DstIdRow = (props: DstIdRowProps) => {
}}> }}>
<option key="unknown" value={0}>default(0)</option> <option key="unknown" value={0}>default(0)</option>
{ {
Object.keys(props.staticIds).map(x => { Object.values(props.staticIds).map(x => {
return <option key={x} value={x}>{x}</option> return <option key={x} value={x}>{x}</option>
}) })
} }

6
client/demo/src/components/demo/components/611_DiffEnablerRow.tsx
View File

@ -23,16 +23,12 @@ export const DiffEnablerRow = (_props: DiffEnablerRowProps) => {
appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, useDiff: e.target.checked ? 1 : 0 }) appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, useDiff: e.target.checked ? 1 : 0 })
}} /> Diff }} /> Diff
</div> </div>
<div>
<input type="checkbox" checked={appState.serverSetting.serverSetting.useDiffDpm == 1} onChange={(e) => {
appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, useDiffDpm: e.target.checked ? 1 : 0 })
}} /> DiffDpm
</div>
<div> <div>
<input type="checkbox" checked={appState.serverSetting.serverSetting.useDiffSilence == 1} onChange={(e) => { <input type="checkbox" checked={appState.serverSetting.serverSetting.useDiffSilence == 1} onChange={(e) => {
appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, useDiffSilence: e.target.checked ? 1 : 0 }) appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, useDiffSilence: e.target.checked ? 1 : 0 })
}} /> Silence }} /> Silence
</div> </div>
<div></div>
</div> </div>
) )
}, [ }, [

41
client/demo/src/components/demo/components/613_DiffMethodRow.tsx Normal file
View File

@ -0,0 +1,41 @@
import React, { useMemo } from "react"
import { useAppState } from "../../../001_provider/001_AppStateProvider"
import { DiffMethod } from "@dannadori/voice-changer-client-js"
export type DiffMethodRowProps = {
}
export const DiffMethodRow = (_props: DiffMethodRowProps) => {
const appState = useAppState()
const diffMethodRow = useMemo(() => {
const onDiffMethodChanged = (val: DiffMethod) => {
appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, diffMethod: val })
}
return (
<div className="body-row split-3-7 left-padding-1 guided">
<div className="body-item-title left-padding-1">Diff Method</div>
<div className="body-select-container">
<select className="body-select" value={appState.serverSetting.serverSetting.diffMethod} onChange={(e) => {
onDiffMethodChanged(e.target.value as DiffMethod)
}}>
{
Object.values(DiffMethod).map(x => {
return <option key={x} value={x}>{x}</option>
})
}
</select>
</div>
</div>
)
}, [
appState.serverSetting.serverSetting,
appState.serverSetting.updateServerSettings
])
return diffMethodRow
}

50
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.125", "version": "1.0.126",
"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.125", "version": "1.0.126",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@types/readable-stream": "^2.3.15", "@types/readable-stream": "^2.3.15",
@ -18,8 +18,8 @@
"socket.io-client": "^4.6.1" "socket.io-client": "^4.6.1"
}, },
"devDependencies": { "devDependencies": {
"@types/audioworklet": "^0.0.45", "@types/audioworklet": "^0.0.46",
"@types/node": "^20.1.1", "@types/node": "^20.1.4",
"@types/react": "18.2.6", "@types/react": "18.2.6",
"@types/react-dom": "18.2.4", "@types/react-dom": "18.2.4",
"eslint": "^8.40.0", "eslint": "^8.40.0",
@ -33,7 +33,7 @@
"rimraf": "^5.0.0", "rimraf": "^5.0.0",
"ts-loader": "^9.4.2", "ts-loader": "^9.4.2",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"webpack": "^5.82.0", "webpack": "^5.82.1",
"webpack-cli": "^5.1.1", "webpack-cli": "^5.1.1",
"webpack-dev-server": "^4.15.0" "webpack-dev-server": "^4.15.0"
} }
@ -1734,9 +1734,9 @@
"integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
}, },
"node_modules/@types/audioworklet": { "node_modules/@types/audioworklet": {
"version": "0.0.45", "version": "0.0.46",
"resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.45.tgz", "resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.46.tgz",
"integrity": "sha512-QAM4HjbbcdBSsteolSQvX3TL6gRNBZ08rL3ks1++uHgFGq3fGMlQYIRBB2g+kMKhvTfer1pMvTcdOnTOJcaeBg==", "integrity": "sha512-LWJ9gC7sTsV/r8Vud0+WChc18tSHtYzr0/z4IFVtDuCQ2nsDxWM5yUNsVIN64F5foipNzGTHq3GmnyLhosJ9Fw==",
"dev": true "dev": true
}, },
"node_modules/@types/body-parser": { "node_modules/@types/body-parser": {
@ -1878,9 +1878,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.1.2", "version": "20.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz",
"integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==" "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q=="
}, },
"node_modules/@types/prop-types": { "node_modules/@types/prop-types": {
"version": "15.7.5", "version": "15.7.5",
@ -7596,9 +7596,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.82.0", "version": "5.82.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz",
"integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
@ -7610,7 +7610,7 @@
"acorn-import-assertions": "^1.7.6", "acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.13.0", "enhanced-resolve": "^5.14.0",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1", "eslint-scope": "5.1.1",
"events": "^3.2.0", "events": "^3.2.0",
@ -9726,9 +9726,9 @@
"integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
}, },
"@types/audioworklet": { "@types/audioworklet": {
"version": "0.0.45", "version": "0.0.46",
"resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.45.tgz", "resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.46.tgz",
"integrity": "sha512-QAM4HjbbcdBSsteolSQvX3TL6gRNBZ08rL3ks1++uHgFGq3fGMlQYIRBB2g+kMKhvTfer1pMvTcdOnTOJcaeBg==", "integrity": "sha512-LWJ9gC7sTsV/r8Vud0+WChc18tSHtYzr0/z4IFVtDuCQ2nsDxWM5yUNsVIN64F5foipNzGTHq3GmnyLhosJ9Fw==",
"dev": true "dev": true
}, },
"@types/body-parser": { "@types/body-parser": {
@ -9870,9 +9870,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "20.1.2", "version": "20.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz",
"integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==" "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q=="
}, },
"@types/prop-types": { "@types/prop-types": {
"version": "15.7.5", "version": "15.7.5",
@ -14116,9 +14116,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "5.82.0", "version": "5.82.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz",
"integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
@ -14130,7 +14130,7 @@
"acorn-import-assertions": "^1.7.6", "acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.13.0", "enhanced-resolve": "^5.14.0",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1", "eslint-scope": "5.1.1",
"events": "^3.2.0", "events": "^3.2.0",

8
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.125", "version": "1.0.126",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"directories": { "directories": {
@ -26,8 +26,8 @@
"author": "wataru.okada@flect.co.jp", "author": "wataru.okada@flect.co.jp",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@types/audioworklet": "^0.0.45", "@types/audioworklet": "^0.0.46",
"@types/node": "^20.1.1", "@types/node": "^20.1.4",
"@types/react": "18.2.6", "@types/react": "18.2.6",
"@types/react-dom": "18.2.4", "@types/react-dom": "18.2.4",
"eslint": "^8.40.0", "eslint": "^8.40.0",
@ -41,7 +41,7 @@
"rimraf": "^5.0.0", "rimraf": "^5.0.0",
"ts-loader": "^9.4.2", "ts-loader": "^9.4.2",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"webpack": "^5.82.0", "webpack": "^5.82.1",
"webpack-cli": "^5.1.1", "webpack-cli": "^5.1.1",
"webpack-dev-server": "^4.15.0" "webpack-dev-server": "^4.15.0"
}, },

2
client/lib/src/VoiceChangerWorkletNode.ts
View File

@ -78,7 +78,7 @@ export class VoiceChangerWorkletNode extends AudioWorkletNode {
console.log(`[SIO] ${this.socket?.id}`) console.log(`[SIO] ${this.socket?.id}`)
}); });
this.socket.on('response', (response: any[]) => { this.socket.on('response', (response: any[]) => {
console.log("response:", response) // console.log("response:", response)
const cur = Date.now() const cur = Date.now()
const responseTime = cur - response[0] const responseTime = cur - response[0]
const result = response[1] as ArrayBuffer const result = response[1] as ArrayBuffer

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

@ -64,6 +64,11 @@ export const F0Detector = {
} as const } as const
export type F0Detector = typeof F0Detector[keyof typeof F0Detector] export type F0Detector = typeof F0Detector[keyof typeof F0Detector]
export const DiffMethod = {
"pndm": "pndm",
"dpm-solver": "dpm-solver",
} as const
export type DiffMethod = typeof DiffMethod[keyof typeof DiffMethod]
export const ServerSettingKey = { export const ServerSettingKey = {
@ -107,7 +112,8 @@ export const ServerSettingKey = {
"useEnhancer": "useEnhancer", "useEnhancer": "useEnhancer",
"useDiff": "useDiff", "useDiff": "useDiff",
"useDiffDpm": "useDiffDpm", // "useDiffDpm": "useDiffDpm",
"diffMethod": "diffMethod",
"useDiffSilence": "useDiffSilence", "useDiffSilence": "useDiffSilence",
"diffAcc": "diffAcc", "diffAcc": "diffAcc",
"diffSpkId": "diffSpkId", "diffSpkId": "diffSpkId",
@ -162,7 +168,8 @@ export type VoiceChangerServerSetting = {
useEnhancer: number// DDSP-SVC useEnhancer: number// DDSP-SVC
useDiff: number// DDSP-SVC useDiff: number// DDSP-SVC
useDiffDpm: number// DDSP-SVC // useDiffDpm: number// DDSP-SVC
diffMethod: DiffMethod, // DDSP-SVC
useDiffSilence: number// DDSP-SVC useDiffSilence: number// DDSP-SVC
diffAcc: number// DDSP-SVC diffAcc: number// DDSP-SVC
diffSpkId: number// DDSP-SVC diffSpkId: number// DDSP-SVC
@ -256,7 +263,7 @@ export const DefaultServerSetting: ServerInfo = {
useEnhancer: 0, useEnhancer: 0,
useDiff: 1, useDiff: 1,
useDiffDpm: 0, diffMethod: "dpm-solver",
useDiffSilence: 0, useDiffSilence: 0,
diffAcc: 20, diffAcc: 20,
diffSpkId: 1, diffSpkId: 1,

3
server/voice_changer/DDSP_SVC/DDSP_SVC.py
View File

@ -193,7 +193,8 @@ class DDSP_SVC:
diff_acc=self.settings.diffAcc, # TBD なにこれ？ diff_acc=self.settings.diffAcc, # TBD なにこれ？
diff_spk_id=self.settings.diffSpkId, diff_spk_id=self.settings.diffSpkId,
diff_use=True if self.settings.useDiff == 1 else False, diff_use=True if self.settings.useDiff == 1 else False,
diff_use_dpm=True if self.settings.useDiffDpm == 1 else False, # TBD なにこれ？ # diff_use_dpm=True if self.settings.useDiffDpm == 1 else False, # TBD なにこれ？
method=self.settings.diffMethod,
k_step=self.settings.kStep, # TBD なにこれ？ k_step=self.settings.kStep, # TBD なにこれ？
diff_silence=True diff_silence=True
if self.settings.useDiffSilence == 1 if self.settings.useDiffSilence == 1

7
server/voice_changer/DDSP_SVC/DDSP_SVCSetting.py
View File

@ -15,7 +15,8 @@ class DDSP_SVCSettings:
useEnhancer: int = 0 useEnhancer: int = 0
useDiff: int = 1 useDiff: int = 1
useDiffDpm: int = 0 # useDiffDpm: int = 0
diffMethod: str = "dpm-solver" # "pndm", "dpm-solver"
useDiffSilence: int = 0 useDiffSilence: int = 0
diffAcc: int = 20 diffAcc: int = 20
diffSpkId: int = 1 diffSpkId: int = 1
@ -38,11 +39,11 @@ class DDSP_SVCSettings:
"extraConvertSize", "extraConvertSize",
"useEnhancer", "useEnhancer",
"useDiff", "useDiff",
"useDiffDpm", # "useDiffDpm",
"useDiffSilence", "useDiffSilence",
"diffAcc", "diffAcc",
"diffSpkId", "diffSpkId",
"kStep", "kStep",
] ]
floatData = ["silentThreshold"] floatData = ["silentThreshold"]
strData = ["framework", "f0Detector"] strData = ["framework", "f0Detector", "diffMethod"]

6
server/voice_changer/DDSP_SVC/SvcDDSP.py
View File

@ -108,7 +108,8 @@ class SvcDDSP:
diff_acc=None, diff_acc=None,
diff_spk_id=None, diff_spk_id=None,
diff_use=False, diff_use=False,
diff_use_dpm=False, # diff_use_dpm=False,
method="pndm",
k_step=None, k_step=None,
diff_silence=False, diff_silence=False,
audio_alignment=False, audio_alignment=False,
@ -177,7 +178,8 @@ class SvcDDSP:
acc=diff_acc, acc=diff_acc,
spk_id=diff_spk_id, spk_id=diff_spk_id,
k_step=k_step, k_step=k_step,
use_dpm=diff_use_dpm, # use_dpm=diff_use_dpm,
method=method,
silence_front=silence_front, silence_front=silence_front,
use_silence=diff_silence, use_silence=diff_silence,
spk_mix_dict=dictionary, spk_mix_dict=dictionary,