Fix: keep remote desktop audio alive when the playback device drops

Remote desktop audio could stop permanently after an idle period and only
came back by closing and reopening the remote desktop. The ring buffer and
WAVEHDRs were shared without locking between the IOCP worker thread
(OnAudioData) and the UI thread (MM_WOM_DONE): headers were queued twice
(waveOutWrite returning WAVERR_STILLPLAYING 33) and the non-atomic
m_nRingDataLen underflowed, leaving the buffer "full" of stale data.

Audio state is now serialized by a recursive m_AudioMutex, and opening,
resetting and closing the waveOut device happens only on the window's UI
thread: waveOutReset/Close can re-enter the MM_WOM_* handlers on that
thread, and a lock-holding worker would deadlock against the UI thread.
Workers post WM_AUDIO_INIT_DEVICE instead. Rebuilds are triggered by
format changes, waveOutWrite failures (throttled to 2 s), MM_WOM_CLOSE
with a 1 s guard against our own close notices, and a 2-second retry
while audio is enabled. Failed header preparation now tears the device
down instead of leaving a handle that rejects every write.

The client re-creates its Opus encoder when the endpoint channel count or
sample rate changes, downmixes more than two channels, and clamps
oversized WASAPI packets to the PCM staging buffer. Web audio forwarding
still runs outside the lock and is gated exactly as before. Verified by
building the Debug x64 server and client; the silence scenario itself was
not reproduced at runtime.

Co-Authored-By: deepseek-flash
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-07 09:52:55 +01:00
1 parent 4884b080e8
commit 74d64fec87
3 files changed
+260 -42

No files matched your search

+173 -23
View File
@@ -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<std::recursive_mutex> 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<std::recursive_mutex> 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<std::recursive_mutex> 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<std::recursive_mutex> 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<std::recursive_mutex> lock(m_AudioMutex);
// waveOut 缓冲区播放完成,尝试填充更多数据
if (m_bAudioPlaying && m_nRingDataLen > 0) {
FeedAudioBuffersLocked();
}
return 0;
}