From f96e4a7320c8d846a10d987251771ac68a0d5585 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Sat, 7 Nov 2026 10:15:23 +0100 Subject: [PATCH] Fix: recover remote desktop audio after dropped formats and sleep The client's audio thread starts before the capture thread sends TOKEN_BITMAPINFO, so its first packet - the only one carrying the AudioFormat - reaches the master before CScreenSpyDlg exists and is dropped as an unknown command. Without a format the master cannot open waveOut, and the client re-announced only on an audio off/on, so a remote desktop opened with audio enabled stayed silent until the toolbar button was toggled twice. The master now asks for a re-announce when data arrives with no format on record (CMD_AUDIO_CTRL enable, persist=0, one request per 2 s, 15 attempts max), and the client attaches the format to its next packet. Entering Modern Standby tears down the render endpoint. The client got AUDCLNT_E_DEVICE_INVALIDATED and rebuilt its loopback capture in that same instant; the new client initialized and started fine but was bound to the dying audio engine, so after resume GetNextPacketSize returned zero packets forever without error, and only a fresh screen session recovered. The audio thread now measures its own loop gap (GetTickCount64 plus wall clock, 2 s; a normal pass is ~10 ms) and rebuilds the capture client after the machine was frozen, waits a second after an invalidation, and rebuilds on an audio off-to-on. The master rebuilds waveOut on resume from WM_POWERBROADCAST. The format recovery was verified live; the resume recovery is build-verified and awaits a field check on a sleeping machine. Co-Authored-By: deepseek-flash --- client/ScreenManager.cpp | 62 +++++++++++++++++++++++++++--- client/ScreenManager.h | 7 ++++ server/2015Remote/ScreenSpyDlg.cpp | 38 ++++++++++++++++++ server/2015Remote/ScreenSpyDlg.h | 5 +++ 4 files changed, 107 insertions(+), 5 deletions(-) diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index c4c2639..2d6de20 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -2452,6 +2452,15 @@ void CScreenManager::SaveQualityProfiles() // ========== WASAPI 系统音频捕获实现 ========== +// 墙钟(100ns,UTC)。GetTickCount64 在现代待机期间是否继续走依赖平台/固件, +// 墙钟一定走;两者一起比才能可靠识别「线程被冻结了一段时间」。 +static ULONGLONG NowFileTime100ns() +{ + FILETIME ft; + GetSystemTimeAsFileTime(&ft); + return ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; +} + BOOL CScreenManager::InitWASAPILoopback() { if (m_bAudioInitialized) return TRUE; @@ -2568,6 +2577,7 @@ void CScreenManager::UninitWASAPI() void CScreenManager::HandleAudioCtrl(BYTE enable, BYTE persist) { + BOOL wasEnabled = m_ScreenSettings.AudioEnabled; m_ScreenSettings.AudioEnabled = enable; // 持久化到客户端配置 @@ -2578,6 +2588,14 @@ void CScreenManager::HandleAudioCtrl(BYTE enable, BYTE persist) if (enable) { // 启用音频:唤醒线程(WASAPI 由音频线程自己初始化) + // 无论当前是否已在传输,都标记重发一次格式:主控收不到格式包时正是用 enable + // (persist=0)来要的(首包比远程桌面窗口先到会被丢)。已在传时多一个格式包无害。 + m_bAudioFormatResend = TRUE; + // 关闭期间的休眠会让残留的捕获客户端作废(且不会报错),所以由「关」转「开」 + // 时重建一次。主控用 enable(persist=0)来要格式包时音频本来就是开的,不必重建。 + if (!wasEnabled) { + m_bAudioDeviceDirty = TRUE; + } if (m_hAudioEvent) { SetEvent(m_hAudioEvent); } @@ -2629,11 +2647,41 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) Mprintf("音频线程启动\n"); #endif + // 正常一轮只有 10ms 上下。系统进入待机时本线程被冻结,恢复后这里会看到一段 + // 很长的时间差 —— 而进待机那一刻重建出来的捕获客户端已经绑在被销毁的音频引擎上 + // (日志:进现代待机时重建成功,唤醒后 GetNextPacketSize 一直返回 0,再也不出包, + // 只有重开远程桌面才好)。恢复后必须重建。 + ULONGLONG lastTick = GetTickCount64(); + ULONGLONG lastWall = NowFileTime100ns(); + while (pThis->m_bAudioThreadRunning) { + // 阈值 2 秒:远大于正常循环周期,也不会误伤 1000ms 的初始化重试等待。 + ULONGLONG tickNow = GetTickCount64(); + ULONGLONG wallNow = NowFileTime100ns(); + BOOL woken = (tickNow - lastTick > 2000) || (wallNow - lastWall > 20000000ULL); + lastTick = tickNow; + lastWall = wallNow; + if (woken || pThis->m_bAudioDeviceDirty) { + if (woken) { + Mprintf("检测到系统休眠后恢复(或线程被挂起),重建 WASAPI 捕获\n"); + } + pThis->m_bAudioDeviceDirty = FALSE; + pThis->UninitWASAPI(); + firstFrame = TRUE; // 新采集要重新下发格式,主控那边才有机会核对设备状态 +#if USING_OPUS + nAccumSamples = 0; +#endif + // 正在停止时别再重建:紧接着的初始化会和析构里的 UninitWASAPI 抢同一组指针 + if (!pThis->m_bAudioThreadRunning) break; + } + // 如果音频未启用,挂起等待 if (!pThis->m_ScreenSettings.AudioEnabled) { firstFrame = TRUE; // 下次启用时重新发送格式 WaitForSingleObject(pThis->m_hAudioEvent, INFINITE); + // 这次等待可能跨越休眠或很长一段关闭期,别算进上面的时间差检测 + lastTick = GetTickCount64(); + lastWall = NowFileTime100ns(); if (!pThis->m_bAudioThreadRunning) break; continue; } @@ -2650,10 +2698,12 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) UINT32 packetLength = 0; HRESULT hr = pThis->m_pCaptureClient->GetNextPacketSize(&packetLength); if (FAILED(hr)) { - // WASAPI 调用失败,可能是设备状态变化(如切换显示器),重新初始化 + // WASAPI 调用失败,可能是设备状态变化(如切换显示器),重新初始化。 + // 等 1 秒再重建:设备正在被系统拆除/重建时抢着 Initialize 会拿到一个 + // 「初始化成功但永远没数据」的客户端(进入现代待机那一刻就踩过)。 Mprintf("GetNextPacketSize 失败: 0x%08X,重新初始化 WASAPI\n", hr); pThis->UninitWASAPI(); - Sleep(100); + Sleep(1000); continue; } @@ -2785,7 +2835,7 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) UINT32 offset = 0; pSendBuffer[offset++] = TOKEN_SCREEN_AUDIO; - if (firstFrame) { + if (firstFrame || pThis->m_bAudioFormatResend) { pSendBuffer[offset++] = 1; // hasFormat = true AudioFormat fmt; fmt.channels = (WORD)encChannels; @@ -2797,6 +2847,7 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) memcpy(pSendBuffer + offset, &fmt, sizeof(AudioFormat)); offset += sizeof(AudioFormat); firstFrame = FALSE; + pThis->m_bAudioFormatResend = FALSE; Mprintf("发送音频格式: %d Hz, %d ch, Opus 压缩\n", fmt.sampleRate, fmt.channels); } else { @@ -2817,8 +2868,8 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) UINT32 offset = 0; pSendBuffer[offset++] = TOKEN_SCREEN_AUDIO; - // 首帧带格式信息 - if (firstFrame) { + // 首帧带格式信息(或主控请求重发) + if (firstFrame || pThis->m_bAudioFormatResend) { pSendBuffer[offset++] = 1; // hasFormat = true AudioFormat fmt; fmt.channels = (WORD)numChannels; @@ -2830,6 +2881,7 @@ DWORD WINAPI CScreenManager::AudioThreadProc(LPVOID lpParam) memcpy(pSendBuffer + offset, &fmt, sizeof(AudioFormat)); offset += sizeof(AudioFormat); firstFrame = FALSE; + pThis->m_bAudioFormatResend = FALSE; Mprintf("发送音频格式: %d Hz, %d ch, 16 bit PCM (源: %d bit %s)\n", fmt.sampleRate, fmt.channels, pWaveFmt->wBitsPerSample, isFloat ? "Float" : "PCM"); diff --git a/client/ScreenManager.h b/client/ScreenManager.h index d13f9c8..afca313 100644 --- a/client/ScreenManager.h +++ b/client/ScreenManager.h @@ -119,6 +119,13 @@ public: // ========== 系统音频捕获 (WASAPI Loopback) ========== volatile BOOL m_bAudioThreadRunning = FALSE;// 音频线程运行标志(独立于视频线程) volatile BOOL m_bAudioInitialized = FALSE; // WASAPI 是否已初始化 + // 主控请求重发音频格式包:带格式的首包可能比 TOKEN_BITMAPINFO 先到,被主控当未知 + // 命令丢掉;主控发现没收过格式时会发 enable 控制命令来要一次。幂等:格式没变主控不重建。 + volatile BOOL m_bAudioFormatResend = FALSE; + // 请求音频线程重建 WASAPI 捕获客户端。系统休眠/恢复后旧的捕获客户端会作废, + // 但 GetNextPacketSize 不报错、永远返回 0,从此再也收不到包(主控那边看起来 + // 一切正常)。COM 对象只允许音频线程自己释放,所以这里只登记标志。 + volatile BOOL m_bAudioDeviceDirty = FALSE; HANDLE m_hAudioThread = NULL; // 音频线程句柄 HANDLE m_hAudioEvent = NULL; // 控制线程挂起/唤醒 diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index 69f7fe4..351b229 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -611,6 +611,7 @@ BEGIN_MESSAGE_MAP(CScreenSpyDlg, CDialog) 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_POWERBROADCAST, &CScreenSpyDlg::OnPowerResume) ON_MESSAGE(WM_RECVFILEV2_CHUNK, &CScreenSpyDlg::OnRecvFileV2Chunk) ON_MESSAGE(WM_RECVFILEV2_COMPLETE, &CScreenSpyDlg::OnRecvFileV2Complete) ON_MESSAGE(WM_AUDIO_TOGGLE_FROM_WEB, &CScreenSpyDlg::OnAudioToggleFromWeb) @@ -4400,6 +4401,22 @@ void CScreenSpyDlg::OnAudioData(BYTE* pData, UINT32 len) } } + // 格式包丢失:客户端的音频线程在子连接建立时就开始跑,带格式的首包常常比 + // TOKEN_BITMAPINFO 先到 —— 那时远程桌面对话框还没创建,主窗口把这批包当未知命令 + // 丢掉(见 CMy2015RemoteDlg::MessageHandle 的 default 分支)。没有格式就开不了设备, + // 客户端又只在「关→开」时才重发格式,于是整场会话无声,直到用户手动拨一次音频开关。 + // 这里借后续数据包主动请客户端重发格式:enable + persist=0,只唤醒音频线程、 + // 不改客户端配置。次数封顶,老客户端不认这个请求时不会无限发。 + // 触发点是「已经路由到本对话框的包」,所以对话框必然已就绪,不存在再次丢包的窗口。 + if (!m_bHasAudioFormat && m_Settings.AudioEnabled && + m_nAudioFmtReqCount < 15 && + GetTickCount64() - m_nLastAudioFmtReqTick >= 2000) { + m_nLastAudioFmtReqTick = GetTickCount64(); + m_nAudioFmtReqCount++; + SendAudioCtrl(CYCLEAUDIO_ENABLE, 0); + Mprintf("[Audio] 未收到音频格式包,请求客户端重发 (%d)\n", m_nAudioFmtReqCount); + } + // 播放设备未就绪:首包格式包丢失、或 waveOutOpen 因设备休眠/被独占而一时失败。 // 有缓存格式就定期请 UI 线程重试,否则整场会话无声,只能关掉重开远程桌面。 // 只在音频处于启用状态时重试,避免用户关掉后又被残留包拉起来。 @@ -4679,6 +4696,27 @@ LRESULT CScreenSpyDlg::OnAudioInitDevice(WPARAM, LPARAM) return 0; } +LRESULT CScreenSpyDlg::OnPowerResume(WPARAM wParam, LPARAM wParamUnused) +{ + // 系统休眠(现代待机)时音频端点会被拆除再重建。waveOut 句柄有时既不派发 + // MM_WOM_CLOSE、waveOutWrite 也照样返回成功,声音却已经没有了 —— 表现为 + // 「闲置一段时间后再放声音没声音,只能重开远程桌面」。恢复后主动重建一次, + // 打开失败也没关系:m_bAudioPlaying 保持 FALSE,OnAudioData 会每 2 秒重试。 + if (wParam != PBT_APMRESUMEAUTOMATIC && wParam != PBT_APMRESUMESUSPEND) { + return TRUE; + } + + std::lock_guard lock(m_AudioMutex); + if (!m_bHasAudioFormat || !m_Settings.AudioEnabled) return TRUE; + + Mprintf("[Audio] 系统从休眠恢复,重建播放设备\n"); + if (m_bAudioPlaying) { + StopAudioPlaybackLocked(); + } + InitAudioPlaybackLocked(&m_LastAudioFormat); + return TRUE; +} + LRESULT CScreenSpyDlg::OnWaveOutClose(WPARAM wParam, LPARAM wParamUnused) { // 设备被移除/切换(显示器休眠、默认输出端点变化等)时,系统会关闭 waveOut 句柄 diff --git a/server/2015Remote/ScreenSpyDlg.h b/server/2015Remote/ScreenSpyDlg.h index 8dc448b..d479552 100644 --- a/server/2015Remote/ScreenSpyDlg.h +++ b/server/2015Remote/ScreenSpyDlg.h @@ -442,6 +442,10 @@ public: BOOL m_bAudioInitPending = FALSE; // 已在 worker 线程登记重建,等待 UI 线程处理 ULONGLONG m_nLastAudioInitTick = 0; // 上次尝试打开 waveOut 的时刻(失败重试节流) ULONGLONG m_nLastAudioErrLog = 0; // 上次打印音频错误日志的时刻(日志节流) + // 没收到格式包时主动请客户端重发(首包常比 TOKEN_BITMAPINFO 先到、对话框还没建好被丢掉)。 + // m_nAudioFmtReqCount 封顶:老客户端不认这个请求,别一直发。 + ULONGLONG m_nLastAudioFmtReqTick = 0; // 上次请求重发格式的时刻(节流) + int m_nAudioFmtReqCount = 0; // 已请求重发格式的次数 void OnAudioData(BYTE* pData, UINT32 len); // 处理音频数据 void StopAudioPlayback(); // 停止音频播放(任一线程,内部加锁) @@ -489,6 +493,7 @@ public: 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 OnPowerResume(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnRecvFileV2Chunk(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnRecvFileV2Complete(WPARAM wParam, LPARAM lParam); afx_msg void OnExitFullscreen()