[xiph-commits] r7745 - in trunk/oggdsf/src/lib:
codecs/theora/filters/dsfTheoraDecoder
codecs/theora/filters/dsfTheoraEncoder
core/directshow/dsfAbstractVideoDecoder
core/directshow/dsfOggDemux core/ogg/libOOOgg
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Sep 12 15:14:20 PDT 2004
Author: illiminable
Date: 2004-09-12 15:14:19 -0700 (Sun, 12 Sep 2004)
New Revision: 7745
Modified:
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
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/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
Log:
* Getting ready for another release.
* Clearing out more debugging stuff.
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -67,7 +67,7 @@
, mLastSeenStartGranPos(0)
, mTheoraFormatInfo(NULL)
{
- debugLog.open("G:\\logs\\newtheofilter.log", ios_base::out);
+ //debugLog.open("G:\\logs\\newtheofilter.log", ios_base::out);
mTheoraDecoder = new TheoraDecoder;
mTheoraDecoder->initCodec();
@@ -77,7 +77,7 @@
TheoraDecodeFilter::~TheoraDecodeFilter() {
delete mTheoraDecoder;
mTheoraDecoder = NULL;
- debugLog.close();
+ //debugLog.close();
}
@@ -156,9 +156,9 @@
}
}
HRESULT TheoraDecodeFilter::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest) {
- debugLog<<endl;
debugLog<<"DecideBufferSize :"<<endl;
//FIX::: Abstract this out properly
+ //debugLog<<endl;
//debugLog<<"DecideBufferSize :"<<endl;
//FIX::: Abstract this out properly
- debugLog<<"Allocator is "<<(unsigned long)inAllocator<<endl;
+ //debugLog<<"Allocator is "<<(unsigned long)inAllocator<<endl;
//Our error variable
HRESULT locHR = S_OK;
@@ -166,11 +166,11 @@
ALLOCATOR_PROPERTIES locReqAlloc;
ALLOCATOR_PROPERTIES locActualAlloc;
- debugLog<<"DecideBufferSize : Requested :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<inPropertyRequest->cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<inPropertyRequest->cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<inPropertyRequest->cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<inPropertyRequest->cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : Requested :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<inPropertyRequest->cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<inPropertyRequest->cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<inPropertyRequest->cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<inPropertyRequest->cBuffers<<endl;
const unsigned long MIN_BUFFER_SIZE = 16*16; //What should this be ????
@@ -209,40 +209,40 @@
locReqAlloc.cBuffers = inPropertyRequest->cBuffers;
}
- debugLog<<"DecideBufferSize : Modified Request :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<locReqAlloc.cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<locReqAlloc.cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<locReqAlloc.cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<locReqAlloc.cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : Modified Request :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<locReqAlloc.cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<locReqAlloc.cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<locReqAlloc.cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<locReqAlloc.cBuffers<<endl;
//Set the properties in the allocator
locHR = inAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
- debugLog<<"DecideBufferSize : SetProperties returns "<<locHR<<endl;
- debugLog<<"DecideBufferSize : Actual Params :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<locActualAlloc.cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<locActualAlloc.cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<locActualAlloc.cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<locActualAlloc.cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties returns "<<locHR<<endl;
+ //debugLog<<"DecideBufferSize : Actual Params :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<locActualAlloc.cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<locActualAlloc.cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<locActualAlloc.cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<locActualAlloc.cBuffers<<endl;
//Check the response
switch (locHR) {
case E_POINTER:
- debugLog<<"DecideBufferSize : SetProperties - NULL POINTER"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - NULL POINTER"<<endl;
return locHR;
case VFW_E_ALREADY_COMMITTED:
- debugLog<<"DecideBufferSize : SetProperties - Already COMMITED"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - Already COMMITED"<<endl;
return locHR;
case VFW_E_BADALIGN:
- debugLog<<"DecideBufferSize : SetProperties - Bad ALIGN"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - Bad ALIGN"<<endl;
return locHR;
case VFW_E_BUFFERS_OUTSTANDING:
- debugLog<<"DecideBufferSize : SetProperties - BUFFS OUTSTANDING"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - BUFFS OUTSTANDING"<<endl;
return locHR;
@@ -250,7 +250,7 @@
break;
default:
- debugLog<<"DecideBufferSize : SetProperties - UNKNOWN ERROR"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - UNKNOWN ERROR"<<endl;
break;
}
@@ -260,27 +260,27 @@
//RESOLVED ::: Yep !
locHR = inAllocator->Commit();
- debugLog<<"DecideBufferSize : Commit Returned "<<locHR<<endl;
+ //debugLog<<"DecideBufferSize : Commit Returned "<<locHR<<endl;
switch (locHR) {
case E_FAIL:
- debugLog<<"DecideBufferSize : Commit - FAILED "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - FAILED "<<endl;
return locHR;
case E_POINTER:
- debugLog<<"DecideBufferSize : Commit - NULL POINTER "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - NULL POINTER "<<endl;
return locHR;
case E_INVALIDARG:
- debugLog<<"DecideBufferSize : Commit - INVALID ARG "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - INVALID ARG "<<endl;
return locHR;
case E_NOTIMPL:
- debugLog<<"DecideBufferSize : Commit - NOT IMPL"<<endl;
+ //debugLog<<"DecideBufferSize : Commit - NOT IMPL"<<endl;
return locHR;
case S_OK:
- debugLog<<"DecideBufferSize : Commit - ** SUCCESS **"<<endl;
+ //debugLog<<"DecideBufferSize : Commit - ** SUCCESS **"<<endl;
break;
default:
- debugLog<<"DecideBufferSize : Commit - UNKNOWN ERROR "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - UNKNOWN ERROR "<<endl;
return locHR;
}
@@ -297,9 +297,9 @@
VIDEOINFOHEADER* locVideoFormat = (VIDEOINFOHEADER*)outOutputMediaType->AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
FillVideoInfoHeader(locVideoFormat);
FillMediaType(outOutputMediaType, locVideoFormat->bmiHeader.biSizeImage);
- debugLog<<"Vid format size "<<locVideoFormat->bmiHeader.biSizeImage<<endl;
+ //debugLog<<"Vid format size "<<locVideoFormat->bmiHeader.biSizeImage<<endl;
//outMediaType->SetSampleSize(locVideoFormat->bmiHeader.biSizeImage);
- debugLog<<"Returning from GetMediaType"<<endl;
+ //debugLog<<"Returning from GetMediaType"<<endl;
return S_OK;
} else {
return VFW_S_NO_MORE_ITEMS;
@@ -313,7 +313,7 @@
HRESULT TheoraDecodeFilter::Transform(IMediaSample* inInputSample, IMediaSample* outOutputSample) {
//CAutoLock locLock(mStreamLock);
- debugLog<<endl<<"Transform "<<endl;
+ //debugLog<<endl<<"Transform "<<endl;
//debugLog<<"outOutputSample Size = "<<outOutputSample->
HRESULT locHR;
BYTE* locBuff = NULL;
@@ -324,16 +324,16 @@
if (FAILED(locHR)) {
- debugLog<<"Receive : Get pointer failed..."<<locHR<<endl;
+ //debugLog<<"Receive : Get pointer failed..."<<locHR<<endl;
return locHR;
} else {
- debugLog<<"Receive : Get pointer succeeds..."<<endl;
+ //debugLog<<"Receive : Get pointer succeeds..."<<endl;
//New start time hacks
REFERENCE_TIME locStart = 0;
REFERENCE_TIME locEnd = 0;
inInputSample->GetTime(&locStart, &locEnd);
//Error chacks needed here
- debugLog<<"Input Sample Time - "<<locStart<<" to "<<locEnd<<endl;
+ //debugLog<<"Input Sample Time - "<<locStart<<" to "<<locEnd<<endl;
//More work arounds for that stupid granule pos scheme in theora!
REFERENCE_TIME locTimeBase = 0;
@@ -342,13 +342,13 @@
mSeekTimeBase = locTimeBase;
//
- debugLog<<"SeekTimeBase = "<<mSeekTimeBase<<endl;
+ //debugLog<<"SeekTimeBase = "<<mSeekTimeBase<<endl;
if ((mLastSeenStartGranPos != locStart) && (locStart != -1)) {
- debugLog<<"Resetting frame count"<<endl;
+ //debugLog<<"Resetting frame count"<<endl;
ResetFrameCount();
mLastSeenStartGranPos = locStart;
- debugLog<<"Setting base gran pos to "<<locStart<<endl;
+ //debugLog<<"Setting base gran pos to "<<locStart<<endl;
}
//End of additions
@@ -358,20 +358,20 @@
AM_MEDIA_TYPE* locMediaType = NULL;
inInputSample->GetMediaType(&locMediaType);
if (locMediaType == NULL) {
- debugLog<<"No dynamic change..."<<endl;
+ //debugLog<<"No dynamic change..."<<endl;
} else {
- debugLog<<"Attempting dynamic change..."<<endl;
+ //debugLog<<"Attempting dynamic change..."<<endl;
}
StampedOggPacket* locPacket = new StampedOggPacket(locNewBuff, inInputSample->GetActualDataLength(), false, false, locStart, locEnd, StampedOggPacket::OGG_END_ONLY);
yuv_buffer* locYUV = mTheoraDecoder->decodeTheora(locPacket);
if (locYUV != NULL) {
if (TheoraDecoded(locYUV, outOutputSample) != 0) {
- debugLog<<"Decoded *** FALSE ***"<<endl;
+ //debugLog<<"Decoded *** FALSE ***"<<endl;
return S_FALSE;
}
} else {
- debugLog<<"!@&#^()!&@#!()*@#&)!(*@#&()!*@# NULL Decode"<<endl;
+ //debugLog<<"!@&#^()!&@#!()*@#&)!(*@#&()!*@# NULL Decode"<<endl;
return S_FALSE;
}
@@ -383,11 +383,11 @@
int TheoraDecodeFilter::TheoraDecoded (yuv_buffer* inYUVBuffer, IMediaSample* outSample)
{
- debugLog<<"TheoraDecoded... #################### "<<endl;
+ //debugLog<<"TheoraDecoded... #################### "<<endl;
if (!mBegun) {
- debugLog<<"First time..."<<endl;
+ //debugLog<<"First time..."<<endl;
mBegun = true;
//How many UNITS does one frame take.
@@ -395,18 +395,18 @@
mFrameSize = (mHeight * mWidth * 3) / 2;
mFrameCount = 0;
- debugLog<<"Frame Durn = "<<mFrameDuration<<endl;
- debugLog<<"FrameSize = "<<mFrameSize<<endl;
+ //debugLog<<"Frame Durn = "<<mFrameDuration<<endl;
+ //debugLog<<"FrameSize = "<<mFrameSize<<endl;
}
- debugLog<<"y_height x width = "<<inYUVBuffer->y_height<<" x "<<inYUVBuffer->y_width<<" ("<<inYUVBuffer->y_stride<<endl;
- debugLog<<"uv_height x width = "<<inYUVBuffer->uv_height<<" x "<<inYUVBuffer->uv_width<<" ("<<inYUVBuffer->y_stride<<endl;
+ //debugLog<<"y_height x width = "<<inYUVBuffer->y_height<<" x "<<inYUVBuffer->y_width<<" ("<<inYUVBuffer->y_stride<<endl;
+ //debugLog<<"uv_height x width = "<<inYUVBuffer->uv_height<<" x "<<inYUVBuffer->uv_width<<" ("<<inYUVBuffer->y_stride<<endl;
- debugLog<<"mWidth x mHeight = "<<mWidth<<" x "<<mHeight<<endl;
- debugLog<<"mFrameSize = "<<mFrameSize<<endl;
- debugLog<<"Offsets x,y = "<<mXOffset<<", "<<mYOffset<<endl;
+ //debugLog<<"mWidth x mHeight = "<<mWidth<<" x "<<mHeight<<endl;
+ //debugLog<<"mFrameSize = "<<mFrameSize<<endl;
+ //debugLog<<"Offsets x,y = "<<mXOffset<<", "<<mYOffset<<endl;
////FIX::: Most of this will be obselete... the demux does it all.
//
@@ -414,31 +414,31 @@
////Make the start timestamp
////FIX:::Abstract this calculation
- DbgLog((LOG_TRACE,1,TEXT("Frame Count = %d"), mFrameCount));
- debugLog<<"Frame Count = "<<mFrameCount<<endl;
+ //DbgLog((LOG_TRACE,1,TEXT("Frame Count = %d"), mFrameCount));
+ //debugLog<<"Frame Count = "<<mFrameCount<<endl;
//REFERENCE_TIME locFrameStart = CurrentStartTime() + (mFrameCount * mFrameDuration);
//Timestamp hacks start here...
unsigned long locMod = (unsigned long)pow(2, mTheoraFormatInfo->maxKeyframeInterval);
- DbgLog((LOG_TRACE,1,TEXT("locSeenGranPos = %d"), mLastSeenStartGranPos));
- DbgLog((LOG_TRACE,1,TEXT("locMod = %d"), locMod));
+ //DbgLog((LOG_TRACE,1,TEXT("locSeenGranPos = %d"), mLastSeenStartGranPos));
+ //DbgLog((LOG_TRACE,1,TEXT("locMod = %d"), locMod));
- debugLog<<"locMod = "<<locMod<<endl;
+ //debugLog<<"locMod = "<<locMod<<endl;
unsigned long locInterFrameNo = (mLastSeenStartGranPos) % locMod;
- DbgLog((LOG_TRACE,1,TEXT("InterFrameNo = %d"), locInterFrameNo));
- debugLog<<"Interframe No = "<<locInterFrameNo<<endl;
+ //DbgLog((LOG_TRACE,1,TEXT("InterFrameNo = %d"), locInterFrameNo));
+ //debugLog<<"Interframe No = "<<locInterFrameNo<<endl;
LONGLONG locAbsFramePos = ((mLastSeenStartGranPos >> mTheoraFormatInfo->maxKeyframeInterval)) + locInterFrameNo;
- debugLog<<"Abs frame No = "<<locAbsFramePos<<endl;
- DbgLog((LOG_TRACE,1,TEXT("AbsFrameNo = %d"), locAbsFramePos));
- DbgLog((LOG_TRACE,1,TEXT("mSeekTimeBase = %d"), mSeekTimeBase));
+ //debugLog<<"Abs frame No = "<<locAbsFramePos<<endl;
+ //DbgLog((LOG_TRACE,1,TEXT("AbsFrameNo = %d"), locAbsFramePos));
+ //DbgLog((LOG_TRACE,1,TEXT("mSeekTimeBase = %d"), mSeekTimeBase));
- debugLog<<"Seek time base = "<<mSeekTimeBase<<endl;
+ //debugLog<<"Seek time base = "<<mSeekTimeBase<<endl;
REFERENCE_TIME locTimeBase = (locAbsFramePos * mFrameDuration) - mSeekTimeBase;
- debugLog<<"LocTimeBase = "<<locTimeBase<<endl;
+ //debugLog<<"LocTimeBase = "<<locTimeBase<<endl;
DbgLog((LOG_TRACE,1,TEXT("locTimeBase = %d"), locTimeBase));
//
@@ -455,7 +455,7 @@
- debugLog<<"Sample times = "<<locFrameStart<<" to "<<locFrameEnd<<endl;
+ //debugLog<<"Sample times = "<<locFrameStart<<" to "<<locFrameEnd<<endl;
//FILTER_STATE locFS;
//GetState(0, &locFS);
@@ -470,28 +470,28 @@
AM_MEDIA_TYPE* locMediaType = NULL;
outSample->GetMediaType(&locMediaType);
if (locMediaType == NULL) {
- debugLog<<"No dynamic change..."<<endl;
+ //debugLog<<"No dynamic change..."<<endl;
} else {
- debugLog<<"Attempting dynamic change..."<<endl;
+ //debugLog<<"Attempting dynamic change..."<<endl;
if (locMediaType->majortype == MEDIATYPE_Video) {
- debugLog<<"Still MEDIATYPE_Video"<<endl;
+ //debugLog<<"Still MEDIATYPE_Video"<<endl;
}
if (locMediaType->subtype == MEDIASUBTYPE_YV12) {
- debugLog<<"Still MEDIASUBTYPE_YV12"<<endl;
+ //debugLog<<"Still MEDIASUBTYPE_YV12"<<endl;
}
if (locMediaType->formattype == FORMAT_VideoInfo) {
- debugLog<<"Still FORMAT_VideoInfo"<<endl;
+ //debugLog<<"Still FORMAT_VideoInfo"<<endl;
VIDEOINFOHEADER* locVF = (VIDEOINFOHEADER*)locMediaType->pbFormat;
- debugLog<<"Size = "<<locVF->bmiHeader.biSizeImage<<endl;
- debugLog<<"Dim = "<<locVF->bmiHeader.biWidth<<" x " <<locVF->bmiHeader.biHeight<<endl;
+ //debugLog<<"Size = "<<locVF->bmiHeader.biSizeImage<<endl;
+ //debugLog<<"Dim = "<<locVF->bmiHeader.biWidth<<" x " <<locVF->bmiHeader.biHeight<<endl;
}
- debugLog<<"Major : "<<DSStringer::GUID2String(&locMediaType->majortype);
- debugLog<<"Minor : "<<DSStringer::GUID2String(&locMediaType->subtype);
- debugLog<<"Format : "<<DSStringer::GUID2String(&locMediaType->formattype);
- debugLog<<"Form Sz: "<<locMediaType->cbFormat;
+ //debugLog<<"Major : "<<DSStringer::GUID2String(&locMediaType->majortype);
+ //debugLog<<"Minor : "<<DSStringer::GUID2String(&locMediaType->subtype);
+ //debugLog<<"Format : "<<DSStringer::GUID2String(&locMediaType->formattype);
+ //debugLog<<"Form Sz: "<<locMediaType->cbFormat;
}
@@ -520,15 +520,15 @@
long locYStride = inYUVBuffer->y_stride;
long locUVStride = inYUVBuffer->uv_stride;
- debugLog<<"Y Stride = "<<locYStride<<endl;
- debugLog<<"UV Stride = "<<locUVStride<<endl;
+ //debugLog<<"Y Stride = "<<locYStride<<endl;
+ //debugLog<<"UV Stride = "<<locUVStride<<endl;
//
//Y DATA
//
//NEW WAY with offsets Y Data
long locTopPad = inYUVBuffer->y_height - mHeight - mYOffset;
- debugLog<<"--------- PAD = "<<locTopPad<<endl;
+ //debugLog<<"--------- PAD = "<<locTopPad<<endl;
ASSERT(locTopPad >= 0);
if (locTopPad < 0) {
locTopPad = 0;
@@ -547,7 +547,7 @@
locSourceUptoPtr += (mYOffset * locYStride);
- debugLog<<"Dest Distance(y) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
+ //debugLog<<"Dest Distance(y) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
//Source advances by (y_height * y_stride)
//Dest advances by (mHeight * mWidth)
@@ -578,7 +578,7 @@
//Dest advances by (mHeight * mWidth) /4
- debugLog<<"Dest Distance(V) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
+ //debugLog<<"Dest Distance(V) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
//
//U DATA
//
@@ -595,14 +595,14 @@
}
locSourceUptoPtr += ((mYOffset/2) * locUVStride);
- debugLog<<"Dest Distance(U) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
- debugLog<<"Frame Size = "<<mFrameSize<<endl;
+ //debugLog<<"Dest Distance(U) = "<<(unsigned long)(locDestUptoPtr - locBuffer)<<endl;
+ //debugLog<<"Frame Size = "<<mFrameSize<<endl;
//Set the sample parameters.
BOOL locIsKeyFrame = (locInterFrameNo == 0);
locIsKeyFrame = TRUE;
if (locIsKeyFrame == TRUE) {
- debugLog<<"KEY FRAME ++++++"<<endl;
+ //debugLog<<"KEY FRAME ++++++"<<endl;
};
SetSampleParams(outSample, mFrameSize, &locFrameStart, &locFrameEnd, locIsKeyFrame);
@@ -618,7 +618,7 @@
if (inDirection == PINDIR_INPUT) {
if (inMediaType->subtype == MEDIASUBTYPE_Theora) {
- debugLog<<"Setting format block"<<endl;
+ //debugLog<<"Setting format block"<<endl;
setTheoraFormat((sTheoraFormatBlock*)inMediaType->pbFormat);
//Set some other stuff here too...
@@ -626,8 +626,8 @@
mYOffset = ((sTheoraFormatBlock*)inMediaType->pbFormat)->yOffset;
//mHeight = ((sTheoraFormatBlock*)inMediaType->pbFormat)->frameHeight;
//mWidth = ((sTheoraFormatBlock*)inMediaType->pbFormat)->frameWidth;
- debugLog<<"Setting height width to "<<mWidth<<" x "<<mHeight<<endl;
- debugLog<<"Frame Dims were "<<((sTheoraFormatBlock*)inMediaType->pbFormat)->frameWidth<<" x "<<((sTheoraFormatBlock*)inMediaType->pbFormat)->frameHeight<<endl;
+ //debugLog<<"Setting height width to "<<mWidth<<" x "<<mHeight<<endl;
+ //debugLog<<"Frame Dims were "<<((sTheoraFormatBlock*)inMediaType->pbFormat)->frameWidth<<" x "<<((sTheoraFormatBlock*)inMediaType->pbFormat)->frameHeight<<endl;
} else {
//Failed... should never be here !
@@ -635,7 +635,7 @@
}
return CTransformFilter::SetMediaType(PINDIR_INPUT, inMediaType);//CVideoTransformFilter::SetMediaType(PINDIR_INPUT, inMediaType);
} else {
- debugLog<<"Setting Output Stuff"<<endl;
+ //debugLog<<"Setting Output Stuff"<<endl;
//Output pin SetMediaType
//VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)inMediaType->Format();
//mHeight = (unsigned long)abs(locVideoHeader->bmiHeader.biHeight);
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -88,7 +88,7 @@
__int64 mLastSeenStartGranPos;
//Format Block
sTheoraFormatBlock* mTheoraFormatInfo;
- fstream debugLog;
+ //fstream debugLog;
};
//---------------------------------------
//OLD IMPLOEMENTATION....
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -36,10 +36,10 @@
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) {
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -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-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -37,10 +37,10 @@
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) {
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -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/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -39,7 +39,7 @@
{
- debugLog.open("g:\\logs\\theoencfilt.log", ios_base::out);
+ //debugLog.open("g:\\logs\\theoencfilt.log", ios_base::out);
mYUV.y = NULL;
mYUV.u = NULL;
mYUV.v = NULL;
@@ -48,7 +48,7 @@
TheoraEncodeInputPin::~TheoraEncodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
DestroyCodec();
delete mYUV.y;
delete mYUV.u;
@@ -58,7 +58,7 @@
HRESULT TheoraEncodeInputPin::deliverData(LONGLONG inStart, LONGLONG inEnd, unsigned char* inBuf, unsigned long inNumBytes) {
- debugLog <<" deliverData : "<<inStart<<" - "<<inEnd<<" :: size = "<<inNumBytes<<endl;
+ //debugLog <<" deliverData : "<<inStart<<" - "<<inEnd<<" :: size = "<<inNumBytes<<endl;
//Get a pointer to a new sample stamped with our time
IMediaSample* locSample;
HRESULT locHR = mOutputPin->GetDeliveryBuffer(&locSample, &inStart, &inEnd, NULL);
@@ -90,10 +90,10 @@
} else {
}
}
- debugLog<<"deliverData : SUCCESS"<<endl;
+ //debugLog<<"deliverData : SUCCESS"<<endl;
return S_OK;
} else {
- debugLog<<"Buffer too small !!!! FATALITY !"<<endl;
+ //debugLog<<"Buffer too small !!!! FATALITY !"<<endl;
throw 0;
}
@@ -364,12 +364,12 @@
//TODO::: Break this function up a bit !!
//Time stamps are granule pos not directshow times
- debugLog<<"Encode data"<<endl;
+ //debugLog<<"Encode data"<<endl;
LONGLONG locFrameStart = mUptoFrame;
LONGLONG locFrameEnd = 0;
HRESULT locHR = S_OK;
if (!mBegun) {
- debugLog<<"encodeData : First time"<<endl;
+ //debugLog<<"encodeData : First time"<<endl;
mBegun = true;
StampedOggPacket** locHeaders;
@@ -384,29 +384,29 @@
}
if (mPinInputType.subtype == MEDIASUBTYPE_YUY2) {
- debugLog<<"About to encode YUY2 to YV12"<<endl;
+ //debugLog<<"About to encode YUY2 to YV12"<<endl;
encodeYUY2ToYV12(inBuf, inNumBytes);
} else {
//Should be more specifc.
- debugLog<<"About to encode YV12 to YV12"<<endl;
+ //debugLog<<"About to encode YV12 to YV12"<<endl;
encodeYV12ToYV12(inBuf, inNumBytes);
}
StampedOggPacket* locPacket = mTheoraEncoder.encodeTheora(&mYUV);
if (locPacket == NULL) {
- debugLog<<"Encode returns NULL"<<endl;
+ //debugLog<<"Encode returns NULL"<<endl;
return S_FALSE;
}
locFrameEnd = mUptoFrame
= locPacket->endTime();
- debugLog<<"Delivering..."<<endl;
+ //debugLog<<"Delivering..."<<endl;
return deliverData(locFrameStart, locFrameEnd, locPacket->packetData(), locPacket->packetSize());
}
bool TheoraEncodeInputPin::ConstructCodec() {
- debugLog<<"Contructing codec..."<<endl;
+ //debugLog<<"Contructing codec..."<<endl;
theora_info_init(&mTheoraInfo);
//Round up to multiple of 16 for theora
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -83,7 +83,7 @@
unsigned long mYOffset;
//DEBUG ONLY
- fstream debugLog;
+ ////fstream debugLog;
//
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -36,14 +36,14 @@
: CBaseFilter(inFilterName, NULL,m_pLock, inFilterGUID),
mVideoFormat(inVideoFormat)
{
- debugLog.open("G:\\logs\\avdFitler.log", ios_base::out);
+ //debugLog.open("G:\\logs\\avdFitler.log", ios_base::out);
m_pLock = new CCritSec;
}
AbstractVideoDecodeFilter::~AbstractVideoDecodeFilter(void)
{
- debugLog.close();
+ //debugLog.close();
delete m_pLock;
DestroyPins();
}
@@ -71,20 +71,20 @@
STDMETHODIMP AbstractVideoDecodeFilter::Stop() {
CAutoLock locLock(m_pLock);
- debugLog<<"**** STOP ****"<<endl;
+ //debugLog<<"**** STOP ****"<<endl;
mInputPin->ResetFrameCount();
return CBaseFilter::Stop();
}
STDMETHODIMP AbstractVideoDecodeFilter::Pause() {
CAutoLock locLock(m_pLock);
- debugLog<<"**** PAUSE ****"<<endl;
+ //debugLog<<"**** PAUSE ****"<<endl;
return CBaseFilter::Pause();
}
STDMETHODIMP AbstractVideoDecodeFilter::Run(REFERENCE_TIME tStart) {
CAutoLock locLock(m_pLock);
- debugLog<<"**** RUN ****"<<endl;
+ //debugLog<<"**** RUN ****"<<endl;
return CBaseFilter::Run(tStart);
}
int AbstractVideoDecodeFilter::GetPinCount(void) {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -78,7 +78,7 @@
protected:
- fstream debugLog;
+ //fstream debugLog;
AbstractVideoDecodeInputPin* mInputPin;
AbstractVideoDecodeOutputPin* mOutputPin;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -50,7 +50,7 @@
, mSeekTimeBase(0)
{
- debugLog.open("G:\\logs\\avdInputPin.log", ios_base::out);
+ //debugLog.open("G:\\logs\\avdInputPin.log", ios_base::out);
//ConstructCodec();
mStreamLock = new CCritSec;
mAcceptableMediaType = inAcceptMediaType;
@@ -62,17 +62,17 @@
AbstractVideoDecodeInputPin::~AbstractVideoDecodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
//DestroyCodec();
delete mStreamLock;
}
STDMETHODIMP AbstractVideoDecodeInputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
- debugLog<<"Query Interface"<<endl;
+ //debugLog<<"Query Interface"<<endl;
if (riid == IID_IMediaSeeking) {
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
- debugLog<<"Queried for IMediaSeeking"<<endl;
+ //debugLog<<"Queried for IMediaSeeking"<<endl;
return NOERROR;
}
@@ -111,17 +111,17 @@
STDMETHODIMP AbstractVideoDecodeInputPin::Receive(IMediaSample* inSample) {
CAutoLock locLock(mStreamLock);
- debugLog<<"Receive "<<endl;
+ //debugLog<<"Receive "<<endl;
HRESULT locHR;
BYTE* locBuff = NULL;
locHR = inSample->GetPointer(&locBuff);
if (FAILED(locHR)) {
- debugLog<<"Receive : Get pointer failed..."<<locHR<<endl;
+ //debugLog<<"Receive : Get pointer failed..."<<locHR<<endl;
return locHR;
} else {
- debugLog<<"Receive : Get pointer succeeds..."<<endl;
+ //debugLog<<"Receive : Get pointer succeeds..."<<endl;
//New start time hacks
REFERENCE_TIME locStart = 0;
REFERENCE_TIME locEnd = 0;
@@ -147,9 +147,9 @@
AM_MEDIA_TYPE* locMediaType = NULL;
inSample->GetMediaType(&locMediaType);
if (locMediaType == NULL) {
- debugLog<<"No dynamic change..."<<endl;
+ //debugLog<<"No dynamic change..."<<endl;
} else {
- debugLog<<"Attempting dynamic change..."<<endl;
+ //debugLog<<"Attempting dynamic change..."<<endl;
}
//if (locMediaType != NULL) {
@@ -161,10 +161,10 @@
long locResult = decodeData(locBuff, inSample->GetActualDataLength(), locStart, locEnd);
if (locResult == 0) {
- debugLog<<"Receive : Decode OK"<<endl;
+ //debugLog<<"Receive : Decode OK"<<endl;
return S_OK;
} else {
- debugLog<<"Receive : Decode OK"<<endl;
+ //debugLog<<"Receive : Decode OK"<<endl;
return S_FALSE;
}
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -75,7 +75,7 @@
virtual bool SetSampleParams(IMediaSample* outMediaSample, unsigned long inDataSize, REFERENCE_TIME* inStartTime, REFERENCE_TIME* inEndTime);
- fstream debugLog;
+ ////fstream debugLog;
HRESULT mHR;
bool mBegun;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -37,18 +37,18 @@
mParentFilter(inParentFilter)
, mDataQueue(NULL)
{
- debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
+ //debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
}
AbstractVideoDecodeOutputPin::~AbstractVideoDecodeOutputPin(void)
{
- debugLog.close();
+ //debugLog.close();
delete mDataQueue;
mDataQueue = NULL;
}
STDMETHODIMP AbstractVideoDecodeOutputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
- debugLog<<"QueryInterface : {"<<riid.Data1<<"-"<<riid.Data2<<"-"<<riid.Data3<<"-"<<riid.Data4<<"}"<<endl;
+ //debugLog<<"QueryInterface : {"<<riid.Data1<<"-"<<riid.Data2<<"-"<<riid.Data3<<"-"<<riid.Data4<<"}"<<endl;
if (riid == IID_IMediaSeeking) {
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
@@ -58,9 +58,9 @@
return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv);
}
HRESULT AbstractVideoDecodeOutputPin::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest) {
-
debugLog<<endl;
debugLog<<"DecideBufferSize :"<<endl;
//FIX::: Abstract this out properly
+
//debugLog<<endl;
//FIX::: Abstract this out properly
- debugLog<<"Allocator is "<<(unsigned long)inAllocator<<endl;
+ //debugLog<<"Allocator is "<<(unsigned long)inAllocator<<endl;
//Our error variable
HRESULT locHR = S_OK;
@@ -68,11 +68,11 @@
ALLOCATOR_PROPERTIES locReqAlloc;
ALLOCATOR_PROPERTIES locActualAlloc;
- debugLog<<"DecideBufferSize : Requested :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<inPropertyRequest->cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<inPropertyRequest->cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<inPropertyRequest->cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<inPropertyRequest->cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : Requested :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<inPropertyRequest->cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<inPropertyRequest->cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<inPropertyRequest->cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<inPropertyRequest->cBuffers<<endl;
const unsigned long MIN_BUFFER_SIZE = 16*16; //What should this be ????
@@ -111,40 +111,40 @@
locReqAlloc.cBuffers = inPropertyRequest->cBuffers;
}
- debugLog<<"DecideBufferSize : Modified Request :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<locReqAlloc.cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<locReqAlloc.cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<locReqAlloc.cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<locReqAlloc.cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : Modified Request :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<locReqAlloc.cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<locReqAlloc.cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<locReqAlloc.cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<locReqAlloc.cBuffers<<endl;
//Set the properties in the allocator
locHR = inAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
- debugLog<<"DecideBufferSize : SetProperties returns "<<locHR<<endl;
- debugLog<<"DecideBufferSize : Actual Params :"<<endl;
- debugLog<<"DecideBufferSize : Align : "<<locActualAlloc.cbAlign<<endl;
- debugLog<<"DecideBufferSize : BuffSize : "<<locActualAlloc.cbBuffer<<endl;
- debugLog<<"DecideBufferSize : Prefix : "<<locActualAlloc.cbPrefix<<endl;
- debugLog<<"DecideBufferSize : NumBuffs : "<<locActualAlloc.cBuffers<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties returns "<<locHR<<endl;
+ //debugLog<<"DecideBufferSize : Actual Params :"<<endl;
+ //debugLog<<"DecideBufferSize : Align : "<<locActualAlloc.cbAlign<<endl;
+ //debugLog<<"DecideBufferSize : BuffSize : "<<locActualAlloc.cbBuffer<<endl;
+ //debugLog<<"DecideBufferSize : Prefix : "<<locActualAlloc.cbPrefix<<endl;
+ //debugLog<<"DecideBufferSize : NumBuffs : "<<locActualAlloc.cBuffers<<endl;
//Check the response
switch (locHR) {
case E_POINTER:
- debugLog<<"DecideBufferSize : SetProperties - NULL POINTER"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - NULL POINTER"<<endl;
return locHR;
case VFW_E_ALREADY_COMMITTED:
- debugLog<<"DecideBufferSize : SetProperties - Already COMMITED"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - Already COMMITED"<<endl;
return locHR;
case VFW_E_BADALIGN:
- debugLog<<"DecideBufferSize : SetProperties - Bad ALIGN"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - Bad ALIGN"<<endl;
return locHR;
case VFW_E_BUFFERS_OUTSTANDING:
- debugLog<<"DecideBufferSize : SetProperties - BUFFS OUTSTANDING"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - BUFFS OUTSTANDING"<<endl;
return locHR;
@@ -152,7 +152,7 @@
break;
default:
- debugLog<<"DecideBufferSize : SetProperties - UNKNOWN ERROR"<<endl;
+ //debugLog<<"DecideBufferSize : SetProperties - UNKNOWN ERROR"<<endl;
break;
}
@@ -162,27 +162,27 @@
//RESOLVED ::: Yep !
locHR = inAllocator->Commit();
- debugLog<<"DecideBufferSize : Commit Returned "<<locHR<<endl;
+ //debugLog<<"DecideBufferSize : Commit Returned "<<locHR<<endl;
switch (locHR) {
case E_FAIL:
- debugLog<<"DecideBufferSize : Commit - FAILED "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - FAILED "<<endl;
return locHR;
case E_POINTER:
- debugLog<<"DecideBufferSize : Commit - NULL POINTER "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - NULL POINTER "<<endl;
return locHR;
case E_INVALIDARG:
- debugLog<<"DecideBufferSize : Commit - INVALID ARG "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - INVALID ARG "<<endl;
return locHR;
case E_NOTIMPL:
- debugLog<<"DecideBufferSize : Commit - NOT IMPL"<<endl;
+ //debugLog<<"DecideBufferSize : Commit - NOT IMPL"<<endl;
return locHR;
case S_OK:
- debugLog<<"DecideBufferSize : Commit - ** SUCCESS **"<<endl;
+ //debugLog<<"DecideBufferSize : Commit - ** SUCCESS **"<<endl;
break;
default:
- debugLog<<"DecideBufferSize : Commit - UNKNOWN ERROR "<<endl;
+ //debugLog<<"DecideBufferSize : Commit - UNKNOWN ERROR "<<endl;
return locHR;
}
@@ -190,7 +190,7 @@
return S_OK;
}
HRESULT AbstractVideoDecodeOutputPin::CheckMediaType(const CMediaType *inMediaType) {
- debugLog<<"CheckMediaType : "<<endl;
+ //debugLog<<"CheckMediaType : "<<endl;
if ((inMediaType->majortype == MEDIATYPE_Video) && (inMediaType->subtype == MEDIASUBTYPE_YV12) && (inMediaType->formattype == FORMAT_VideoInfo)) {
//FIX::: SHould this stuff be in a check routine ??? Shouldn't it be in set mediatype ?
@@ -198,20 +198,20 @@
//debugLog << "CheckMediaType : Accepting..."<<endl;
VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)inMediaType->Format();
- debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
- debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl;
- debugLog << "CheckMediaType : Size = "<<locVideoHeader->bmiHeader.biSizeImage<<endl<<endl;
- debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
- debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
- debugLog<<"CheckMediaType : Size was = "<<mParentFilter->mInputPin->mFrameSize<<endl<<endl;
+ //debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
+ //debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl;
+ //debugLog << "CheckMediaType : Size = "<<locVideoHeader->bmiHeader.biSizeImage<<endl<<endl;
+ //debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
+ //debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
+ //debugLog<<"CheckMediaType : Size was = "<<mParentFilter->mInputPin->mFrameSize<<endl<<endl;
mParentFilter->mInputPin->mHeight = (unsigned long)abs(locVideoHeader->bmiHeader.biHeight);
mParentFilter->mInputPin->mWidth = (unsigned long)abs(locVideoHeader->bmiHeader.biWidth);
mParentFilter->mInputPin->mFrameSize = (unsigned long)locVideoHeader->bmiHeader.biSizeImage;
- debugLog<<"CheckMediaType : SUCCESS"<<endl;
+ //debugLog<<"CheckMediaType : SUCCESS"<<endl;
return S_OK;
} else {
- debugLog<<"CheckMediaType : FAILURE"<<endl;
+ //debugLog<<"CheckMediaType : FAILURE"<<endl;
return S_FALSE;
}
@@ -236,9 +236,9 @@
VIDEOINFOHEADER* locVideoFormat = (VIDEOINFOHEADER*)outMediaType->AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
FillVideoInfoHeader(locVideoFormat);
- debugLog<<"Vid format size "<<locVideoFormat->bmiHeader.biSizeImage<<endl;
+ //debugLog<<"Vid format size "<<locVideoFormat->bmiHeader.biSizeImage<<endl;
outMediaType->SetSampleSize(locVideoFormat->bmiHeader.biSizeImage);
- debugLog<<"Returning from GetMediaType"<<endl;
+ //debugLog<<"Returning from GetMediaType"<<endl;
return S_OK;
} else {
return VFW_S_NO_MORE_ITEMS;
@@ -250,7 +250,7 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{
//mPartialPacket = NULL;
- debugLog << "DeliverNewSegment: start"<<endl;
+ //debugLog << "DeliverNewSegment: start"<<endl;
CBasePin::NewSegment(tStart, tStop, dRate);
mDataQueue->NewSegment(tStart, tStop, dRate);
//debugLog << "DeliverNewSegment: end"<<endl;
@@ -259,7 +259,7 @@
}
HRESULT AbstractVideoDecodeOutputPin::DeliverEndOfStream(void)
{
- debugLog << "DeliverEndOfStream: executed" << endl;
+ //debugLog << "DeliverEndOfStream: executed" << endl;
//mPartialPacket = NULL;
mDataQueue->EOS();
return S_OK;
@@ -267,7 +267,7 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverEndFlush(void)
{
- debugLog << "DeliverEndFlush" << endl;
+ //debugLog << "DeliverEndFlush" << endl;
mDataQueue->EndFlush();
return S_OK;
}
@@ -275,14 +275,14 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverBeginFlush(void)
{
//mPartialPacket = NULL;
- debugLog << "DeliverBeginFlush"<<endl;
+ //debugLog << "DeliverBeginFlush"<<endl;
mDataQueue->BeginFlush();
return S_OK;
}
HRESULT AbstractVideoDecodeOutputPin::CompleteConnect (IPin *inReceivePin)
{
- debugLog<<"ComlpeteConnect"<<endl;
+ //debugLog<<"ComlpeteConnect"<<endl;
HRESULT locHR = S_OK;
//Here when another pin connects to us, we internally connect the seek delegate
@@ -296,7 +296,7 @@
//DELETE in DEStructor
mDataQueue = new COutputQueue (inReceivePin, &locHR, FALSE, TRUE, 1, TRUE, 15);
if (FAILED(locHR)) {
- debugLog<<"Creating Output Q failed."<<endl;
+ //debugLog<<"Creating Output Q failed."<<endl;
locHR = locHR;
}
@@ -304,10 +304,10 @@
}
HRESULT AbstractVideoDecodeOutputPin::BreakConnect(void) {
- debugLog<<"Break Connect"<<endl;
+ //debugLog<<"Break Connect"<<endl;
//CAutoLock locLock(mFilterLock);
HRESULT locHR = CBaseOutputPin::BreakConnect();
- debugLog<<"Base BreakConnect returns "<<locHR<<endl;
+ //debugLog<<"Base BreakConnect returns "<<locHR<<endl;
ReleaseDelegate();
delete mDataQueue;
mDataQueue = NULL;
@@ -316,15 +316,15 @@
//Testing
HRESULT AbstractVideoDecodeOutputPin::InitAllocator(IMemAllocator **ppAlloc) {
- debugLog<<"InitAllocator Called"<<endl;
+ //debugLog<<"InitAllocator Called"<<endl;
HRESULT locHR = CBaseOutputPin::InitAllocator(ppAlloc);
- debugLog<<"Base InitAlloc returns "<<locHR<<endl;
+ //debugLog<<"Base InitAlloc returns "<<locHR<<endl;
return locHR;
}
HRESULT AbstractVideoDecodeOutputPin::SetMediaType(const CMediaType *pmt) {
- debugLog<<"SETTING MEDIA TYPE"<<endl;
+ //debugLog<<"SETTING MEDIA TYPE"<<endl;
HRESULT locHR = CBaseOutputPin::SetMediaType(pmt);
- debugLog<<"ase SetMedia Type returns "<<locHR<<endl;
+ //debugLog<<"ase SetMedia Type returns "<<locHR<<endl;
return locHR;
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -76,7 +76,7 @@
AbstractVideoDecodeFilter* mParentFilter;
void FillMediaType(CMediaType* inMediaType);
- fstream debugLog;
+ ////fstream debugLog;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -87,7 +87,7 @@
((IUnknown*)*ppv)->AddRef();
return NOERROR;
} else if (riid == IID_IAMMediaContent) {
- debugLog<<"Queries for IAMMediaContent///"<<endl;
+ //debugLog<<"Queries for IAMMediaContent///"<<endl;
*ppv = (IAMMediaContent*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
@@ -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;
}
@@ -133,7 +133,7 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
- debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+ //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
//When it is derived, it's up to the superclass to set this.
//mStreamMapper = new OggStreamMapper(this);
@@ -141,7 +141,7 @@
OggDemuxSourceFilter::~OggDemuxSourceFilter(void)
{
- DbgLog((LOG_ERROR, 1, TEXT("****************** DESTRUCTOR **********************")));
+ //DbgLog((LOG_ERROR, 1, TEXT("****************** DESTRUCTOR **********************")));
//TODO::: For some reason, you can't delete these !!
@@ -240,10 +240,10 @@
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;
}
@@ -255,7 +255,7 @@
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){
@@ -265,7 +265,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 {
@@ -274,21 +274,21 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
- 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;
@@ -298,7 +298,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);
@@ -335,7 +335,7 @@
- debugLog<<" : Seek complete."<<endl;
+ //debugLog<<" : Seek complete."<<endl;
//debugLog<<" : Notifying whether to send excess... ";
if (locSendExcess) {
//debugLog<<"YES"<<endl;
@@ -368,7 +368,7 @@
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;
@@ -397,10 +397,10 @@
}
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;
}
@@ -473,7 +473,7 @@
mDataSource = NULL;
//
- mOggBuffer.debugWrite("%%%%%% Clear calling from ResetStream");
+ //mOggBuffer.debugWrite("%%%%%% Clear calling from ResetStream");
mOggBuffer.clearData();
//SOURCE ABSTRACTION::: clear, close, open, seek
@@ -501,7 +501,7 @@
CAutoLock locLock(m_pLock);
- debugLog << "Delivering Begin Flush"<<endl;
+ //debugLog << "Delivering Begin Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->getPin()->DeliverBeginFlush();
//mStreamMapper->getOggStream(i)->flush();
@@ -509,14 +509,14 @@
//Should this be here or endflush or neither ?
//debugLog << "Calling Reset Stream"<<endl;
- mOggBuffer.debugWrite("%%%%%% Reset calling from DeliverBegingFlush");
+ //mOggBuffer.debugWrite("%%%%%% Reset calling from DeliverBegingFlush");
resetStream();
}
void OggDemuxSourceFilter::DeliverEndFlush() {
CAutoLock locLock(m_pLock);
- debugLog << "Delivering End Flush"<<endl;
+ //debugLog << "Delivering End Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->flush();
mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
@@ -529,7 +529,7 @@
mStreamMapper->getOggStream(i)->getPin()->DeliverEndOfStream();
mStreamMapper->getOggStream(i)->flush();
}
- mOggBuffer.debugWrite("%%%%%% Reset calling from DeliverEOS");
+ //mOggBuffer.debugWrite("%%%%%% Reset calling from DeliverEOS");
resetStream();
}
@@ -674,7 +674,7 @@
STDMETHODIMP OggDemuxSourceFilter::Run(REFERENCE_TIME tStart) {
const REFERENCE_TIME A_LONG_TIME = UNITS * 1000;
CAutoLock locLock(m_pLock);
- debugLog<<"Run : time = "<<tStart<<endl;
+ //debugLog<<"Run : time = "<<tStart<<endl;
//DeliverNewSegment(tStart, tStart + A_LONG_TIME, 1.0);
return CBaseFilter::Run(tStart);
@@ -682,7 +682,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::Pause(void) {
CAutoLock locLock(m_pLock);
- debugLog << "** Pause called **"<<endl;
+ //debugLog << "** Pause called **"<<endl;
if (m_State == State_Stopped) {
//debugLog << "Was in stopped state... starting thread"<<endl;
if (ThreadExists() == FALSE) {
@@ -699,7 +699,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::Stop(void) {
CAutoLock locLock(m_pLock);
- debugLog<<"** Stop Called ** "<<endl;
+ //debugLog<<"** Stop Called ** "<<endl;
CallWorker(THREAD_EXIT);
Close();
DeliverBeginFlush();
@@ -717,7 +717,7 @@
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::get_Title(BSTR* outTitle) {
- debugLog<<"Try to get_Title"<<endl;
+ //debugLog<<"Try to get_Title"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::get_Rating(BSTR* outRating) {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -196,7 +196,7 @@
OggStreamMapper* mStreamMapper;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-09-12 22:14:19 UTC (rev 7745)
@@ -113,13 +113,13 @@
, mSequenceNo(0)
, mPacketCount(0)
{
- debugLog.open("G:\\logs\\paginator.log", ios_base::out);
+ //debugLog.open("G:\\logs\\paginator.log", ios_base::out);
}
OggPaginator::~OggPaginator(void)
{
- debugLog.close();
+ //debugLog.close();
}
@@ -169,7 +169,7 @@
// }
//}
- debugLog<<"Accepting packet"<<endl;
+ //debugLog<<"Accepting packet"<<endl;
addPacketToPage(inOggPacket);
return true;
@@ -235,7 +235,7 @@
}
bool OggPaginator::deliverCurrentPage() {
- debugLog<<"Delivering page"<<endl;
+ //debugLog<<"Delivering page"<<endl;
mPendingPage->header()->setSegmentTable((const unsigned char*)mSegmentTable, mSegmentTableSize);
mPendingPage->header()->setDataSize(mCurrentPageSize - mPendingPage->headerSize()); //This is odd
@@ -255,7 +255,7 @@
}
bool OggPaginator::createFreshPage() {
- debugLog<<"Creating fresh page"<<endl;
+ //debugLog<<"Creating fresh page"<<endl;
mPendingPage = new OggPage;
mCurrentPageSize = OggPageHeader::OGG_BASE_HEADER_SIZE;
mPendingPageHasData = false;
@@ -278,7 +278,7 @@
}
bool OggPaginator::addPacketToPage(StampedOggPacket* inOggPacket) {
- debugLog<<"Add packet to page"<<endl;
+ //debugLog<<"Add packet to page"<<endl;
mPendingPageHasData = true;
//while some packet left
// add as much as possible
@@ -299,9 +299,9 @@
//While there is still more packet not added to the page
while (locPacketRemaining > 0) {
- debugLog<<"Packet remaining = "<<locPacketRemaining<<endl;
+ //debugLog<<"Packet remaining = "<<locPacketRemaining<<endl;
locConsumed = addAsMuchPacketAsPossible(inOggPacket, locPacketStartPoint, locPacketRemaining);
- debugLog<<"Consumed = "<<locConsumed<<endl;
+ //debugLog<<"Consumed = "<<locConsumed<<endl;
locPacketStartPoint += locConsumed;
locPacketRemaining -= locConsumed;
}
@@ -323,7 +323,7 @@
// b) The number of bytes less than the desired maximum page size.
unsigned long locSpaceLeft = MIN(((255 - mSegmentTableSize) * 255) - 1, mSettings->mMaxPageSize - mCurrentPageSize);
- debugLog<<"Space left = "<<locSpaceLeft<<endl;
+ //debugLog<<"Space left = "<<locSpaceLeft<<endl;
//Round down to nearest multiple of 255
//
//This is important when the packet gets broken because inRemaining is gt locSpace left
@@ -337,7 +337,7 @@
//If (a) is the minimum then we know that the how much we are adding is a multiple of 255.
unsigned long locHowMuchToAdd = MIN(locSpaceLeft, inRemaining);
- debugLog<<"How much to add = "<<locHowMuchToAdd<<endl;
+ //debugLog<<"How much to add = "<<locHowMuchToAdd<<endl;
//mPending page has data is useless, it was set before this function is called... need to fix that. maybe move into add part of pack into apge
if ((!mPendingPageHasData) && (inStartAt != 0)) {
@@ -355,7 +355,7 @@
bool OggPaginator::addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom, unsigned long inLength) {
- debugLog<<"Add part of packet to page"<<endl;
+ //debugLog<<"Add part of packet to page"<<endl;
//Buffer the amount of the packet we are going to add.
unsigned char* locBuff = new unsigned char[inLength];
@@ -394,8 +394,8 @@
//Now do the segment table bookkeeping.
unsigned long locNumSegsNeeded = (inLength / 255);
- debugLog<<"Amount to add = "<<inLength<<endl;
- debugLog<<"Segs needed = "<<locNumSegsNeeded<<endl;
+ //debugLog<<"Amount to add = "<<inLength<<endl;
+ //debugLog<<"Segs needed = "<<locNumSegsNeeded<<endl;
//Always do one less than the total... the last segment is a special case
//We fill all but the last segemnt with 255
@@ -409,7 +409,7 @@
if (locIsLastOfPacket) {
//Its the last part of the packet... so we need one extra segemnt... to hold the last part.
// The last part will be between 0-254
- debugLog<<"Is last of packet... adding terminator "<<(unsigned long)(inLength % 255)<<endl;
+ //debugLog<<"Is last of packet... adding terminator "<<(unsigned long)(inLength % 255)<<endl;
mSegmentTable[mSegmentTableSize] = (unsigned char)(inLength % 255);
mSegmentTableSize++;
@@ -429,13 +429,13 @@
}
- debugLog<<"Seg table is "<<(unsigned long)mSegmentTableSize<<endl;
+ //debugLog<<"Seg table is "<<(unsigned long)mSegmentTableSize<<endl;
mCurrentPageSize += (locNumSegsNeeded + inLength);
- debugLog<<"Page is now "<<mCurrentPageSize<<endl;
+ //debugLog<<"Page is now "<<mCurrentPageSize<<endl;
if (locIsLastOfPacket) {
- debugLog<<"Setting time for end of page"<<endl;
+ //debugLog<<"Setting time for end of page"<<endl;
mPendingPage->header()->setGranulePos(inOggPacket->endTime());
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-09-12 21:41:29 UTC (rev 7744)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-09-12 22:14:19 UTC (rev 7745)
@@ -78,6 +78,6 @@
OggPaginatorSettings* mSettings;
OggPage* mPendingPage;
- fstream debugLog;
+ //fstream debugLog;
};
More information about the commits
mailing list