wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Andrew Eikum : dsound: Resample to float, not device format.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 98c653bc8bc842e23b3fa9098d2cbf5e0e8c348a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c653bc8bc842e23b3fa9098… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 15 08:29:34 2012 -0500 dsound: Resample to float, not device format. --- dlls/dsound/dsound_convert.c | 92 +++------------------------------ dlls/dsound/dsound_private.h | 9 +-- dlls/dsound/mixer.c | 118 ++++++++++++++++-------------------------- dlls/dsound/primary.c | 15 ++---- 4 files changed, 59 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98c653bc8bc842e23b3fa…

1 0

Andrew Eikum : dsound: Compute mix buffer's size more accurately.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 20356f7458334e777f98ce20e873c8070f78b160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20356f7458334e777f98ce20e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:20:02 2012 -0500 dsound: Compute mix buffer's size more accurately. --- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/mixer.c | 44 ++++++++--------------------------------- dlls/dsound/primary.c | 8 +----- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 375abac..26e59ff 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -94,7 +94,8 @@ struct DirectSoundDevice CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; - LPBYTE tmp_buffer, mix_buffer; + LPBYTE tmp_buffer; + float *mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; DSVOLUMEPAN volpan; @@ -294,7 +295,6 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; /* mixer.c */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) DECLSPEC_HIDDEN; void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a940a85..9d4b35b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -96,19 +96,6 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); } -/** Convert a primary buffer position to a pointer position for device->mix_buffer - * device: DirectSoundDevice for which to calculate - * pos: Primary buffer position to converts - * Returns: Offset for mix_buffer - */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) -{ - DWORD ret = pos * 32 / device->pwfx->wBitsPerSample; - if (device->pwfx->wBitsPerSample == 32) - ret *= 2; - return ret; -} - /** * Recalculate the size for temporary buffer, and new writelead * Should be called when one of the following things occur: @@ -480,7 +467,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO { INT len = fraglen; BYTE *ibuf, *volbuf; - DWORD oldpos, mixbufpos; + DWORD oldpos; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); @@ -502,16 +489,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO if (volbuf) ibuf = volbuf; - mixbufpos = DSOUND_bufpos_to_mixpos(dsb->device, writepos); - /* Now mix the temporary buffer into the devices main buffer */ - if ((writepos + len) <= dsb->device->buflen) - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, len); - else - { - DWORD todo = dsb->device->buflen - writepos; - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, todo); - dsb->device->mixfunction(ibuf + todo, dsb->device->mix_buffer, len - todo); - } + dsb->device->mixfunction(ibuf, dsb->device->mix_buffer, len); /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && @@ -754,7 +732,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL recover = FALSE, all_stopped = FALSE; - DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; + DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2; LPVOID buf1, buf2; int nfiller; @@ -771,9 +749,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) playpos,writepos,device->playpos,device->mixpos,device->buflen); assert(device->playpos < device->buflen); - mixplaypos = DSOUND_bufpos_to_mixpos(device, device->playpos); - mixplaypos2 = DSOUND_bufpos_to_mixpos(device, playpos); - /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); @@ -794,15 +769,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* reset mix position to write position */ device->mixpos = writepos; - ZeroMemory(device->mix_buffer, device->mix_buffer_len); ZeroMemory(device->buffer, device->buflen); } else if (playpos < device->playpos) { buf1 = device->buffer + device->playpos; buf2 = device->buffer; size1 = device->buflen - device->playpos; size2 = playpos; - FillMemory(device->mix_buffer + mixplaypos, device->mix_buffer_len - mixplaypos, 0); - FillMemory(device->mix_buffer, mixplaypos2, 0); FillMemory(buf1, size1, nfiller); if (playpos && (!buf2 || !size2)) FIXME("%d: (%d, %d)=>(%d, %d) There should be an additional buffer here!!\n", __LINE__, device->playpos, device->mixpos, playpos, writepos); @@ -812,7 +784,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) buf2 = NULL; size1 = playpos - device->playpos; size2 = 0; - FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); } device->playpos = playpos; @@ -823,17 +794,20 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) TRACE("prebuff_left = %d, prebuff_max = %dx%d=%d, writelead=%d\n", prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); + ZeroMemory(device->mix_buffer, device->mix_buffer_len); + /* do the mixing */ DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); if (maxq + writepos > device->buflen) { DWORD todo = device->buflen - writepos; - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, todo); - device->normfunction(device->mix_buffer, device->buffer, maxq - todo); + DWORD offs_float = (todo / device->pwfx->nBlockAlign) * device->pwfx->nChannels; + device->normfunction(device->mix_buffer, device->buffer + writepos, todo); + device->normfunction(device->mix_buffer + offs_float, device->buffer, maxq - todo); } else - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, maxq); + device->normfunction(device->mix_buffer, device->buffer + writepos, maxq); /* update the mix position, taking wrap-around into account */ device->mixpos = writepos + maxq; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ff79a70..6633124 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -159,8 +159,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->helfrags = device->buflen / device->fraglen; - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len); + device->mix_buffer_len = ((device->prebuf * device->fraglen) / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); + device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); if (!device->mix_buffer) return DSERR_OUTOFMEMORY; @@ -512,10 +512,6 @@ opened: WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); } - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device->mix_buffer, device->mix_buffer_len); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat,

