From b866de3a85cf01e37e50b87b54dbc27ee19c8f7f Mon Sep 17 00:00:00 2001 From: =?utf-8?q?J=C3=B6rg=20H=C3=B6hle?= Date: Tue, 10 Nov 2009 22:45:06 +0100 Subject: [PATCH] msg711: Correct wave format parameters remove stuttering. --- dlls/msg711.acm/msg711.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 203942d..d527e91 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -832,16 +832,16 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs) switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; break; case WAVE_FORMAT_ALAW: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; - adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; case WAVE_FORMAT_MULAW: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; - adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; default: FIXME("\n"); @@ -993,13 +993,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) { - adss->cbSrcLength = adss->cbDstLength / 2; + adss->cbSrcLength = adss->cbDstLength * 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - adss->cbSrcLength = adss->cbDstLength * 2; + adss->cbSrcLength = adss->cbDstLength / 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && @@ -1019,13 +1019,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) { - adss->cbDstLength = adss->cbSrcLength * 2; + adss->cbDstLength = adss->cbSrcLength / 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - adss->cbDstLength = adss->cbSrcLength / 2; + adss->cbDstLength = adss->cbSrcLength * 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && -- 1.5.6.3