Andrew Eikum : dsound: Base fragment size off of the MMDevice's period.
Alexandre Julliard
julliard at winehq.org
Mon May 14 14:26:06 CDT 2012
Module: wine
Branch: master
Commit: 7dce1418ffabe9c63fe40178fe455e23671bb998
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dce1418ffabe9c63fe40178fe455e23671bb998
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Mon May 14 12:31:13 2012 -0500
dsound: Base fragment size off of the MMDevice's period.
---
dlls/dsound/dsound_private.h | 1 -
dlls/dsound/primary.c | 46 +++++++++++++++--------------------------
2 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index d7cb183..44d4d2f 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -276,7 +276,6 @@ HRESULT DSOUND_Create8(REFIID riid, LPDIRECTSOUND8 *ppDS) DECLSPEC_HIDDEN;
/* primary.c */
-DWORD DSOUND_fraglen(DWORD nSamplesPerSec, DWORD nBlockAlign) DECLSPEC_HIDDEN;
HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) DECLSPEC_HIDDEN;
HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) DECLSPEC_HIDDEN;
HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) DECLSPEC_HIDDEN;
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index aec053b..153f1a1 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -40,41 +40,29 @@
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
-/** Calculate how long a fragment length of about 10 ms should be in frames
- *
- * nSamplesPerSec: Frequency rate in samples per second
- * nBlockAlign: Size of a single blockalign
- *
- * Returns:
- * Size in bytes of a single fragment
- */
-DWORD DSOUND_fraglen(DWORD nSamplesPerSec, DWORD nBlockAlign)
+static DWORD DSOUND_fraglen(DirectSoundDevice *device)
{
- /* Given a timer delay of 10ms, the fragment size is approximately:
- * fraglen = (nSamplesPerSec * 10 / 1000) * nBlockAlign
- * ==> fraglen = (nSamplesPerSec / 100) * nBlockSize
- *
- * ALSA uses buffers that are powers of 2. Because of this, fraglen
- * is rounded up to the nearest power of 2:
- */
-
- if (nSamplesPerSec <= 12800)
- return 128 * nBlockAlign;
-
- if (nSamplesPerSec <= 25600)
- return 256 * nBlockAlign;
-
- if (nSamplesPerSec <= 51200)
- return 512 * nBlockAlign;
+ REFERENCE_TIME period;
+ HRESULT hr;
+ DWORD ret;
- return 1024 * nBlockAlign;
+ hr = IAudioClient_GetDevicePeriod(device->client, &period, NULL);
+ if(FAILED(hr)){
+ /* just guess at 10ms */
+ WARN("GetDevicePeriod failed: %08x\n", hr);
+ ret = MulDiv(device->pwfx->nBlockAlign, device->pwfx->nSamplesPerSec, 100);
+ }else
+ ret = MulDiv(device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign, period, 10000000);
+
+ ret -= ret % device->pwfx->nBlockAlign;
+ return ret;
}
static void DSOUND_RecalcPrimary(DirectSoundDevice *device)
{
TRACE("(%p)\n", device);
- device->fraglen = DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign);
+ device->fraglen = DSOUND_fraglen(device);
device->helfrags = device->buflen / device->fraglen;
TRACE("fraglen=%d helfrags=%d\n", device->fraglen, device->helfrags);
@@ -114,7 +102,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
return hres;
}
- prebuf_frames = device->prebuf * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign) / device->pwfx->nBlockAlign;
+ prebuf_frames = device->prebuf * DSOUND_fraglen(device) / device->pwfx->nBlockAlign;
prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec;
hres = IAudioClient_Initialize(device->client,
More information about the wine-cvs
mailing list