1 0

Andrew Eikum : dsound: Get rid of redundant primary_mixpos member.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 5cce1d9da2eba0b76c1ea4a1b12f0dff70324ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cce1d9da2eba0b76c1ea4a1b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:19:50 2012 -0500 dsound: Get rid of redundant primary_mixpos member. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 60 ++++++++++-------------------------------- dlls/dsound/primary.c | 1 - 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ba310db..375abac 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -186,7 +186,7 @@ struct IDirectSoundBufferImpl DWORD firstep; float freqAcc, freqAdjust, firgain; /* used for mixing */ - DWORD primary_mixpos, sec_mixpos; + DWORD sec_mixpos; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 625665f..a940a85 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -520,10 +520,6 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO DSOUND_CheckEvent(dsb, oldpos, ilen); } - /* increase mix position */ - dsb->primary_mixpos += len; - dsb->primary_mixpos %= dsb->device->buflen; - return len; } @@ -541,55 +537,34 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO */ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mixlen) { - /* The buffer's primary_mixpos may be before or after the device - * buffer's mixpos, but both must be ahead of writepos. */ - DWORD primary_done; + DWORD primary_done = 0; TRACE("(%p,%d,%d)\n",dsb,writepos,mixlen); - TRACE("writepos=%d, primary_mixpos=%d, mixlen=%d\n", writepos, dsb->primary_mixpos, mixlen); + TRACE("writepos=%d, mixlen=%d\n", writepos, mixlen); TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ - if (dsb->leadin && dsb->state == STATE_STARTING) - { - if (mixlen > 2 * dsb->device->fraglen) - { - dsb->primary_mixpos += mixlen - 2 * dsb->device->fraglen; - dsb->primary_mixpos %= dsb->device->buflen; + /* FIXME: Is this needed? */ + if (dsb->leadin && dsb->state == STATE_STARTING) { + if (mixlen > 2 * dsb->device->fraglen) { + primary_done = mixlen - 2 * dsb->device->fraglen; + mixlen = 2 * dsb->device->fraglen; + writepos += primary_done; + dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * + dsb->pwfx->nBlockAlign * dsb->freqAdjust; } } - dsb->leadin = FALSE; - /* calculate how much pre-buffering has already been done for this buffer */ - primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); - - /* sanity */ - if(mixlen < primary_done) - { - /* Should *NEVER* happen */ - ERR("Fatal error. Under/Overflow? primary_done=%d, mixpos=%d/%d, primary_mixpos=%d, writepos=%d, mixlen=%d\n", primary_done,dsb->sec_mixpos, dsb->buflen, dsb->primary_mixpos, writepos, mixlen); - dsb->primary_mixpos = writepos + mixlen; - dsb->primary_mixpos %= dsb->device->buflen; - return mixlen; - } - - /* take into account already mixed data */ - mixlen -= primary_done; - - TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen); + dsb->leadin = FALSE; - if (!mixlen) - return primary_done; + TRACE("mixlen (primary) = %i\n", mixlen); /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, writepos, mixlen); - /* re-calculate the primary done */ - primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); - - TRACE("new primary_mixpos=%d, total mixed data=%d\n", dsb->primary_mixpos, primary_done); + TRACE("total mixed data=%d\n", primary_done); /* Report back the total prebuffered amount for this buffer */ return primary_done; @@ -632,11 +607,6 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DSOUND_CheckEvent(dsb, 0, 0); } else if (dsb->state != STATE_STOPPED) { - /* if recovering, reset the mix position */ - if ((dsb->state == STATE_STARTING) || recover) { - dsb->primary_mixpos = writepos; - } - /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING) dsb->state = STATE_PLAYING; @@ -806,8 +776,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); - if (playpos + prebuff_max >= device->helfrags * device->fraglen) - prebuff_max += device->buflen - device->helfrags * device->fraglen; /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0d57f6f..ff79a70 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -537,7 +537,6 @@ opened: (*dsb)->freqAdjust = (*dsb)->freq / (float)device->pwfx->nSamplesPerSec; DSOUND_RecalcFormat((*dsb)); - (*dsb)->primary_mixpos = 0; RtlReleaseResource(&(*dsb)->lock); /* **** */

1 0

Andrew Eikum : dsound: Change mix_buffer to float instead of INT.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: e0ccd9e399db56a11dd21b0c767eb9abd48e9d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ccd9e399db56a11dd21b0c7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:19:46 2012 -0500 dsound: Change mix_buffer to float instead of INT. --- dlls/dsound/dsound_convert.c | 157 +++++++++++++++++++++++------------------- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/primary.c | 26 ++++++- 3 files changed, 111 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0ccd9e399db56a11dd21…

1 0

Lucas Fialho Zawacki : Added Portuguese translation for release 1.5.4
by Jeremy Newman 14 May '12

14 May '12

Module: website Branch: master Commit: 51a34ed22decb6a0a2eb44c551b57dd414e52133 URL: http://source.winehq.org/git/website.git/?a=commit;h=51a34ed22decb6a0a2eb44… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon May 14 14:01:56 2012 -0300 Added Portuguese translation for release 1.5.4 --- news/pt/2012051101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012051101.xml b/news/pt/2012051101.xml new file mode 100644 index 0000000..5e45413 --- /dev/null +++ b/news/pt/2012051101.xml @@ -0,0 +1,17 @@ +<news> +<date>11 de Maio de 2012</date> +<title>Wine 1.5.4 lançado</title> +<body> + A versão de desenvolvimento 1.5.4 já está disponível. + <a href="{$root}/announce/1.5.4">Novidades</a> desta versão: +<ul> + <li>Um novo resampler no DirectSound.</li> + <li>Um provedor de negociação de autenticação.</li> + <li>Suporte a OpenGL na engine DIB.</li> + <li>Suporte inicial a códigos mistos (mixed assemblies) com .NET.</li> + <li>Rotinas de suporte a Nomes de Domínio Internacionalizados.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.4.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news>

1 0

