diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index 74b20b9..c4c2639 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -2618,8 +2618,10 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) // Opus 编码器和累积缓冲区 COpusEncoder opusEncoder; BOOL opusInitialized = FALSE; + int opusChannels = 0; // 编码器当前声道数(设备切换后可能变化) + BOOL warnedUnsupportedRate = FALSE; const int OPUS_FRAME_SIZE = 960; // 20ms @ 48kHz - short* pOpusAccumBuffer = new short[OPUS_FRAME_SIZE * 2]; // 立体声 + short* pOpusAccumBuffer = new short[OPUS_FRAME_SIZE * 2]; // 最多立体声 int nAccumSamples = 0; // 已累积的样本数(每声道) BYTE* pOpusOutBuffer = new BYTE[4000]; // Opus 输出缓冲区 Mprintf("音频线程启动 (Opus 压缩启用)\n"); @@ -2670,7 +2672,14 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) WAVEFORMATEX* pWaveFmt = (WAVEFORMATEX*)pThis->m_pWaveFormat; if (numFramesAvailable > 0 && pWaveFmt) { UINT32 numChannels = pWaveFmt->nChannels; - UINT32 numSamples = numFramesAvailable * numChannels; + // pPcmBuffer 只有 MAX_BUFFER/2 个 16-bit 样本。设备休眠/长时间静音后 + // WASAPI 一次可能返回一个很大的包(整段静音),超过容量就要截断, + // 否则下面的 memset/memcpy 会写爆缓冲区、累积循环会读到堆外。 + UINT32 framesAvail = numFramesAvailable; + if (numChannels > 0 && framesAvail > (UINT32)(MAX_BUFFER / 2) / numChannels) { + framesAvail = ((UINT32)(MAX_BUFFER / 2)) / numChannels; + } + UINT32 numSamples = framesAvail * numChannels; // 判断源格式(使用精确的 SubFormat GUID 检测) BOOL isFloat = IsFloatFormat(pWaveFmt); @@ -2708,27 +2717,62 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) #if USING_OPUS // ===== Opus 编码模式 ===== - // 初始化 Opus 编码器 - if (!opusInitialized && pWaveFmt->nSamplesPerSec == 48000) { - if (opusEncoder.Init(48000, numChannels, 64000)) { - opusInitialized = TRUE; - Mprintf("Opus 编码器初始化成功: 48000 Hz, %d ch, 64 kbps\n", numChannels); + // Opus 只接受 mono/stereo。多声道设备(如 5.1)如果按原声道数拷贝, + // 会写爆 pOpusAccumBuffer(只按立体声分配),且主控解码出来也是噪声。 + int encChannels = numChannels > 2 ? 2 : (int)numChannels; + + // 设备休眠唤醒/默认端点变化会换掉混音格式。编码器必须跟着重建, + // 并重新下发格式包 —— 否则主控仍按旧声道数解码,表现为没声音。 + // 端点采样率变了(48kHz -> 44.1kHz 等):固定 48kHz 的编码器不能继续用, + // 否则主控仍按 48kHz 播放,声音会变调/变速。销毁后走下面的"不支持"分支。 + if (opusInitialized && pWaveFmt->nSamplesPerSec != 48000) { + opusEncoder.Destroy(); + opusInitialized = FALSE; + nAccumSamples = 0; + } + if (pWaveFmt->nSamplesPerSec == 48000 && + (!opusInitialized || opusChannels != encChannels)) { + if (opusInitialized) { + opusEncoder.Destroy(); + opusInitialized = FALSE; } + if (opusEncoder.Init(48000, encChannels, 64000)) { + opusInitialized = TRUE; + opusChannels = encChannels; + firstFrame = TRUE; // 让主控按新格式重建解码器/播放设备 + nAccumSamples = 0; + Mprintf("Opus 编码器初始化成功: 48000 Hz, %d ch, 64 kbps\n", encChannels); + } + } + if (!opusInitialized && pWaveFmt->nSamplesPerSec != 48000 && !warnedUnsupportedRate) { + warnedUnsupportedRate = TRUE; + // 非 48kHz 端点当前没有重采样,Opus 无法编码:明确记录,别静默无声 + Mprintf("音频端点采样率 %u Hz 不受支持(需 48000),该端点期间无音频\n", + pWaveFmt->nSamplesPerSec); } if (opusInitialized) { // 累积样本到 Opus 帧缓冲区 - int frameSamples = numFramesAvailable; // 每声道样本数 int srcOffset = 0; - while (srcOffset < (int)numFramesAvailable) { + while (srcOffset < (int)framesAvail) { // 计算可以复制的样本数 - int toCopy = min((int)numFramesAvailable - srcOffset, OPUS_FRAME_SIZE - nAccumSamples); + int toCopy = min((int)framesAvail - srcOffset, OPUS_FRAME_SIZE - nAccumSamples); - // 复制到累积缓冲区 - memcpy(pOpusAccumBuffer + nAccumSamples * numChannels, - pConvertedPcm + srcOffset * numChannels, - toCopy * numChannels * sizeof(short)); + if (encChannels == (int)numChannels) { + memcpy(pOpusAccumBuffer + nAccumSamples * encChannels, + pConvertedPcm + srcOffset * numChannels, + toCopy * encChannels * sizeof(short)); + } else { + // 多声道设备只取前两个声道(左右) + const short* src = pConvertedPcm + srcOffset * numChannels; + short* dst = pOpusAccumBuffer + nAccumSamples * encChannels; + for (int s = 0; s < toCopy; ++s) { + for (int c = 0; c < encChannels; ++c) { + *dst++ = src[s * numChannels + c]; + } + } + } nAccumSamples += toCopy; srcOffset += toCopy; @@ -2744,10 +2788,10 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) if (firstFrame) { pSendBuffer[offset++] = 1; // hasFormat = true AudioFormat fmt; - fmt.channels = (WORD)numChannels; + fmt.channels = (WORD)encChannels; fmt.sampleRate = pWaveFmt->nSamplesPerSec; fmt.bitsPerSample = 16; - fmt.blockAlign = (WORD)(numChannels * 2); + fmt.blockAlign = (WORD)(encChannels * 2); fmt.compression = AUDIO_COMPRESS_OPUS; fmt.reserved = 0; memcpy(pSendBuffer + offset, &fmt, sizeof(AudioFormat)); diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index 748101b..69f7fe4 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -609,6 +609,8 @@ BEGIN_MESSAGE_MAP(CScreenSpyDlg, CDialog) ON_COMMAND(ID_HIDE_STATUS_INFO, &CScreenSpyDlg::OnHideStatusInfo) ON_MESSAGE(WM_DISCONNECT, &CScreenSpyDlg::OnDisconnect) ON_MESSAGE(MM_WOM_DONE, &CScreenSpyDlg::OnWaveOutDone) + ON_MESSAGE(MM_WOM_CLOSE, &CScreenSpyDlg::OnWaveOutClose) + ON_MESSAGE(WM_AUDIO_INIT_DEVICE, &CScreenSpyDlg::OnAudioInitDevice) ON_MESSAGE(WM_RECVFILEV2_CHUNK, &CScreenSpyDlg::OnRecvFileV2Chunk) ON_MESSAGE(WM_RECVFILEV2_COMPLETE, &CScreenSpyDlg::OnRecvFileV2Complete) ON_MESSAGE(WM_AUDIO_TOGGLE_FROM_WEB, &CScreenSpyDlg::OnAudioToggleFromWeb) @@ -4149,9 +4151,10 @@ void CScreenSpyDlg::SendAudioCtrl(BYTE enable, BYTE persist) #include "../../compress/opus/opus_wrapper.h" #endif -BOOL CScreenSpyDlg::InitAudioPlayback(const AudioFormat* fmt) +BOOL CScreenSpyDlg::InitAudioPlaybackLocked(const AudioFormat* fmt) { if (m_bAudioPlaying) return TRUE; + m_nLastAudioInitTick = GetTickCount64(); // 保存压缩类型 m_nAudioCompression = fmt->compression; @@ -4170,17 +4173,40 @@ BOOL CScreenSpyDlg::InitAudioPlayback(const AudioFormat* fmt) MMRESULT result = waveOutOpen(&m_hWaveOut, WAVE_MAPPER, &m_AudioFormat, (DWORD_PTR)m_hWnd, 0, CALLBACK_WINDOW); if (result != MMSYSERR_NOERROR) { - Mprintf("[ScreenSpy] waveOutOpen 失败: %d\n", result); + // 主控没有输出设备时会每 2 秒重试一次,日志按分钟节流,避免刷屏 + ULONGLONG now = GetTickCount64(); + if (now - m_nLastAudioErrLog >= 60000) { + m_nLastAudioErrLog = now; + Mprintf("[ScreenSpy] waveOutOpen 失败: %d\n", result); + } return FALSE; } // 分配 waveOut 缓冲区 - for (int i = 0; i < AUDIO_BUFFER_COUNT; i++) { + BOOL prepareFailed = FALSE; + for (int i = 0; i < AUDIO_BUFFER_COUNT && !prepareFailed; i++) { m_pAudioBuf[i] = new BYTE[AUDIO_BUF_SIZE]; memset(&m_WaveHdr[i], 0, sizeof(WAVEHDR)); m_WaveHdr[i].lpData = (LPSTR)m_pAudioBuf[i]; m_WaveHdr[i].dwBufferLength = AUDIO_BUF_SIZE; - waveOutPrepareHeader(m_hWaveOut, &m_WaveHdr[i], sizeof(WAVEHDR)); + if (waveOutPrepareHeader(m_hWaveOut, &m_WaveHdr[i], sizeof(WAVEHDR)) != MMSYSERR_NOERROR) { + prepareFailed = TRUE; + } + } + if (prepareFailed) { + // 准备失败的句柄之后每次 waveOutWrite 都会失败,重建也救不回来, + // 只会在 UI 线程上反复开关设备。这里直接放弃,交给 2 秒重试。 + Mprintf("[ScreenSpy] waveOutPrepareHeader 失败,关闭设备稍后重试\n"); + for (int i = 0; i < AUDIO_BUFFER_COUNT; i++) { + if (m_pAudioBuf[i] && (m_WaveHdr[i].dwFlags & WHDR_PREPARED)) { + waveOutUnprepareHeader(m_hWaveOut, &m_WaveHdr[i], sizeof(WAVEHDR)); + } + delete[] m_pAudioBuf[i]; + m_pAudioBuf[i] = nullptr; + } + waveOutClose(m_hWaveOut); + m_hWaveOut = NULL; + return FALSE; } // 分配环形缓冲区 @@ -4212,6 +4238,14 @@ BOOL CScreenSpyDlg::InitAudioPlayback(const AudioFormat* fmt) void CScreenSpyDlg::StopAudioPlayback() { + std::lock_guard lock(m_AudioMutex); + StopAudioPlaybackLocked(); +} + +void CScreenSpyDlg::StopAudioPlaybackLocked() +{ + // 作废排队中的重建请求,避免停用后又被拉起来(未播放时也要清) + m_bAudioInitPending = FALSE; if (!m_bAudioPlaying) return; m_bAudioPlaying = FALSE; @@ -4330,14 +4364,32 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) BYTE hasFormat = pData[0]; UINT32 offset = 1; - // 如果带有格式信息,初始化播放 + // 串行化:本函数在 IOCP worker 线程执行,OnWaveOutDone 在 UI 线程执行, + // 两者都会改写环形缓冲区与 WAVEHDR(详见 m_AudioMutex 的注释)。 + // 网页转发在锁外做:SendAudioToWeb 是阻塞 socket 写,不能压在 m_AudioMutex 上。 + BYTE* pWireData = nullptr; + UINT32 wireLen = 0; + WAVEFORMATEX fmtForWeb = {}; + BYTE compForWeb = 0; + std::unique_lock lock(m_AudioMutex); + + // 如果带有格式信息,记录格式并请求 UI 线程打开/重建播放设备 if (hasFormat && len >= 1 + sizeof(AudioFormat)) { AudioFormat* fmt = (AudioFormat*)(pData + 1); - if (!m_bAudioPlaying) { - InitAudioPlayback(fmt); - } + BOOL formatChanged = !m_bHasAudioFormat || + memcmp(fmt, &m_LastAudioFormat, sizeof(AudioFormat)) != 0; + m_LastAudioFormat = *fmt; + m_bHasAudioFormat = TRUE; offset = 1 + sizeof(AudioFormat); + // 设备的打开/重建一律交给 UI 线程(见 OnAudioInitDevice 的说明) + if (formatChanged && m_bAudioPlaying) { + Mprintf("[Audio] 音频格式变化,重建播放设备\n"); + } + if (formatChanged || !m_bAudioPlaying) { + RequestAudioRebuildLocked(); + } + // 检测到音频数据,更新菜单状态 if (!m_Settings.AudioEnabled) { m_Settings.AudioEnabled = TRUE; @@ -4348,7 +4400,19 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) } } - if (!m_bAudioPlaying || !m_hWaveOut || !m_pRingBuf) return; + // 播放设备未就绪:首包格式包丢失、或 waveOutOpen 因设备休眠/被独占而一时失败。 + // 有缓存格式就定期请 UI 线程重试,否则整场会话无声,只能关掉重开远程桌面。 + // 只在音频处于启用状态时重试,避免用户关掉后又被残留包拉起来。 + if (!m_bAudioPlaying) { + if (m_Settings.AudioEnabled && m_bHasAudioFormat && + GetTickCount64() - m_nLastAudioInitTick >= 2000) { + RequestAudioRebuildLocked(); + } + return; + } + // 设备即将重建:旧格式的数据丢掉,等 UI 线程把新设备开好 + if (m_bAudioInitPending) return; + if (!m_hWaveOut || !m_pRingBuf) return; // 获取音频数据 BYTE* pAudioData = pData + offset; @@ -4359,9 +4423,9 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) // 这就是要透传给 web 的数据 —— web 端用 MSE+WebM 直接播 Opus, // 不需要服务器解码后再发 PCM。本地 waveOut 仍然需要 PCM,因此下面 // 还是会解码一遍。 - BYTE* pWireData = pAudioData; - UINT32 wireLen = audioLen; - BYTE wireCompression = (BYTE)m_nAudioCompression; + pWireData = pAudioData; + wireLen = audioLen; + compForWeb = (BYTE)m_nAudioCompression; // 帧对齐参数 DWORD blockAlign = m_AudioFormat.nBlockAlign; @@ -4386,6 +4450,7 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) if (audioLen == 0) return; // 检查环形缓冲区是否有足够空间 + SanitizeRingBufferLocked(); DWORD freeSpace = RING_BUF_SIZE - m_nRingDataLen; if (audioLen > freeSpace) { // 缓冲区满了,丢弃新数据(避免打断正在播放的音频) @@ -4411,11 +4476,14 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) Mprintf("[Audio] 预缓冲完成,开始播放 (缓冲: %u bytes)\n", m_nRingDataLen); } - // 发送上线格式(Opus 压缩包 / 或原始 PCM)到网页 - SendAudioToWeb(pWireData, wireLen, &m_AudioFormat, wireCompression); + // 填充可用的 waveOut 缓冲区(已持有 m_AudioMutex) + fmtForWeb = m_AudioFormat; + FeedAudioBuffersLocked(); + lock.unlock(); - // 填充可用的 waveOut 缓冲区 - FeedAudioBuffers(); + // 发送上线格式(Opus 压缩包 / 或原始 PCM)到网页。 + // 放在锁外:SendAudioToWeb 内部是阻塞 socket 写,慢客户端会卡住锁持有者。 + SendAudioToWeb(pWireData, wireLen, &fmtForWeb, compForWeb); } void CScreenSpyDlg::SendAudioToWeb(const BYTE* pAudioData, UINT32 len, const WAVEFORMATEX* pFormat, BYTE compression) @@ -4509,9 +4577,12 @@ void CScreenSpyDlg::SendAudioToWeb(const BYTE* pAudioData, UINT32 len, const WAV WebService().BroadcastH264Frame(deviceID, frame.data(), frame.size()); } -void CScreenSpyDlg::FeedAudioBuffers() +void CScreenSpyDlg::FeedAudioBuffersLocked() { - if (!m_bAudioPlaying || !m_hWaveOut || !m_pRingBuf) return; + if (!m_bAudioPlaying || m_bAudioInitPending || !m_hWaveOut || !m_pRingBuf) return; + + // 防御:旧版本的数据竞争可能让计数下溢,此时缓冲"永远有数据",会一直播陈旧内容 + SanitizeRingBufferLocked(); // 帧对齐参数 DWORD blockAlign = m_AudioFormat.nBlockAlign; @@ -4546,7 +4617,20 @@ void CScreenSpyDlg::FeedAudioBuffers() pHdr->dwBufferLength = readLen; MMRESULT mr = waveOutWrite(m_hWaveOut, pHdr, sizeof(WAVEHDR)); if (mr != MMSYSERR_NOERROR) { - Mprintf("[Audio] waveOutWrite 失败: %d\n", mr); + // 旧代码只打印后继续用同一个句柄写:设备休眠/被移除后句柄永久失效, + // 整场会话再无声音,只能关掉重开远程桌面。现在请 UI 线程重建播放设备 + // (worker 线程持锁调用 waveOutReset/Close 会和 UI 线程互相等死)。 + // 重建按 2 秒节流:句柄彻底坏掉时每次写都会失败,不节流就会每 20ms + // 开关一次设备,把 UI 线程拖死。 + ULONGLONG now = GetTickCount64(); + if (now - m_nLastAudioErrLog >= 60000) { + m_nLastAudioErrLog = now; + Mprintf("[Audio] waveOutWrite 失败: %d,稍后重建播放设备\n", mr); + } + if (now - m_nLastAudioInitTick >= 2000) { + RequestAudioRebuildLocked(); + } + return; } } @@ -4557,11 +4641,77 @@ void CScreenSpyDlg::FeedAudioBuffers() } } -LRESULT CScreenSpyDlg::OnWaveOutDone(WPARAM wParam, LPARAM lParam) +void CScreenSpyDlg::RequestAudioRebuildLocked() { - // waveOut 缓冲区播放完成,尝试填充更多数据 - if (m_bAudioPlaying && m_nRingDataLen > 0) { - FeedAudioBuffers(); + if (m_bAudioInitPending) return; + m_bAudioInitPending = TRUE; + // 对话框销毁过程中 PostMessage 会失败。不把这个标志回滚,后面每个音频包都会 + // 在 `if (m_bAudioInitPending)` 处被丢弃,本场会话再无声音,也没有重试机会。 + if (!PostMessage(WM_AUDIO_INIT_DEVICE)) { + m_bAudioInitPending = FALSE; + } +} + +void CScreenSpyDlg::SanitizeRingBufferLocked() +{ + if (m_nRingDataLen > RING_BUF_SIZE) { + Mprintf("[Audio] 环形缓冲计数异常(%u),重置\n", m_nRingDataLen); + m_nRingHead = m_nRingTail = m_nRingDataLen = 0; + m_nPrebufferCount = 0; + } +} + +LRESULT CScreenSpyDlg::OnAudioInitDevice(WPARAM, LPARAM) +{ + // waveOutOpen/Reset/Close 会同步派发 MM_WOM_* 到本窗口,必须在窗口所属线程执行: + // 若由 worker 线程持着 m_AudioMutex 调用,而 UI 线程恰好正等这把锁(例如用户 + // 手动关音频),两边互等就是硬死锁。因此 worker 线程只登记请求 + PostMessage, + // 真正的开关设备都在这里做。 + std::lock_guard lock(m_AudioMutex); + if (!m_bAudioInitPending) return 0; // 已被 Stop/其它路径作废 + m_bAudioInitPending = FALSE; + if (!m_bHasAudioFormat) return 0; + + if (m_bAudioPlaying) { + StopAudioPlaybackLocked(); + } + InitAudioPlaybackLocked(&m_LastAudioFormat); + return 0; +} + +LRESULT CScreenSpyDlg::OnWaveOutClose(WPARAM wParam, LPARAM wParamUnused) +{ + // 设备被移除/切换(显示器休眠、默认输出端点变化等)时,系统会关闭 waveOut 句柄 + // 并派发 MM_WOM_CLOSE。旧代码忽略该消息:句柄失效后 waveOutWrite 可能仍返回成功, + // 整场会话就是无声的,只能关掉重开远程桌面。这里按新默认设备重建。 + std::lock_guard lock(m_AudioMutex); + + // 只处理当前句柄的通知;自身 Stop/重开过程中产生的陈旧通知(wParam 是旧句柄)忽略 + if (!m_bAudioPlaying || (HWAVEOUT)wParam != m_hWaveOut) return 0; + + // 自己 waveOutClose 时的 MM_WOM_CLOSE 是异步投递的,可能在我们重开设备之后才到达; + // 若 winmm 复用了同一个句柄值,就会和真实设备移除无法区分,进而无限「关-开」循环。 + // 刚打开的设备不会立刻被系统移除,忽略这个时间窗内的通知。 + if (GetTickCount64() - m_nLastAudioInitTick < 1000) return 0; + + Mprintf("[Audio] 音频设备已关闭(设备移除/切换),重建播放设备\n"); + StopAudioPlaybackLocked(); + if (m_bHasAudioFormat) { + InitAudioPlaybackLocked(&m_LastAudioFormat); + } + return 0; +} + +LRESULT CScreenSpyDlg::OnWaveOutDone(WPARAM wParam, LPARAM lParam) +{ + // 注意:waveOutReset/waveOutClose 可能在调用线程里同步派发 MM_WOM_DONE。 + // m_AudioMutex 是递归锁,这里重入是合法的;Stop 已经把 m_bAudioPlaying 置 FALSE, + // 所以重入时会直接跳过填充。 + std::lock_guard lock(m_AudioMutex); + + // waveOut 缓冲区播放完成,尝试填充更多数据 + if (m_bAudioPlaying && m_nRingDataLen > 0) { + FeedAudioBuffersLocked(); } return 0; } diff --git a/server/2015Remote/ScreenSpyDlg.h b/server/2015Remote/ScreenSpyDlg.h index b68d3ce..8dc448b 100644 --- a/server/2015Remote/ScreenSpyDlg.h +++ b/server/2015Remote/ScreenSpyDlg.h @@ -96,6 +96,10 @@ extern "C" // 来自 web 命令的音频开关,PostMessage 到对话框的 UI 线程,避免 WS 线程 // 直接动 waveOut 句柄 #define WM_AUDIO_TOGGLE_FROM_WEB (WM_USER + 0x202) +// 音频播放设备(打开/重建)请求,由 worker 线程 PostMessage 给 UI 线程处理。 +// waveOutOpen/Reset/Close 会同步派发 MM_WOM_*,只能在窗口所属线程调用, +// 否则 worker 持锁等回调、UI 线程等锁,必然死锁。 +#define WM_AUDIO_INIT_DEVICE (WM_USER + 0x203) // ScreenSpyDlg 系统菜单命令 ID enum { @@ -424,14 +428,32 @@ public: std::mutex m_AudioWebMutex; // 保护音频发送状态的互斥锁 // 注意:m_Settings.AudioEnabled 是全局的音频启用/禁用状态 + // 环形缓冲区 / waveOut 状态的多线程保护。 + // OnAudioData 跑在 IOCP worker 线程(见 CMy2015RemoteDlg::NotifyProc), + // OnWaveOutDone 跑在 UI 线程,二者都会改写环形缓冲区与 WAVEHDR。此前无锁, + // 两个线程会抢同一个缓冲区:waveOutWrite 返回 WAVERR_STILLPLAYING(33),且 + // m_nRingDataLen 的非原子读改写会下溢,之后整场会话都在播缓冲区里的陈旧数据 + // (表现为「一段时间后突然没声音,关掉重开远程桌面才恢复」)。 + // 用递归锁:waveOutReset/waveOutClose 可能在调用线程里同步派发 MM_WOM_*, + // UI 线程重入处理器时必须能再次加锁(std::mutex 上重入 try_lock 是未定义行为)。 + std::recursive_mutex m_AudioMutex; + AudioFormat m_LastAudioFormat = {}; // 最近一次收到的线上格式(设备重建用) + BOOL m_bHasAudioFormat = FALSE; + BOOL m_bAudioInitPending = FALSE; // 已在 worker 线程登记重建,等待 UI 线程处理 + ULONGLONG m_nLastAudioInitTick = 0; // 上次尝试打开 waveOut 的时刻(失败重试节流) + ULONGLONG m_nLastAudioErrLog = 0; // 上次打印音频错误日志的时刻(日志节流) + void OnAudioData(BYTE* pData, UINT32 len); // 处理音频数据 - BOOL InitAudioPlayback(const AudioFormat* fmt); // 初始化音频播放 - void StopAudioPlayback(); // 停止音频播放 + void StopAudioPlayback(); // 停止音频播放(任一线程,内部加锁) + BOOL InitAudioPlaybackLocked(const AudioFormat* fmt); // 调用方须持有 m_AudioMutex + void StopAudioPlaybackLocked(); // 调用方须持有 m_AudioMutex + void FeedAudioBuffersLocked(); // 调用方须持有 m_AudioMutex + void RequestAudioRebuildLocked(); // 调用方须持有 m_AudioMutex + void SanitizeRingBufferLocked(); // 调用方须持有 m_AudioMutex void DisableAudio(); // 禁用音频(从网页命令) void EnableAudio(); // 启用音频(从网页命令) LRESULT OnAudioToggleFromWeb(WPARAM wParam, LPARAM lParam); // PostMessage 处理器 void SendAudioCtrl(BYTE enable, BYTE persist); // 发送音频控制命令 - void FeedAudioBuffers(); // 填充音频缓冲区 void SendAudioToWeb(const BYTE* pAudioData, UINT32 len, const WAVEFORMATEX* pFormat, BYTE compression); // 发送音频到网页 (compression=AudioCompression) int GetClientRTT(); // 获取客户端RTT(ms) @@ -465,6 +487,8 @@ public: afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized); afx_msg LRESULT OnDisconnect(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnWaveOutDone(WPARAM wParam, LPARAM lParam); + afx_msg LRESULT OnWaveOutClose(WPARAM wParam, LPARAM lParam); + afx_msg LRESULT OnAudioInitDevice(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnRecvFileV2Chunk(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnRecvFileV2Complete(WPARAM wParam, LPARAM lParam); afx_msg void OnExitFullscreen()