Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat all the things. Have fun with merge conflicts.

Browse Source
This commit is contained in:
Pierre Bourdon committed 2016-06-24 10:43:46 +02:00
1 parent 2115e8a4a6
commit 3570c7f03a
1116 files changed
+187350 -180289
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/Core/HW/StreamADPCM.cpp
+35 -35
View File
@@ -4,13 +4,12 @@
// Adapted from in_cube by hcs & destop
#include "Core/HW/StreamADPCM.h"
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "Core/HW/StreamADPCM.h"
namespace StreamADPCM
{
// STATE_TO_SAVE (not saved yet!)
static s32 histl1;
static s32 histl2;
@@ -19,50 +18,51 @@ static s32 histr2;
static s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
{
s32 hist = 0;
switch (q >> 4)
{
case 0:
hist = 0;
break;
case 1:
hist = (hist1 * 0x3c);
break;
case 2:
hist = (hist1 * 0x73) - (hist2 * 0x34);
break;
case 3:
hist = (hist1 * 0x62) - (hist2 * 0x37);
break;
}
hist = MathUtil::Clamp((hist + 0x20) >> 6, -0x200000, 0x1fffff);
s32 hist = 0;
switch (q >> 4)
{
case 0:
hist = 0;
break;
case 1:
hist = (hist1 * 0x3c);
break;
case 2:
hist = (hist1 * 0x73) - (hist2 * 0x34);
break;
case 3:
hist = (hist1 * 0x62) - (hist2 * 0x37);
break;
}
hist = MathUtil::Clamp((hist + 0x20) >> 6, -0x200000, 0x1fffff);
s32 cur = (((s16)(bits << 12) >> (q & 0xf)) << 6) + hist;
s32 cur = (((s16)(bits << 12) >> (q & 0xf)) << 6) + hist;
hist2 = hist1;
hist1 = cur;
hist2 = hist1;
hist1 = cur;
cur >>= 6;
cur = MathUtil::Clamp(cur, -0x8000, 0x7fff);
cur >>= 6;
cur = MathUtil::Clamp(cur, -0x8000, 0x7fff);
return (s16)cur;
return (s16)cur;
}
void InitFilter()
{
histl1 = 0;
histl2 = 0;
histr1 = 0;
histr2 = 0;
histl1 = 0;
histl2 = 0;
histr1 = 0;
histr2 = 0;
}
void DecodeBlock(s16* pcm, const u8* adpcm)
{
for (int i = 0; i < SAMPLES_PER_BLOCK; i++)
{
pcm[i * 2] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] & 0xf, adpcm[0], histl1, histl2);
pcm[i * 2 + 1] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] >> 4, adpcm[1], histr1, histr2);
}
for (int i = 0; i < SAMPLES_PER_BLOCK; i++)
{
pcm[i * 2] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] & 0xf, adpcm[0],
histl1, histl2);
pcm[i * 2 + 1] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] >> 4, adpcm[1],
histr1, histr2);
}
}
}