[IMAADP32.ACM] Sync with Wine Staging 2.2. CORE-12823

1a6d3c1 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.

svn path=/trunk/; revision=73950
This commit is contained in:
Amine Khaldi 2017-02-26 17:32:01 +00:00
parent bb98fff5c2
commit 3f8b42f823
2 changed files with 7 additions and 9 deletions

View file

@ -433,29 +433,27 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi,
/* generate header */
sampleL = R16(src); src += 2;
W16(dst, sampleL); dst += 2;
*dst = (unsigned char)(unsigned)stepIndexL;
dst += 2;
W16(dst, stepIndexL); dst += 2;
sampleR = R16(src); src += 2;
W16(dst, sampleR); dst += 2;
*dst = (unsigned char)(unsigned)stepIndexR;
dst += 2;
W16(dst, stepIndexR); dst += 2;
for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 8)
{
for (i = 0; i < 4; i++)
{
code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 0),
code1 = generate_nibble(R16(src + (4 * i + 0) * 2),
&stepIndexL, &sampleL);
code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 0),
code2 = generate_nibble(R16(src + (4 * i + 2) * 2),
&stepIndexL, &sampleL);
*dst++ = (code1 << 4) | code2;
}
for (i = 0; i < 4; i++)
{
code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 1),
code1 = generate_nibble(R16(src + (4 * i + 1) * 2),
&stepIndexR, &sampleR);
code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 1),
code2 = generate_nibble(R16(src + (4 * i + 3) * 2),
&stepIndexR, &sampleR);
*dst++ = (code1 << 4) | code2;
}

View file

@ -75,7 +75,7 @@ reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16
reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11
reactos/dll/win32/iccvid # Synced to WineStaging-2.2
reactos/dll/win32/ieframe # Synced to WineStaging-2.2
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2
reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11
reactos/dll/win32/imm32 # Synced to Wine-1.7.27
reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.23