Andrew Eikum : dsound: Ensure primary buffer' s buffer is large enough to hold the entire prebuffer.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 8327e6f4234bcc073c6d2979286341ff6103b220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8327e6f4234bcc073c6d29792… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:17 2012 -0500 dsound: Ensure primary buffer's buffer is large enough to hold the entire prebuffer. --- dlls/dsound/primary.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 153f1a1..7fed78e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -58,18 +58,6 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) return ret; } -static void DSOUND_RecalcPrimary(DirectSoundDevice *device) -{ - TRACE("(%p)\n", device); - - device->fraglen = DSOUND_fraglen(device); - device->helfrags = device->buflen / device->fraglen; - TRACE("fraglen=%d helfrags=%d\n", device->fraglen, device->helfrags); - - /* calculate the 10ms write lead */ - device->writelead = (device->pwfx->nSamplesPerSec / 100) * device->pwfx->nBlockAlign; -} - HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames; @@ -153,18 +141,23 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { - DWORD buflen; LPBYTE newbuf; TRACE("(%p)\n", device); + device->fraglen = DSOUND_fraglen(device); + /* on original windows, the buffer it set to a fixed size, no matter what the settings are. on windows this size is always fixed (tested on win-xp) */ if (!device->buflen) device->buflen = ds_hel_buflen; - buflen = device->buflen; - buflen -= buflen % device->pwfx->nBlockAlign; - device->buflen = buflen; + device->buflen -= device->buflen % device->pwfx->nBlockAlign; + while(device->buflen < device->fraglen * device->prebuf){ + device->buflen += ds_hel_buflen; + device->buflen -= device->buflen % device->pwfx->nBlockAlign; + } + + device->helfrags = device->buflen / device->fraglen; device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len); @@ -174,13 +167,11 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if (device->state == STATE_PLAYING) device->state = STATE_STARTING; else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED; - TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); - /* reallocate emulated primary buffer */ if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, buflen); + newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, device->buflen); else - newbuf = HeapAlloc(GetProcessHeap(),0, buflen); + newbuf = HeapAlloc(GetProcessHeap(),0, device->buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); @@ -188,11 +179,12 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* but the old buffer might still exist and must be re-prepared */ } - DSOUND_RecalcPrimary(device); + device->writelead = (device->pwfx->nSamplesPerSec / 100) * device->pwfx->nBlockAlign; device->buffer = newbuf; - TRACE("fraglen=%d\n", device->fraglen); + TRACE("buflen: %u, fraglen: %u, helfrags: %u, mix_buffer_len: %u\n", + device->buflen, device->fraglen, device->helfrags, device->mix_buffer_len); device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1]; device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];

1 0

Andrew Eikum : dsound: Base fragment size off of the MMDevice's period.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 7dce1418ffabe9c63fe40178fe455e23671bb998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dce1418ffabe9c63fe40178f… Author: Andrew Eikum <aeikum(a)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,

1 0

