Skip to content

增加macos支持，增加mac版ffmpeg，以及配置调用路径，自动判断是否为win #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haol666 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

增加macos支持，增加mac版ffmpeg，以及配置调用路径，自动判断是否为win #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d84080
增加macos支持，增加mac版ffmpeg，以及配置调用路径，自动判断是否为win
Mar 8, 2025
166c463
Merge branch 'GuijiAI:main' into mac
haol666 Mar 8, 2025
79d986d
Merge branch 'GuijiAI:main' into mac
haol666 Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added resources/ffmpeg/bin/ffmpeg
View file
Open in desktop
Binary file not shown.
Binary file added resources/ffmpeg/bin/ffprobe
View file
Open in desktop
Binary file not shown.
22 changes: 16 additions & 6 deletions src/main/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
import path from 'path'
import os from 'os'

const isDev = process.env.NODE_ENV === 'development'
const isWin = process.platform === 'win32'

export const serviceUrl = {
face2face: isDev ? 'http://192.168.4.204:8383/easy' : 'http://127.0.0.1:8383/easy',
tts: isDev ? 'http://192.168.4.204:18180' : 'http://127.0.0.1:18180'
}

export const assetPath = {
model: path.join('D:','heygem_data', 'face2face', 'temp'), // 模特视频
ttsProduct: path.join('D:','heygem_data', 'face2face', 'temp'), // TTS 产物
ttsRoot: path.join('D:','heygem_data', 'voice', 'data'), // TTS服务根目录
ttsTrain: path.join('D:','heygem_data', 'voice', 'data','origin_audio') // TTS 训练产物
}
// 根据操作系统选择不同的路径
export const assetPath = isWin
? {
model: path.join('D:', 'heygem_data', 'face2face', 'temp'), // 模特视频
ttsProduct: path.join('D:', 'heygem_data', 'face2face', 'temp'), // TTS 产物
ttsRoot: path.join('D:', 'heygem_data', 'voice', 'data'), // TTS服务根目录
ttsTrain: path.join('D:', 'heygem_data', 'voice', 'data', 'origin_audio') // TTS 训练产物
}
: {
model: path.join(os.homedir(), 'heygem_data', 'face2face', 'temp'), // 模特视频
ttsProduct: path.join(os.homedir(), 'heygem_data', 'face2face', 'temp'), // TTS 产物
ttsRoot: path.join(os.homedir(), 'heygem_data', 'voice', 'data'), // TTS服务根目录
ttsTrain: path.join(os.homedir(), 'heygem_data', 'voice', 'data', 'origin_audio') // TTS 训练产物
}
65 changes: 45 additions & 20 deletions src/main/util/ffmpeg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,54 @@ import log from '../logger.js'

const ffmpegPathValue =
process.env.NODE_ENV === 'development'
? path.join(__dirname, '../../resources/ffmpeg/bin/ffmpeg.exe')
: path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffmpeg.exe'
)
log.info('FFmpeg path:', ffmpegPathValue)
ffmpeg.setFfmpegPath(ffmpegPathValue)
? process.platform === 'win32'
? path.join(__dirname, '../../resources/ffmpeg/bin/ffmpeg.exe')
: path.join(__dirname, '../../resources/ffmpeg/bin/ffmpeg')
: process.platform === 'win32'
? path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffmpeg.exe'
)
: path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffmpeg'
)

// 恢复ffprobePathValue定义
const ffprobePathValue =
process.env.NODE_ENV === 'development'
? path.join(__dirname, '../../resources/ffmpeg/bin/ffprobe.exe')
: path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffprobe.exe'
)
? process.platform === 'win32'
? path.join(__dirname, '../../resources/ffmpeg/bin/ffprobe.exe')
: path.join(__dirname, '../../resources/ffmpeg/bin/ffprobe')
: process.platform === 'win32'
? path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffprobe.exe'
)
: path.join(
process.resourcesPath,
'app.asar.unpacked',
'resources',
'ffmpeg',
'bin',
'ffprobe'
)

log.info('FFmpeg path:', ffmpegPathValue)
ffmpeg.setFfmpegPath(ffmpegPathValue)

log.info('FFprobe path:', ffprobePathValue)
ffmpeg.setFfprobePath(ffprobePathValue)

Expand Down