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

simplify; make KSPIN_CONNECT on demand

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-07 02:12:03 +00:00
parent 0a6bc88a7c
commit 0e8b6ed2e8
1 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_WDMKS.cpp
+30 -35
View File
@@ -30,31 +30,23 @@ struct WinWdmPin
m_hHandle = NULL; m_hHandle = NULL;
m_pParentFilter = pParentFilter; m_pParentFilter = pParentFilter;
m_iPinId = iPinId; m_iPinId = iPinId;
/* Set up the default m_pPinConnect. */
m_pPinConnect = NULL;
WAVEFORMATEX fmt;
memset( &fmt, 0, sizeof(WAVEFORMATEX) );
SetFormat( &fmt );
} }
~WinWdmPin() ~WinWdmPin()
{ {
Close(); Close();
free( m_pPinConnect );
} }
bool Instantiate( RString &sError ); bool Instantiate( const WAVEFORMATEX *pFormat, RString &sError );
void Close(); void Close();
bool SetState( KSSTATE state, RString &sError ); bool SetState( KSSTATE state, RString &sError );
void SetFormat( const WAVEFORMATEX* format ); KSPIN_CONNECT *MakeFormat( const WAVEFORMATEX *pFormat ) const;
bool IsFormatSupported( const WAVEFORMATEX *pFormat ) const; bool IsFormatSupported( const WAVEFORMATEX *pFormat ) const;
HANDLE m_hHandle; HANDLE m_hHandle;
WinWdmFilter *m_pParentFilter; WinWdmFilter *m_pParentFilter;
int m_iPinId; int m_iPinId;
KSPIN_CONNECT *m_pPinConnect;
vector<KSDATARANGE_AUDIO> m_dataRangesItem; vector<KSDATARANGE_AUDIO> m_dataRangesItem;
}; };
@@ -442,12 +434,21 @@ bool WinWdmPin::SetState( KSSTATE state, RString &sError )
&state, sizeof(state), NULL, 0, sError ); &state, sizeof(state), NULL, 0, sError );
} }
bool WinWdmPin::Instantiate( RString &sError ) bool WinWdmPin::Instantiate( const WAVEFORMATEX *pFormat, RString &sError )
{ {
if( !IsFormatSupported(pFormat) )
{
sError = "format not supported";
return false;
}
if( !m_pParentFilter->Use(sError) ) if( !m_pParentFilter->Use(sError) )
return false; return false;
DWORD iRet = FunctionKsCreatePin( m_pParentFilter->m_hHandle, m_pPinConnect, GENERIC_WRITE | GENERIC_READ, &m_hHandle ); KSPIN_CONNECT *pPinConnect = MakeFormat( pFormat );
DWORD iRet = FunctionKsCreatePin( m_pParentFilter->m_hHandle, pPinConnect, GENERIC_WRITE | GENERIC_READ, &m_hHandle );
free( pPinConnect );
if( iRet == ERROR_SUCCESS ) if( iRet == ERROR_SUCCESS )
return true; return true;
@@ -457,7 +458,7 @@ bool WinWdmPin::Instantiate( RString &sError )
return false; return false;
} }
void WinWdmPin::SetFormat( const WAVEFORMATEX *pFormat ) KSPIN_CONNECT *WinWdmPin::MakeFormat( const WAVEFORMATEX *pFormat ) const
{ {
ASSERT( pFormat != NULL ); ASSERT( pFormat != NULL );
@@ -465,22 +466,22 @@ void WinWdmPin::SetFormat( const WAVEFORMATEX *pFormat )
unsigned long iDataFormatSize = sizeof(KSDATAFORMAT) + iWfexSize; unsigned long iDataFormatSize = sizeof(KSDATAFORMAT) + iWfexSize;
unsigned long iSize = sizeof(KSPIN_CONNECT) + iDataFormatSize; unsigned long iSize = sizeof(KSPIN_CONNECT) + iDataFormatSize;
m_pPinConnect = (KSPIN_CONNECT *) realloc( m_pPinConnect, iSize ); KSPIN_CONNECT *pPinConnect = (KSPIN_CONNECT *) malloc( iSize );
ASSERT( m_pPinConnect != NULL ); ASSERT( pPinConnect != NULL );
memset( m_pPinConnect, 0, iSize ); memset( pPinConnect, 0, iSize );
m_pPinConnect->PinId = m_iPinId; pPinConnect->PinId = m_iPinId;
m_pPinConnect->Interface.Set = KSINTERFACESETID_Standard; pPinConnect->Interface.Set = KSINTERFACESETID_Standard;
m_pPinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; pPinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING;
m_pPinConnect->Interface.Flags = 0; pPinConnect->Interface.Flags = 0;
m_pPinConnect->Medium.Set = KSMEDIUMSETID_Standard; pPinConnect->Medium.Set = KSMEDIUMSETID_Standard;
m_pPinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; pPinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE;
m_pPinConnect->Medium.Flags = 0; pPinConnect->Medium.Flags = 0;
m_pPinConnect->PinToHandle = NULL; pPinConnect->PinToHandle = NULL;
m_pPinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; pPinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL;
m_pPinConnect->Priority.PrioritySubClass = 1; pPinConnect->Priority.PrioritySubClass = 1;
KSDATAFORMAT_WAVEFORMATEX *ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX *)(m_pPinConnect + 1); KSDATAFORMAT_WAVEFORMATEX *ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX *)(pPinConnect + 1);
ksDataFormatWfx->DataFormat.Flags = 0; ksDataFormatWfx->DataFormat.Flags = 0;
ksDataFormatWfx->DataFormat.Reserved = 0; ksDataFormatWfx->DataFormat.Reserved = 0;
ksDataFormatWfx->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; ksDataFormatWfx->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO;
@@ -490,6 +491,7 @@ void WinWdmPin::SetFormat( const WAVEFORMATEX *pFormat )
memcpy( &ksDataFormatWfx->WaveFormatEx, pFormat, iWfexSize ); memcpy( &ksDataFormatWfx->WaveFormatEx, pFormat, iWfexSize );
ksDataFormatWfx->DataFormat.SampleSize = (unsigned short)(pFormat->nChannels * (pFormat->wBitsPerSample / 8)); ksDataFormatWfx->DataFormat.SampleSize = (unsigned short)(pFormat->nChannels * (pFormat->wBitsPerSample / 8));
return pPinConnect;
} }
bool WinWdmPin::IsFormatSupported( const WAVEFORMATEX *pFormat ) const bool WinWdmPin::IsFormatSupported( const WAVEFORMATEX *pFormat ) const
@@ -613,14 +615,7 @@ WinWdmPin *WinWdmFilter::InstantiateRenderPin( const WAVEFORMATEX *wfex, RString
for( size_t i = 0; i < m_apPins.size(); ++i ) for( size_t i = 0; i < m_apPins.size(); ++i )
{ {
WinWdmPin *pPin = m_apPins[i]; WinWdmPin *pPin = m_apPins[i];
if( pPin->Instantiate(wfex, sError) )
if( !pPin->IsFormatSupported(wfex) )
continue;
pPin->SetFormat( wfex );
RString sError;
if( pPin->Instantiate(sError) )
{ {
sError = ""; sError = "";
return pPin; return pPin;