Andrew Eikum : dsound: Express buffer positions in terms of bytes, not fragments.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 1053bfb48d7a1ebb593b03dcea7bc51ec0867e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1053bfb48d7a1ebb593b03dce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:10 2012 -0500 dsound: Express buffer positions in terms of bytes, not fragments. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 65 ++++++++++++++++++----------------------- dlls/dsound/primary.c | 13 ++------ 3 files changed, 34 insertions(+), 46 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bed6959..d7cb183 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -83,7 +83,7 @@ struct DirectSoundDevice DSCAPS drvcaps; DWORD priolevel; PWAVEFORMATEX pwfx; - UINT timerID, pwplay, pwqueue, prebuf, helfrags; + UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; UINT64 last_pos_bytes; DWORD fraglen; LPBYTE buffer; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 81cbd02..625665f 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -663,53 +663,47 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) { - DWORD prebuf_frames, buf_offs_bytes, wave_fragpos; - int prebuf_frags; + DWORD prebuf_frames, prebuf_bytes, read_offs_bytes; BYTE *buffer; HRESULT hr; TRACE("(%p)\n", device); - /* calculate the current wave frag position */ - wave_fragpos = (device->pwplay + device->pwqueue) % device->helfrags; + read_offs_bytes = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen; - /* calculate the current wave write position */ - buf_offs_bytes = wave_fragpos * device->fraglen; - - TRACE("wave_fragpos = %i, buf_offs_bytes = %i, pwqueue = %i, prebuf = %i\n", - wave_fragpos, buf_offs_bytes, device->pwqueue, device->prebuf); + TRACE("read_offs_bytes = %u, playing_offs_bytes = %u, in_mmdev_bytes: %u, prebuf = %u\n", + read_offs_bytes, device->playing_offs_bytes, device->in_mmdev_bytes, device->prebuf); if (!force) { - /* check remaining prebuffered frags */ - prebuf_frags = device->mixpos / device->fraglen; - if (prebuf_frags == device->helfrags) - --prebuf_frags; - TRACE("wave_fragpos = %d, mixpos_frags = %d\n", wave_fragpos, prebuf_frags); - if (prebuf_frags < wave_fragpos) - prebuf_frags += device->helfrags; - prebuf_frags -= wave_fragpos; - TRACE("wanted prebuf_frags = %d\n", prebuf_frags); + if(device->mixpos < device->playing_offs_bytes) + prebuf_bytes = device->mixpos + device->buflen - device->playing_offs_bytes; + else + prebuf_bytes = device->mixpos - device->playing_offs_bytes; } else /* buffer the maximum amount of frags */ - prebuf_frags = device->prebuf; + prebuf_bytes = device->prebuf * device->fraglen; /* limit to the queue we have left */ - if ((prebuf_frags + device->pwqueue) > device->prebuf) - prebuf_frags = device->prebuf - device->pwqueue; + if(device->in_mmdev_bytes + prebuf_bytes > device->prebuf * device->fraglen) + prebuf_bytes = device->prebuf * device->fraglen - device->in_mmdev_bytes; - TRACE("prebuf_frags = %i\n", prebuf_frags); + TRACE("prebuf_bytes = %u\n", prebuf_bytes); - if(!prebuf_frags) + if(!prebuf_bytes) return; - /* adjust queue */ - device->pwqueue += prebuf_frags; + device->in_mmdev_bytes += prebuf_bytes; - prebuf_frames = ((prebuf_frags + wave_fragpos > device->helfrags) ? - (device->helfrags - wave_fragpos) : - (prebuf_frags)) * device->fraglen / device->pwfx->nBlockAlign; + if(prebuf_bytes + read_offs_bytes > device->buflen){ + DWORD chunk_bytes = device->buflen - read_offs_bytes; + prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; + prebuf_bytes -= chunk_bytes; + }else{ + prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; + prebuf_bytes = 0; + } hr = IAudioRenderClient_GetBuffer(device->render, prebuf_frames, &buffer); if(FAILED(hr)){ @@ -717,7 +711,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } - memcpy(buffer, device->buffer + buf_offs_bytes, + memcpy(buffer, device->buffer + read_offs_bytes, prebuf_frames * device->pwfx->nBlockAlign); hr = IAudioRenderClient_ReleaseBuffer(device->render, prebuf_frames, 0); @@ -727,9 +721,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) } /* check if anything wrapped */ - prebuf_frags = prebuf_frags + wave_fragpos - device->helfrags; - if(prebuf_frags > 0){ - prebuf_frames = prebuf_frags * device->fraglen / device->pwfx->nBlockAlign; + if(prebuf_bytes > 0){ + prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; hr = IAudioRenderClient_GetBuffer(device->render, prebuf_frames, &buffer); if(FAILED(hr)){ @@ -746,7 +739,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) } } - TRACE("queue now = %i\n", device->pwqueue); + TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes); } /** @@ -783,9 +776,9 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; if(delta_frags > 0){ - device->pwplay += delta_frags; - device->pwplay %= device->helfrags; - device->pwqueue -= delta_frags; + device->playing_offs_bytes += delta_frags * device->fraglen; + device->playing_offs_bytes %= device->buflen; + device->in_mmdev_bytes -= delta_frags * device->fraglen; device->last_pos_bytes = pos_bytes - (pos_bytes % device->fraglen); } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b5a09f8..aec053b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -210,7 +210,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->last_pos_bytes = device->pwplay = device->pwqueue = device->playpos = device->mixpos = 0; + device->last_pos_bytes = device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; return DS_OK; } @@ -221,8 +221,6 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) TRACE("(%p)\n", device); - device->pwqueue = (DWORD)-1; /* resetting queues */ - if(device->client){ hr = IAudioClient_Stop(device->client); if(FAILED(hr)) @@ -230,7 +228,7 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) } /* clear the queue */ - device->pwqueue = 0; + device->in_mmdev_bytes = 0; } HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) @@ -308,17 +306,14 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP { TRACE("(%p,%p,%p)\n", device, playpos, writepos); - TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); - /* check if playpos was requested */ if (playpos) - /* use the cached play position */ - *playpos = device->pwplay * device->fraglen; + *playpos = device->playing_offs_bytes; /* check if writepos was requested */ if (writepos) /* the writepos is the first non-queued position */ - *writepos = ((device->pwplay + device->pwqueue) % device->helfrags) * device->fraglen; + *writepos = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen; TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount()); return DS_OK;

