wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 788005 - Work around Vista's higher latency requirements in WinMM. r=doublec

Browse Source
This commit is contained in:
Matthew Gregan 2012-11-13 18:19:00 +13:00
parent 1ca710f9aa
commit 7ea4c816a8
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/libcubeb/README_MOZILLA
View File

@ -5,6 +5,4 @@ Makefile.in build files for the Mozilla build system.
The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
The git commit ID used was dfdf4a3c0f813717819f633f8bd3099c3e58ee8a.
Plus the single commit 1bc23c6e2e4920f38f7aa56ec56ef5e379e18cf7.
Plus the single commit 6e9ffc59202f95f09e5adb895d10eaedf36a6ea2.
The git commit ID used was 6e9ffc59202f95f09e5adb895d10eaedf36a6ea2.

35
media/libcubeb/src/cubeb_winmm.c
View File

@ -33,6 +33,7 @@ struct cubeb {
PSLIST_HEADER work;
CRITICAL_SECTION lock;
unsigned int active_streams;
int minimum_latency;
};
struct cubeb_stream {
@ -190,6 +191,34 @@ cubeb_buffer_callback(HWAVEOUT waveout, UINT msg, DWORD_PTR user_ptr, DWORD_PTR
SetEvent(stm->context->event);
}
static int
calculate_minimum_latency(void)
{
OSVERSIONINFOEX osvi;
DWORDLONG mask;
/* Vista's WinMM implementation underruns when less than 200ms of audio is buffered. */
memset(&osvi, 0, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwMajorVersion = 6;
osvi.dwMinorVersion = 0;
mask = 0;
VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_EQUAL);
VER_SET_CONDITION(mask, VER_MINORVERSION, VER_EQUAL);
if (VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, mask) != 0) {
return 200;
}
/* Running under Terminal Services results in underruns with low latency. */
if (GetSystemMetrics(SM_REMOTESESSION) == TRUE) {
return 500;
}
return 0;
}
int
cubeb_init(cubeb ** context, char const * context_name)
{
@ -222,6 +251,8 @@ cubeb_init(cubeb ** context, char const * context_name)
InitializeCriticalSection(&ctx->lock);
ctx->active_streams = 0;
ctx->minimum_latency = calculate_minimum_latency();
*context = ctx;
return CUBEB_OK;
@ -342,6 +373,10 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
stm->state_callback = state_callback;
stm->user_ptr = user_ptr;
if (latency < context->minimum_latency) {
latency = context->minimum_latency;
}
bufsz = (size_t) (stm->params.rate / 1000.0 * latency * bytes_per_frame(stm->params) / NBUFS);
if (bufsz % bytes_per_frame(stm->params) != 0) {
bufsz += bytes_per_frame(stm->params) - (bufsz % bytes_per_frame(stm->params));