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

spu2-x: Remove Decoder.cpp. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3886 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-10-07 09:17:50 +00:00
parent 10d04f4122
commit c7c64ee7f1
8 changed files with 1 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/spu2-x/src/CMakeLists.txt
View File

@ -41,7 +41,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
set(spu2xSources set(spu2xSources
ADSR.cpp ADSR.cpp
Debug.cpp Debug.cpp
Decoder.cpp
Dma.cpp Dma.cpp
iconvert.cpp iconvert.cpp
Lowpass.cpp Lowpass.cpp
@ -124,9 +123,6 @@ target_link_libraries(${Output} ${PORTAUDIO_LIBRARIES})
# link target with SoundTouch # link target with SoundTouch
target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES}) target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})
# link target with A52
target_link_libraries(${Output} ${A52_LIBRARIES})
# User flags options # User flags options
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")

404
plugins/spu2-x/src/Decoder.cpp
View File

@ -1,404 +0,0 @@
//GiGaHeRz's SPU2 Driver
//Copyright (c) 2003-2008, David Quintana <gigaherz@gmail.com>
//
//This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public
//License as published by the Free Software Foundation; either
//version 2.1 of the License, or (at your option) any later version.
//
//This library is distributed in the hope that it will be useful,
//but WITHOUT ANY WARRANTY; without even the implied warranty of
//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
//Lesser General Public License for more details.
//
//You should have received a copy of the GNU Lesser General Public
//License along with this library; if not, write to the Free Software
//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
#include "Global.h"
// Commenting this will disable all the code in Decoder.cpp (which is the only code that uses liba52 in spu2-x.)
#ifndef ENABLE_DECODER
# define ENABLE_DECODER 1
#endif
#if ENABLE_DECODER
extern "C" {
#ifdef _MSC_VER
# include "liba52/inttypes.h"
# include "liba52/a52.h"
# include "liba52/mm_accel.h"
#else
# include <inttypes.h>
# include "a52dec/a52.h"
# include "a52dec/mm_accel.h"
#endif
}
extern u32 spdif_read_data(u8 *buff, u32 max_data);
#define DATA_SIZE 0x100000
u32 use51=0;
u8 databuffer[DATA_SIZE];
u32 data_in_buffer;
s32 output_buffer[0x10000][6];
s32 output_write_cursor=0;
s32 output_read_cursor=0;
s32 output_buffer_data=0;
int flags,srate,bitrate;
#define CHANNEL_CENTER 1
#define CHANNEL_STEREO 2
#define CHANNEL_SURROUND 4
#define CHANNEL_LFE 8
int sample_flags = 0;
u32 frame_size;
a52_state_t* ac3dec;
sample_t *decode_buffer = NULL;
s32 data_rate=4;
int state=0;
FILE *fSpdifDump;
union spdif_frame { // total size: 32bits
struct {
u32 preamble:4; //4
u32 databits:24; //28
u32 valid:1; //29
u32 subcode:1; //30
u32 chanstat:1; //31
u32 parity:1; //32 // parity not including preamble
} bits;
u32 whole;
};
union spdif_block {
spdif_frame frames[192];
u8 bytes [192*4];
};
/*
spdif_block bbuffer[2];
u8 *bbuff = bbuffer[0].bytes;
u32 bbuff_bytes = 0;
*/
bool check_frame(spdif_frame f)
{
u32 w = f.whole>>4;
u32 t = 0;
for(int i=0;i>28;i++)
{
t=t^(w&1);
w>>=1;
}
return (t==0)&&(f.bits.valid);
}
void spdif_Write(s32 data)
{
spdif_frame f;
f.whole=data;
if(check_frame(f))
{
int dec = f.bits.databits;
databuffer[data_in_buffer++]=(dec )&0xFF;
databuffer[data_in_buffer++]=(dec>> 8)&0xFF;
databuffer[data_in_buffer++]=(dec>>16)&0xFF;
}
}
void spdif_remove_data(unsigned int bytes)
{
if(bytes<data_in_buffer)
{
memcpy(databuffer,databuffer+bytes,data_in_buffer-bytes);
}
data_in_buffer-=bytes;
}
s32 stoi(sample_t n) //input: [-1..1]
{
s32 sign=(n<0) + (n>0)*-1; //1 if positive, -1 if negative, 0 otherwise
n=abs(n)+1; //make it [1..2]
s32 k=*(s32*)&n;
k=k&0x7FFFFF;
return k*sign;
}
void spdif_update()
{
for(int i=0;i<data_rate;i++)
{
// Source is Core 0
// .. and Right side data should be zero / ignored
StereoOut32 Data( Cores[0].ReadInput_HiFi() );
if(fSpdifDump)
{
fwrite(&Data.Left,4,1,fSpdifDump);
fwrite(&Data.Right,4,1,fSpdifDump); // zero side.
}
if(ac3dec)
spdif_Write(Data.Left);
}
if(!ac3dec) return;
if(state==0)
{
if(data_in_buffer<7) return;
if(databuffer[0]!=0)
{
flags=0;
}
frame_size = a52_syncinfo (databuffer, &flags, &srate, &bitrate);
if(frame_size==0)
{
spdif_remove_data(1);
}
else
{
state=1;
}
}
if(state==1)
{
if(data_in_buffer<frame_size) return;
flags = A52_ADJUST_LEVEL;
if(use51) flags|=A52_3F2R|A52_LFE;
else flags|=A52_STEREO;
sample_t level=1;
a52_frame(ac3dec,databuffer,&flags,&level,0);
//decode
for(int i=0;i<6;i++)
{
a52_block(ac3dec);
// processing
for(int j=0;j<256;j++)
{
s32* samples = output_buffer[output_write_cursor];
sample_flags=0;
int output_cursor=j;
int n=0;
if(flags&A52_LFE)
{
sample_flags|=CHANNEL_LFE;
samples[3] = stoi(decode_buffer[(0<<8)+output_cursor]); //lfe
n=1;
}
switch(flags&(~A52_LFE))
{
case A52_STEREO:
sample_flags |= CHANNEL_STEREO;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //r
samples[2] = 0; //c
samples[4] = 0; //sl
samples[5] = 0; //sr
break;
case A52_2F1R:
sample_flags |= CHANNEL_STEREO|CHANNEL_SURROUND;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //r
samples[2] = 0; //c
samples[4] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sl
samples[5] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sr
break;
case A52_2F2R:
sample_flags |= CHANNEL_STEREO|CHANNEL_SURROUND;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //r
samples[2] = 0; //c
samples[4] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sl
samples[5] = stoi(decode_buffer[((n+3)<<8)+output_cursor]); //sr
break;
case A52_3F:
sample_flags |= CHANNEL_STEREO|CHANNEL_CENTER;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //r
samples[2] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //c
samples[4] = 0; //sl
samples[5] = 0; //sr
break;
case A52_3F1R:
sample_flags |= CHANNEL_STEREO|CHANNEL_SURROUND|CHANNEL_CENTER;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //r
samples[2] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //c
samples[4] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sl
samples[5] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sr
break;
case A52_3F2R:
sample_flags |= CHANNEL_STEREO|CHANNEL_SURROUND|CHANNEL_CENTER;
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //r
samples[2] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //c
samples[4] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sl
samples[5] = stoi(decode_buffer[((n+2)<<8)+output_cursor]); //sr
break;
default:
samples[0] = stoi(decode_buffer[((n+0)<<8)+output_cursor]); //l
samples[1] = stoi(decode_buffer[((n+1)<<8)+output_cursor]); //r
samples[2] = 0; //c
samples[4] = 0; //sl
samples[5] = 0; //sr
break;
}
output_write_cursor=(output_write_cursor+1)&0xFFFF;
output_buffer_data++;
}
}
spdif_remove_data(frame_size);
}
}
u32 spdif_init()
{
data_rate=1; // words/tick
ac3dec = a52_init(0);
if(!ac3dec) return 1;
decode_buffer = a52_samples(ac3dec);
a52_dynrng (ac3dec, NULL, NULL);
data_in_buffer=0;
fSpdifDump = fopen("logs/spdif.dat","wb");
return 0;
}
void spdif_set51(u32 is_5_1_out)
{
use51 = is_5_1_out;
}
void spdif_shutdown()
{
if(ac3dec) a52_free(ac3dec);
ac3dec=NULL;
if(fSpdifDump)
fclose(fSpdifDump);
}
int spdif_decode_one(s32 *channels)
{
channels[0]=0;
channels[1]=0;
channels[2]=0;
channels[3]=0;
channels[4]=0;
channels[5]=0;
if(output_buffer_data==0) return 0;
memcpy(channels,output_buffer[output_read_cursor],4*6);
output_read_cursor=(output_read_cursor+1)&0xFFFF;
output_buffer_data--;
return sample_flags;
}
void spdif_get_samples(s32*samples)
{
s32 channels[6];
s32 flags = spdif_decode_one(channels);
if(use51)
{
samples[0]=0;
samples[1]=0;
samples[2]=0;
samples[3]=0;
samples[4]=0;
samples[5]=0;
if(flags&CHANNEL_STEREO)
{
samples[0]=channels[0];
samples[1]=channels[1];
}
if(flags&CHANNEL_CENTER)
{
samples[2]=channels[2];
}
if(flags&CHANNEL_LFE)
{
samples[3]=channels[3];
}
if(flags&CHANNEL_SURROUND)
{
samples[4]=channels[4];
samples[5]=channels[5];
}
}
else // downmix to stereo (no DPL2 encoding... yet ;)
{
samples[0]=0;
samples[1]=0;
if(flags&CHANNEL_STEREO)
{
samples[0]=channels[0];
samples[1]=channels[1];
}
if(flags&CHANNEL_CENTER)
{
samples[0]+=channels[2];
samples[1]+=channels[2];
}
if(flags&CHANNEL_LFE)
{
samples[0]+=channels[3];
samples[1]+=channels[3];
}
if(flags&CHANNEL_SURROUND)
{
samples[0]+=channels[4];
samples[1]+=channels[5];
}
}
}
#else
u32 spdif_init() { return 1; }
void spdif_update() {}
void spdif_shutdown() {}
void spdif_set51(u32 is_5_1_out) {}
#endif

