ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3137 from lioncash/namespace 

StreamADPCM: Convert into a namespace
This commit is contained in:
flacs 2015-10-11 15:27:45 +02:00
parent a9d6448777 737de5e115
commit fe164e3a90
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -375,15 +375,15 @@ static u32 ProcessDTKSamples(short *tempPCM, u32 num_samples)
break; break;
} }
NGCADPCM::InitFilter(); StreamADPCM::InitFilter();
} }
u8 tempADPCM[NGCADPCM::ONE_BLOCK_SIZE]; u8 tempADPCM[StreamADPCM::ONE_BLOCK_SIZE];
// TODO: What if we can't read from AudioPos? // TODO: What if we can't read from AudioPos?
s_inserted_volume->Read(AudioPos, sizeof(tempADPCM), tempADPCM, false); s_inserted_volume->Read(AudioPos, sizeof(tempADPCM), tempADPCM, false);
AudioPos += sizeof(tempADPCM); AudioPos += sizeof(tempADPCM);
NGCADPCM::DecodeBlock(tempPCM + samples_processed * 2, tempADPCM); StreamADPCM::DecodeBlock(tempPCM + samples_processed * 2, tempADPCM);
samples_processed += NGCADPCM::SAMPLES_PER_BLOCK; samples_processed += StreamADPCM::SAMPLES_PER_BLOCK;
} while (samples_processed < num_samples); } while (samples_processed < num_samples);
for (unsigned i = 0; i < samples_processed * 2; ++i) for (unsigned i = 0; i < samples_processed * 2; ++i)
{ {
@ -1184,7 +1184,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
CurrentStart = NextStart; CurrentStart = NextStart;
CurrentLength = NextLength; CurrentLength = NextLength;
AudioPos = CurrentStart; AudioPos = CurrentStart;
NGCADPCM::InitFilter(); StreamADPCM::InitFilter();
g_bStream = true; g_bStream = true;
} }
} }

9
Source/Core/Core/HW/StreamADPCM.cpp
View File

@ -7,6 +7,9 @@
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Core/HW/StreamADPCM.h" #include "Core/HW/StreamADPCM.h"
namespace StreamADPCM
{
// STATE_TO_SAVE (not saved yet!) // STATE_TO_SAVE (not saved yet!)
static s32 histl1; static s32 histl1;
static s32 histl2; static s32 histl2;
@ -44,7 +47,7 @@ static s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
return (s16)cur; return (s16)cur;
} }
void NGCADPCM::InitFilter() void InitFilter()
{ {
histl1 = 0; histl1 = 0;
histl2 = 0; histl2 = 0;
@ -52,7 +55,7 @@ void NGCADPCM::InitFilter()
histr2 = 0; histr2 = 0;
} }
void NGCADPCM::DecodeBlock(s16 *pcm, const u8 *adpcm) void DecodeBlock(s16* pcm, const u8* adpcm)
{ {
for (int i = 0; i < SAMPLES_PER_BLOCK; i++) for (int i = 0; i < SAMPLES_PER_BLOCK; i++)
{ {
@ -60,3 +63,5 @@ void NGCADPCM::DecodeBlock(s16 *pcm, const u8 *adpcm)
pcm[i * 2 + 1] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] >> 4, adpcm[1], histr1, histr2); pcm[i * 2 + 1] = ADPDecodeSample(adpcm[i + (ONE_BLOCK_SIZE - SAMPLES_PER_BLOCK)] >> 4, adpcm[1], histr1, histr2);
} }
} }
}

19
Source/Core/Core/HW/StreamADPCM.h
View File

@ -8,15 +8,16 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
class NGCADPCM namespace StreamADPCM
{ {
public:
enum
{
ONE_BLOCK_SIZE = 32,
SAMPLES_PER_BLOCK = 28
};
static void InitFilter(); enum
static void DecodeBlock(s16 *pcm, const u8 *adpcm); {
ONE_BLOCK_SIZE = 32,
SAMPLES_PER_BLOCK = 28
}; };
void InitFilter();
void DecodeBlock(s16* pcm, const u8* adpcm);
}