Skip to content

W
wine-winehq
Commit 7630a6f0 authored by Jörg Höhle's avatar Jörg Höhle Committed by Alexandre Julliard
Browse files
Options

msg711: Correct wave format parameters to remove stuttering.

parent efda021c
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
dlls/msg711.acm/msg711.c
View file @ 7630a6f0
...@@ -832,16 +832,16 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs) ...@@ -832,16 +832,16 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs)
switch (adfs->pwfxDst->wFormatTag) switch (adfs->pwfxDst->wFormatTag)
{ {
case WAVE_FORMAT_PCM: 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; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign;
break; break;
case WAVE_FORMAT_ALAW: case WAVE_FORMAT_ALAW:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels;
break; break;
case WAVE_FORMAT_MULAW: case WAVE_FORMAT_MULAW:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels;
break; break;
default: default:
FIXME("\n"); FIXME("\n");
...@@ -993,13 +993,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI ...@@ -993,13 +993,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI
(adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW))
{ {
adss->cbSrcLength = adss->cbDstLength / 2; adss->cbSrcLength = adss->cbDstLength * 2;
} }
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
{ {
adss->cbSrcLength = adss->cbDstLength * 2; adss->cbSrcLength = adss->cbDstLength / 2;
} }
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
...@@ -1019,13 +1019,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI ...@@ -1019,13 +1019,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI
(adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW))
{ {
adss->cbDstLength = adss->cbSrcLength * 2; adss->cbDstLength = adss->cbSrcLength / 2;
} }
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
{ {
adss->cbDstLength = adss->cbSrcLength / 2; adss->cbDstLength = adss->cbSrcLength * 2;
} }
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment