actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no longer need to convert and deinterlace data

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-27 08:47:43 +00:00
parent 052eaa9a5e
commit 1258683aa4
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Resample_Good.cpp
+13 -27
View File
@@ -203,7 +203,7 @@ struct PolyphaseFilter
void Generate( const float *pFIR ); void Generate( const float *pFIR );
int RunPolyphaseFilter( State &State, const float *pIn, int iSamplesIn, int iDownFactor, int RunPolyphaseFilter( State &State, const float *pIn, int iSamplesIn, int iDownFactor,
float *pOut, int iSamplesOut ) const; float *pOut, int iSamplesOut, int iSampleStride ) const;
int GetLatency() const { return L/2; } int GetLatency() const { return L/2; }
int NumInputsForOutputSamples( const State &State, int iOut, int iDownFactor ) const; int NumInputsForOutputSamples( const State &State, int iOut, int iDownFactor ) const;
@@ -292,13 +292,14 @@ void PolyphaseFilter::Generate( const float *pFIR )
int PolyphaseFilter::RunPolyphaseFilter( int PolyphaseFilter::RunPolyphaseFilter(
State &State, State &State,
const float *pIn, int iSamplesIn, int iDownFactor, const float *pIn, int iSamplesIn, int iDownFactor,
float *pOut, int iSamplesOut ) const float *pOut, int iSamplesOut,
int iSampleStride ) const
{ {
ASSERT( iSamplesIn >= 0 ); ASSERT( iSamplesIn >= 0 );
float *pOutOrig = pOut; float *pOutOrig = pOut;
const float *pInEnd = pIn + iSamplesIn; const float *pInEnd = pIn + iSamplesIn*iSampleStride;
const float *pOutEnd = pOut + iSamplesOut; const float *pOutEnd = pOut + iSamplesOut*iSampleStride;
int iFilled = State.m_iFilled; int iFilled = State.m_iFilled;
int iPolyIndex = State.m_iPolyIndex; int iPolyIndex = State.m_iPolyIndex;
@@ -314,7 +315,7 @@ int PolyphaseFilter::RunPolyphaseFilter(
++State.m_iBufNext; ++State.m_iBufNext;
State.m_iBufNext &= L-1; State.m_iBufNext &= L-1;
++pIn; pIn += iSampleStride;
++iFilled; ++iFilled;
continue; continue;
} }
@@ -328,7 +329,7 @@ int PolyphaseFilter::RunPolyphaseFilter(
for( int j = 0; j < L; ++j ) for( int j = 0; j < L; ++j )
fTot += pInData[j]*pCurPoly[j]; fTot += pInData[j]*pCurPoly[j];
*pOut = fTot; *pOut = fTot;
++pOut; pOut += iSampleStride;
iPolyIndex += iDownFactor; iPolyIndex += iDownFactor;
if( iPolyIndex >= m_iUpFactor ) if( iPolyIndex >= m_iUpFactor )
@@ -341,7 +342,9 @@ int PolyphaseFilter::RunPolyphaseFilter(
State.m_iFilled = iFilled; State.m_iFilled = iFilled;
State.m_iPolyIndex = iPolyIndex; State.m_iPolyIndex = iPolyIndex;
return pOut - pOutOrig; int iRetSamples = pOut - pOutOrig;
int iRetFrames = iRetSamples / iSampleStride;
return iRetFrames;
} }
/* /*
@@ -489,9 +492,9 @@ public:
m_pPolyphase = GetFilter( m_iDownFactor ); m_pPolyphase = GetFilter( m_iDownFactor );
} }
int Run( const float *pIn, int iSamplesIn, float *pOut, int iSamplesOut ) const int Run( const float *pIn, int iSamplesIn, float *pOut, int iSamplesOut, int iSampleStride ) const
{ {
return m_pPolyphase->RunPolyphaseFilter( *m_pState, pIn, iSamplesIn, m_iDownFactor, pOut, iSamplesOut ); return m_pPolyphase->RunPolyphaseFilter( *m_pState, pIn, iSamplesIn, m_iDownFactor, pOut, iSamplesOut, iSampleStride );
} }
void Reset() void Reset()
@@ -669,28 +672,11 @@ int RageSoundReader_Resample_Good::Read( float *pBuf, int iFrames )
if( iFramesIn < 0 ) if( iFramesIn < 0 )
return iFramesIn; return iFramesIn;
const int iSamplesIn = iFramesIn * iChannels;
float *pFloatBuf = (float *) alloca( iFramesIn * sizeof(float) );
float *pFloatOut = (float *) alloca( iFrames * sizeof(float) );
for( int iChannel = 0; iChannel < iChannels; ++iChannel ) for( int iChannel = 0; iChannel < iChannels; ++iChannel )
{ {
{ int iGotFrames = m_apResamplers[iChannel]->Run( pTmpBuf, iFramesIn + iChannel, pBuf + iChannel, iFrames, iChannels );
float *pBufIn = pTmpBuf + iChannel;
float *pBufOut = pFloatBuf;
for( int i = 0; i < iSamplesIn; i += iChannels )
*(pBufOut++) = (float) pBufIn[i];
}
int iGotFrames = m_apResamplers[iChannel]->Run( pFloatBuf, iFramesIn, pFloatOut, iFrames );
ASSERT( iGotFrames <= iFrames ); ASSERT( iGotFrames <= iFrames );
float *pBufOut = pBuf + iChannel;
for( int i = 0; i < iGotFrames; ++i )
{
*pBufOut = pFloatOut[i];
pBufOut += iChannels;
}
if( iChannel == 0 ) if( iChannel == 0 )
iFramesRead += iGotFrames; iFramesRead += iGotFrames;
} }