[xiph-commits] r8056 - in trunk/oggdsf/src/lib: codecs/flac/filters/dsfFLACDecoder core/directshow/dsfAbstractAudioDecoder

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-19 04:39:06 -0700 (Tue, 19 Oct 2004)
New Revision: 8056

Modified:
   trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.h
Log:
* Make naming convention consistnet
* Reordered a method.

Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp	2004-10-19 10:24:24 UTC (rev 8055)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp	2004-10-19 11:39:06 UTC (rev 8056)
@@ -180,7 +180,7 @@
 
 
 STDMETHODIMP FLACDecodeInputPin::BeginFlush() {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	
 	//debugLog<<"BeginFlush : Calling flush on the codec."<<endl;
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp	2004-10-19 10:24:24 UTC (rev 8055)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp	2004-10-19 11:39:06 UTC (rev 8056)
@@ -42,11 +42,12 @@
 	,	mFrameSize(0)
 	,	mNumChannels(0)
 	,	mSampleRate(0)
-	,	mFilterLock(inFilterLock)
+	//,	mFilterLock(inFilterLock)
 	,	mLastSeenStartGranPos(0)
 	,	mSeekTimeBase(0)
 	,	mChainTimeBase(0)
 {
+	
 	//ConstructCodec();
 	//debugLog.open("g:\\logs\\aad.log", ios_base::out);
 	mAcceptableMediaType = inAcceptMediaType;
@@ -90,13 +91,13 @@
 }
 
 HRESULT AbstractAudioDecodeInputPin::BreakConnect() {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	//Need a lock ??
 	ReleaseDelegate();
 	return CBaseInputPin::BreakConnect();
 }
 HRESULT AbstractAudioDecodeInputPin::CompleteConnect (IPin *inReceivePin) {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	
 	IMediaSeeking* locSeeker = NULL;
 	inReceivePin->QueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
@@ -211,12 +212,12 @@
 }
 
 STDMETHODIMP AbstractAudioDecodeInputPin::BeginFlush() {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	CBaseInputPin::BeginFlush();
 	return mParentFilter->mOutputPin->DeliverBeginFlush();
 }
 STDMETHODIMP AbstractAudioDecodeInputPin::EndFlush() {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	mParentFilter->mOutputPin->DeliverEndFlush();
 	
 	return CBaseInputPin::EndFlush();

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h	2004-10-19 10:24:24 UTC (rev 8055)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h	2004-10-19 11:39:06 UTC (rev 8056)
@@ -103,7 +103,7 @@
 
 	//fstream debugLog;
 	CCritSec* mStreamLock;
-	CCritSec* mFilterLock;
+	//CCritSec* mFilterLock;
 
 	unsigned long mFrameSize;
 	unsigned long mNumChannels;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.cpp	2004-10-19 10:24:24 UTC (rev 8055)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.cpp	2004-10-19 11:39:06 UTC (rev 8056)
@@ -35,7 +35,7 @@
 AbstractAudioDecodeOutputPin::AbstractAudioDecodeOutputPin(AbstractAudioDecodeFilter* inParentFilter, CCritSec* inFilterLock, CHAR* inObjectName, LPCWSTR inPinDisplayName)
 	:	CBaseOutputPin(inObjectName, inParentFilter, inFilterLock, &mHR, inPinDisplayName)
 	,	mParentFilter(inParentFilter)
-	,	mFilterLock(inFilterLock)
+	//,	mFilterLock(inFilterLock)
 	,	mDataQueue(NULL)
 {
 	
@@ -158,22 +158,23 @@
 }
 
 HRESULT AbstractAudioDecodeOutputPin::DeliverEndFlush(void) {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	//QUERY::: Locks ??
 	mDataQueue->EndFlush();
     return S_OK;
 }
 
 HRESULT AbstractAudioDecodeOutputPin::DeliverBeginFlush(void) {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	//QUERY:: Locks ???
+	
 	mDataQueue->BeginFlush();
     return S_OK;
 	
 }
 
 HRESULT AbstractAudioDecodeOutputPin::CompleteConnect (IPin *inReceivePin) {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
 	HRESULT locHR = S_OK;
 
 	//Here when another pin connects to us, we internally connect the seek delegate
@@ -192,10 +193,11 @@
 }
 
 HRESULT AbstractAudioDecodeOutputPin::BreakConnect(void) {
-	CAutoLock locLock(mFilterLock);
+	CAutoLock locLock(m_pLock);
+	delete mDataQueue;
+	mDataQueue = NULL;
+
 	HRESULT locHR = CBaseOutputPin::BreakConnect();
 	ReleaseDelegate();
-	delete mDataQueue;
-	mDataQueue = NULL;
 	return locHR;
 }
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.h	2004-10-19 10:24:24 UTC (rev 8055)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeOutputPin.h	2004-10-19 11:39:06 UTC (rev 8056)
@@ -68,7 +68,7 @@
 	AbstractAudioDecodeFilter* mParentFilter;
 	void FillMediaType(CMediaType* inMediaType);
 
-	CCritSec* mFilterLock;
+	//CCritSec* mFilterLock;
 
 	static const int BUFF_SIZE = 65536;
	static const int BUFF_COUNT = 5;