[xiph-commits] r7787 - in trunk/oggdsf/src/lib:
codecs/theora/filters/dsfTheoraDecoder core/directshow/dsfOggDemux
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sat Sep 18 07:50:26 PDT 2004
Author: illiminable
Date: 2004-09-18 07:50:25 -0700 (Sat, 18 Sep 2004)
New Revision: 7787
Modified:
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
Log:
* Undebuggify for release.
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-18 14:50:25 UTC (rev 7787)
@@ -36,16 +36,16 @@
TheoraDecodeInputPin::TheoraDecodeInputPin(CTransformFilter* inParentFilter, HRESULT* outHR)
: CTransformInputPin(NAME("Theora Input Pin"), inParentFilter, outHR, L"Theora In")
{
- debugLog.open("G:\\logs\\theoinput.log", ios_base::out);
+ //debugLog.open("G:\\logs\\theoinput.log", ios_base::out);
}
TheoraDecodeInputPin::~TheoraDecodeInputPin() {
- debugLog.close();
+ //debugLog.close();
}
STDMETHODIMP TheoraDecodeInputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
- debugLog<<"Querying interface"<<endl;
+ //debugLog<<"Querying interface"<<endl;
if (riid == IID_IMediaSeeking) {
- debugLog<<"Got Seeker"<<endl;
+ //debugLog<<"Got Seeker"<<endl;
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
@@ -57,18 +57,18 @@
HRESULT TheoraDecodeInputPin::BreakConnect() {
CAutoLock locLock(m_pLock);
- debugLog<<"Break conenct"<<endl;
+ //debugLog<<"Break conenct"<<endl;
//Need a lock ??
ReleaseDelegate();
return CTransformInputPin::BreakConnect();
}
HRESULT TheoraDecodeInputPin::CompleteConnect (IPin *inReceivePin) {
CAutoLock locLock(m_pLock);
- debugLog<<"Complete conenct"<<endl;
+ //debugLog<<"Complete conenct"<<endl;
IMediaSeeking* locSeeker = NULL;
inReceivePin->QueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
if (locSeeker == NULL) {
- debugLog<<"Seeker is null"<<endl;
+ //debugLog<<"Seeker is null"<<endl;
}
SetDelegate(locSeeker);
return CTransformInputPin::CompleteConnect(inReceivePin);
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-18 14:50:25 UTC (rev 7787)
@@ -52,7 +52,7 @@
virtual HRESULT BreakConnect();
virtual HRESULT CompleteConnect (IPin *inReceivePin);
- fstream debugLog;
+ //fstream debugLog;
};
//----------------------
//OLD IMPLEMENTATION
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp 2004-09-18 14:50:25 UTC (rev 7787)
@@ -37,24 +37,24 @@
TheoraDecodeOutputPin::TheoraDecodeOutputPin(CTransformFilter* inParentFilter, HRESULT* outHR)
: CTransformOutputPin(NAME("Theora Output Pin"), inParentFilter, outHR, L"YV12 Out")
{
- debugLog.open("G:\\logs\\theooutput.log", ios_base::out);
+ //debugLog.open("G:\\logs\\theooutput.log", ios_base::out);
}
TheoraDecodeOutputPin::~TheoraDecodeOutputPin() {
- debugLog.close();
+ //debugLog.close();
}
STDMETHODIMP TheoraDecodeOutputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
- debugLog<<"Querying interface"<<endl;
+ //debugLog<<"Querying interface"<<endl;
if (riid == IID_IMediaSeeking) {
- debugLog<<"Got seekeer"<<endl;
+ //debugLog<<"Got seekeer"<<endl;
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
} else if (riid == IID_IMediaPosition) {
- debugLog<<"Asking for OLD SEEKER"<<endl;
+ //debugLog<<"Asking for OLD SEEKER"<<endl;
}
- debugLog<<"Trying base output pin"<<endl;
+ //debugLog<<"Trying base output pin"<<endl;
return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv);
}
@@ -62,18 +62,18 @@
CAutoLock locLock(m_pLock);
//Need a lock ??
ReleaseDelegate();
- debugLog<<"Break connect"<<endl;
+ //debugLog<<"Break connect"<<endl;
return CTransformOutputPin::BreakConnect();
}
HRESULT TheoraDecodeOutputPin::CompleteConnect (IPin *inReceivePin) {
CAutoLock locLock(m_pLock);
- debugLog<<"Complete connect"<<endl;
+ //debugLog<<"Complete connect"<<endl;
IMediaSeeking* locSeeker = NULL;
m_pFilter->GetPin(0)->QueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
if (locSeeker == NULL) {
- debugLog<<"Seeker was NULL"<<endl;
+ //debugLog<<"Seeker was NULL"<<endl;
}
SetDelegate(locSeeker);
return CTransformOutputPin::CompleteConnect(inReceivePin);
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h 2004-09-18 14:50:25 UTC (rev 7787)
@@ -55,7 +55,7 @@
//Quality control
virtual STDMETHODIMP Notify(IBaseFilter* inMessageSource, Quality inQuality);
- fstream debugLog;
+ //fstream debugLog;
};
//----------------------
//OLD IMPLEMENTATION
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-18 14:50:25 UTC (rev 7787)
@@ -114,7 +114,7 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
- debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+ //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
//debugLog << "**************** Starting LOg ********************"<<endl;
}
@@ -210,7 +210,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetCapabilities(DWORD* inCapabilities) {
if (mSeekTable->enabled()) {
- debugLog<<"GetCaps "<<mSeekingCap<<endl;
+ //debugLog<<"GetCaps "<<mSeekingCap<<endl;
*inCapabilities = mSeekingCap;
return S_OK;
} else {
@@ -221,7 +221,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetDuration(LONGLONG* outDuration) {
if (mSeekTable->enabled()) {
- debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
+ //debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
*outDuration = mSeekTable->fileDuration();
return S_OK;
} else {
@@ -235,28 +235,28 @@
STDMETHODIMP OggDemuxSourceFilter::CheckCapabilities(DWORD *pCapabilities){
- debugLog<<"CheckCaps : Not imp"<<endl;
+ //debugLog<<"CheckCaps : Not imp"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::IsFormatSupported(const GUID *pFormat){
ASSERT(pFormat != NULL);
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsFormatSupported : TRUE"<<endl;
+ //debugLog<<"IsFormatSupported : TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
+ //debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
return S_FALSE;
}
}
STDMETHODIMP OggDemuxSourceFilter::QueryPreferredFormat(GUID *pFormat){
- debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
+ //debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
*pFormat = TIME_FORMAT_MEDIA_TIME;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::SetTimeFormat(const GUID *pFormat){
- debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
+ //debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::GetTimeFormat( GUID *pFormat){
@@ -266,7 +266,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetStopPosition(LONGLONG *pStop){
if (mSeekTable->enabled()) {
- debugLog<<"GetStopPos = " << mSeekTable->fileDuration()<<" ds units"<<endl;
+ //debugLog<<"GetStopPos = " << mSeekTable->fileDuration()<<" ds units"<<endl;
*pStop = mSeekTable->fileDuration();
return S_OK;
} else {
@@ -275,21 +275,21 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
return E_NOTIMPL;
- debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
+ //debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
*pCurrent = 6 * UNITS;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat){
- debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
+ //debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags){
CAutoLock locLock(m_pLock);
- debugLog<<"Set Positions"<<endl;
+ //debugLog<<"Set Positions"<<endl;
if (mSeekTable->enabled()) {
- debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
+ //debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
//debugLog<<" : Delivering begin flush..."<<endl;
@@ -299,7 +299,7 @@
DeliverBeginFlush();
- debugLog<<" : Begin flush Delviered."<<endl;
+ //debugLog<<" : Begin flush Delviered."<<endl;
//Find the byte position for this time.
unsigned long locStartPos = mSeekTable->getStartPos(*pCurrent);
@@ -317,7 +317,7 @@
*pCurrent = mSeekTimeBase
= mSeekTable->getRealStartPos();
- debugLog<<"Corrected pCurrent : "<<mSeekTimeBase<<endl;
+ //debugLog<<"Corrected pCurrent : "<<mSeekTimeBase<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->setSendExcess(locSendExcess); //Not needed
mStreamMapper->getOggStream(i)->setLastEndGranPos(*pCurrent);
@@ -336,7 +336,7 @@
- debugLog<<" : Seek complete."<<endl;
+ //debugLog<<" : Seek complete."<<endl;
//debugLog<<" : Notifying whether to send excess... ";
if (locSendExcess) {
//debugLog<<"YES"<<endl;
@@ -349,7 +349,7 @@
// mStreamMapper->getOggStream(i)->setLastEndGranPos(mSeekTable->getRealStartPos());
//}
} else {
- debugLog<<"Seek not IMPL"<<endl;
+ //debugLog<<"Seek not IMPL"<<endl;
return E_NOTIMPL;
}
@@ -370,17 +370,17 @@
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop){
- debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
+ //debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
*pCurrent = 2 * UNITS;
*pStop = mSeekTable->fileDuration();
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
- debugLog<<"****GetAvailable : NOT IMPL"<<endl;
+ //debugLog<<"****GetAvailable : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::SetRate(double dRate){
- debugLog<<"Set RATE : NOT IMPL"<<endl;
+ //debugLog<<"Set RATE : NOT IMPL"<<endl;
return E_NOTIMPL;
//debugLog<<"SetRate : "<<dRate<<endl;
return S_OK;;
@@ -388,7 +388,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetRate(double *dRate){
//debugLog<<"Get RATE : Not IMPL"<<endl;
//return E_NOTIMPL;
- debugLog <<"GetRate : Hard coded to 1.0"<<endl;
+ //debugLog <<"GetRate : Hard coded to 1.0"<<endl;
*dRate = 1.0;
return S_OK;;
}
@@ -396,15 +396,15 @@
//debugLog<<"Get Preroll : NOT IMPL"<<endl;
//return E_NOTIMPL;
*pllPreroll = 0;
- debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
+ //debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
return S_FALSE;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-09-18 14:50:25 UTC (rev 7787)
@@ -196,7 +196,7 @@
OggStreamMapper* mStreamMapper;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2004-09-18 14:50:25 UTC (rev 7787)
@@ -47,10 +47,10 @@
mPartialPacket(NULL)
{
- debugLog.open("G:\\logs\\sourcefilterpin.log", ios_base::out);
+ //debugLog.open("G:\\logs\\sourcefilterpin.log", ios_base::out);
IMediaSeeking* locSeeker = NULL;
//if (inAllowSeek) {
- debugLog<<"Allowing seek"<<endl;
+ //debugLog<<"Allowing seek"<<endl;
//Subvert COM and do this directly... this way, the source filter won't expose the interface to the
// graph but we can still delegate to it.
@@ -67,7 +67,7 @@
OggDemuxSourcePin::~OggDemuxSourcePin(void)
{
- debugLog.close();
+ //debugLog.close();
delete mDataQueue;
mDataQueue = NULL;
@@ -76,7 +76,7 @@
STDMETHODIMP OggDemuxSourcePin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
{
if (riid == IID_IMediaSeeking) {
- debugLog<<"Pin queried for IMediaSeeking"<<endl;
+ //debugLog<<"Pin queried for IMediaSeeking"<<endl;
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
@@ -89,8 +89,8 @@
IMediaSample* locSample = NULL;
REFERENCE_TIME locStart = inPacket->startTime();
REFERENCE_TIME locStop = inPacket->endTime();
- debugLog<<"Start : "<<locStart<<endl;
- debugLog<<"End : "<<locStop<<endl;
+ //debugLog<<"Start : "<<locStart<<endl;
+ //debugLog<<"End : "<<locStop<<endl;
DbgLog((LOG_TRACE, 2, "Getting Buffer in Source Pin..."));
HRESULT locHR = GetDeliveryBuffer(&locSample, &locStart, &locStop, NULL);
DbgLog((LOG_TRACE, 2, "* After get Buffer in Source Pin..."));
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-09-18 14:31:39 UTC (rev 7786)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-09-18 14:50:25 UTC (rev 7787)
@@ -90,7 +90,7 @@
StampedOggPacket* mPartialPacket;
HRESULT mFilterHR;
COutputQueue* mDataQueue;
- fstream debugLog;
+ //fstream debugLog;
bool mFirstRun;
More information about the commits
mailing list