8
plugins/spu2-x/src/Mixer.cpp
View File

@ -17,10 +17,6 @@
#include "Global.h" #include "Global.h"
//#include <float.h>
extern void spdif_update();
void ADMAOutLogWrite(void *lpData, u32 ulSize); void ADMAOutLogWrite(void *lpData, u32 ulSize);
static const s32 tbl_XA_Factor[5][2] = static const s32 tbl_XA_Factor[5][2] =
@ -786,10 +782,6 @@ __forceinline void Mix()
Out = clamp_mix( Out, SndOutVolumeShift ); Out = clamp_mix( Out, SndOutVolumeShift );
} }
// Update spdif (called each sample)
if(PlayMode&4)
spdif_update();
SndBuffer::Write( Out ); SndBuffer::Write( Out );
// Update AutoDMA output positioning // Update AutoDMA output positioning

3
plugins/spu2-x/src/PS2E-spu2.cpp
View File

@ -434,7 +434,7 @@ EXPORT_C_(s32) SPU2open(void *pDsp)
try try
{ {
SndBuffer::Init(); SndBuffer::Init();
spdif_init();
#ifndef __LINUX__ #ifndef __LINUX__
DspLoadLibrary(dspPlugin,dspPluginModule); DspLoadLibrary(dspPlugin,dspPluginModule);
#endif #endif
@ -460,7 +460,6 @@ EXPORT_C_(void) SPU2close()
DspCloseLibrary(); DspCloseLibrary();
#endif #endif
spdif_shutdown();
SndBuffer::Cleanup(); SndBuffer::Cleanup();
} }