1 0

Andrew Eikum : dsound: Remove minlen, since we always mix full chunks anyway.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 2c6087457b97e815ee094e7ed75ca79317a5d14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6087457b97e815ee094e7ed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:01 2012 -0500 dsound: Remove minlen, since we always mix full chunks anyway. --- dlls/dsound/mixer.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index ec5a264..81cbd02 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -609,10 +609,9 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * Returns: the length beyond the writepos that was mixed to. */ -static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) { - INT i, len; - DWORD minlen = 0; + INT i; IDirectSoundBufferImpl *dsb; /* unless we find a running buffer, all have stopped */ @@ -643,22 +642,13 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - len = DSOUND_MixOne(dsb, writepos, mixlen); - - if (!minlen) minlen = len; - - /* record the minimum length mixed from all buffers */ - /* we only want to return the length which *all* buffers have mixed */ - else if (len) minlen = (len < minlen) ? len : minlen; + DSOUND_MixOne(dsb, writepos, mixlen); *all_stopped = FALSE; } RtlReleaseResource(&dsb->lock); } } - - TRACE("Mixed at least %d from all buffers\n", minlen); - return minlen; } /** @@ -801,7 +791,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL recover = FALSE, all_stopped = FALSE; - DWORD playpos, writepos, writelead, maxq, frag, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; + DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; LPVOID buf1, buf2; int nfiller; @@ -873,19 +863,19 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); /* do the mixing */ - frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); + DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); - if (frag + writepos > device->buflen) + if (maxq + writepos > device->buflen) { DWORD todo = device->buflen - writepos; device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, todo); - device->normfunction(device->mix_buffer, device->buffer, frag - todo); + device->normfunction(device->mix_buffer, device->buffer, maxq - todo); } else - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, frag); + device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, maxq); /* update the mix position, taking wrap-around into account */ - device->mixpos = writepos + frag; + device->mixpos = writepos + maxq; device->mixpos %= device->buflen; /* update prebuff left */

1 0

Alexandre Julliard : ole32: Add a NULL pointer check in CoDisconnectObject.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 2736d28064437a470897bb9cb8688e354bb93908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2736d28064437a470897bb9cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 18:24:19 2012 +0200 ole32: Add a NULL pointer check in CoDisconnectObject. --- dlls/ole32/compobj.c | 2 ++ dlls/ole32/tests/marshal.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 72ba32a..ff8f961 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1557,6 +1557,8 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) TRACE("(%p, 0x%08x)\n", lpUnk, reserved); + if (!lpUnk) return E_INVALIDARG; + hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal); if (hr == S_OK) { diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c178912..91de43b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1331,6 +1331,9 @@ static void test_disconnect_stub(void) CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); ok_no_locks(); + + hr = CoDisconnectObject(NULL, 0); + ok( hr == E_INVALIDARG, "wrong status %x\n", hr ); } /* tests failure case of a same-thread marshal and unmarshal twice */

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012