3
plugins/spu2-x/src/SndOut.cpp
View File

@ -284,9 +284,6 @@ void SndBuffer::Init()
soundtouchInit(); // initializes the timestretching soundtouchInit(); // initializes the timestretching
// some crap
spdif_set51(mods[OutputModule]->Is51Out());
// initialize module // initialize module
if( mods[OutputModule]->Init() == -1 ) _InitFail(); if( mods[OutputModule]->Init() == -1 ) _InitFail();
} }

1
plugins/spu2-x/src/Windows/Spu2-X.vcxproj
View File

@ -376,7 +376,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\SndOut_Portaudio.cpp" /> <ClCompile Include="..\SndOut_Portaudio.cpp" />
<ClCompile Include="..\decoder.cpp" />
<ClCompile Include="..\3rdparty\liba52\bit_allocate.c"> <ClCompile Include="..\3rdparty\liba52\bit_allocate.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugStrict|Win32'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugStrict|Win32'">
</PrecompiledHeader> </PrecompiledHeader>

4
plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
View File

@ -668,10 +668,6 @@
<Filter <Filter
Name="decoder" Name="decoder"
> >
<File
RelativePath="..\decoder.cpp"
>
</File>
<File <File
RelativePath="..\spdif.h" RelativePath="..\spdif.h"
> >

5
plugins/spu2-x/src/defs.h
View File

@ -534,11 +534,6 @@ extern void StartVoices(int core, u32 value);
extern void StopVoices(int core, u32 value); extern void StopVoices(int core, u32 value);
extern void InitADSR(); extern void InitADSR();
extern void CalculateADSR( V_Voice& vc ); extern void CalculateADSR( V_Voice& vc );
extern void spdif_set51(u32 is_5_1_out);
extern u32 spdif_init();
extern void spdif_shutdown();
extern void spdif_get_samples(s32 *samples); // fills the buffer with [l,r,c,lfe,sl,sr] if using 5.1 output, or [l,r] if using stereo
extern void UpdateSpdifMode(); extern void UpdateSpdifMode();
namespace Savestate namespace Savestate