[xiph-commits] r6971 - in trunk/oggdsf: docs
illiminable at dactyl.lonelymoon.com
illiminable
Sat Jul 3 14:30:03 PDT 2004
src/lib/codecs/cmml/dsfCMMLDecoder
src/lib/codecs/speex/filters/dsfSpeexEncoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/core/directshow/dsfAbstractAudioEncoder
src/lib/core/directshow/dsfOggDemux
src/lib/core/directshow/dsfOggMux src/lib/core/ogg/libOOOgg
Message-ID: <20040703213003.114579AAAD at dactyl.lonelymoon.com>
Author: illiminable
Date: Sat Jul 3 14:30:03 2004
New Revision: 6971
Added:
trunk/oggdsf/docs/TODO.txt
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
Log:
* Cleaned out a lot of debugging stuff.
Added: trunk/oggdsf/docs/TODO.txt
===================================================================
--- trunk/oggdsf/docs/TODO.txt 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/docs/TODO.txt 2004-07-03 21:30:01 UTC (rev 6971)
@@ -0,0 +1,7 @@
+* Fix the theora decoder to deal properly with the frame/offset/etc stuff.
+* Fix the long string in the demux prop page.
+* Figure out why the graph hangs at the end of lpayback sometimes. see debugging.txt
+* Fix flac decoder
+* Fix wmp 9 issues, probably by rewriting the decoder :(
+* Add seeking to annodex
+* Add application cmml interface
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -60,14 +60,14 @@
, mHeadTag(NULL)
{
mCMMLParser = new CMMLParser;
- debugLog.open("C:\\Temp\\cmmlfilter.log", ios_base::out);
- debugLog<<"*** Log Begins ***"<<endl;
+ //debugLog.open("C:\\Temp\\cmmlfilter.log", ios_base::out);
+ //debugLog<<"*** Log Begins ***"<<endl;
}
CMMLDecodeFilter::~CMMLDecodeFilter(void)
{
- debugLog<<"*** Log Ends ***"<<endl;
- debugLog.close();
+ //debugLog<<"*** Log Ends ***"<<endl;
+ //debugLog.close();
delete mCMMLParser;
}
@@ -86,7 +86,7 @@
(inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
(inInputMediaType->formattype == FORMAT_CMML) ){
- debugLog<<"Input Type Accepted"<<endl;
+ //debugLog<<"Input Type Accepted"<<endl;
return S_OK;
} else {
return VFW_E_TYPE_NOT_ACCEPTED;
@@ -99,7 +99,7 @@
(inOutputMediaType->majortype == MEDIATYPE_Text) &&
(inOutputMediaType->subtype == MEDIASUBTYPE_SubtitleVMR9) ){
- debugLog << "Transform Accepted"<<endl;
+ //debugLog << "Transform Accepted"<<endl;
return S_OK;
} else {
return VFW_E_TYPE_NOT_ACCEPTED;
@@ -182,43 +182,43 @@
string locTextStr;
unsigned long locTextSize = 0;
- debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
+ //debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
if (locSize > 0) {
locCMML = new char[locSize+1];
locCMML[locSize] = '\0';
locHR = inSample->GetPointer(&locInBuff);
memcpy((void*)locCMML, (const void*) locInBuff, locSize);
- debugLog<<" : Sample Text = "<<locCMML<<endl<<endl;
+ //debugLog<<" : Sample Text = "<<locCMML<<endl<<endl;
locWCMML = toWStr(locCMML);
if (mSeenHead == false) {
- debugLog << " : Processing a head tag"<<endl;
+ //debugLog << " : Processing a head tag"<<endl;
//Head tag... needs error checks
mSeenHead = true;
mHeadTag = new C_HeadTag;
bool locParseOK = mCMMLParser->parseHeadTag(locWCMML, mHeadTag);
if (locParseOK) {
- debugLog<<" : Parse OK"<<endl;
+ //debugLog<<" : Parse OK"<<endl;
locHR = outSample->GetPointer(&locOutBuff);
locTextSize = mHeadTag->title()->text().size();
locTextStr = mHeadTag->title()->text();
- debugLog<<" : Title Text = "<<locTextStr<<endl;
+ //debugLog<<" : Title Text = "<<locTextStr<<endl;
memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
locOutBuff[locTextSize] = '\0';
outSample->SetActualDataLength(locTextSize + 1);
} else {
- debugLog<<" : Parse FAILED"<<endl;
+ //debugLog<<" : Parse FAILED"<<endl;
}
} else {
//Clip Tag... needs error checks
- debugLog << " : Processing a clip tag"<<endl;
+ //debugLog << " : Processing a clip tag"<<endl;
C_ClipTag locClipTag;
bool locParseOK = mCMMLParser->parseClipTag(locWCMML, &locClipTag);
if (locParseOK) {
- debugLog<<" : Parse OK"<<endl;
+ //debugLog<<" : Parse OK"<<endl;
locHR = outSample->GetPointer(&locOutBuff);
@@ -226,11 +226,11 @@
locTextStr = locClipTag.anchor()->text();
memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
- debugLog << " : Clip Text = "<<locTextStr<<endl;
+ //debugLog << " : Clip Text = "<<locTextStr<<endl;
locOutBuff[locTextSize] = '\0';
outSample->SetActualDataLength(locTextSize + 1);
} else {
- debugLog<<" : Parse FAILED"<<endl;
+ //debugLog<<" : Parse FAILED"<<endl;
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -63,7 +63,7 @@
bool mSeenHead;
C_HeadTag* mHeadTag;
- fstream debugLog;
+ //fstream debugLog;
};
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -36,12 +36,12 @@
: AbstractAudioEncodeInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("SpeexEncodeInputPin"), L"PCM In")
, mFishSound(NULL)
{
- debugLog.open("C:\\temp\\speexenc.log", ios_base::out);
+ //debugLog.open("C:\\temp\\speexenc.log", ios_base::out);
}
SpeexEncodeInputPin::~SpeexEncodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
DestroyCodec();
}
@@ -50,7 +50,7 @@
long SpeexEncodeInputPin::encodeData(unsigned char* inBuf, long inNumBytes) {
- debugLog << "encodeData receives : "<<inNumBytes<<" bytes"<<endl;
+ //debugLog << "encodeData receives : "<<inNumBytes<<" bytes"<<endl;
float* locFloatBuf = new float[inNumBytes/2];
short locTempShort = 0;
@@ -69,13 +69,13 @@
locTempFloat /= 32767.0;
locFloatBuf[i/2] = locTempFloat;;
}
- debugLog<<"Calling encode"<<endl;
+ //debugLog<<"Calling encode"<<endl;
//FIX::: The 2 is the size of a sample ie 16 bits
long locErr = fish_sound_encode(mFishSound, (float**)locFloatBuf, inNumBytes/(mFishInfo.channels*2));
delete locFloatBuf;
//FIX::: Do something here ?
if (locErr < 0) {
- debugLog<<"Fishsound reports error"<<endl;
+ //debugLog<<"Fishsound reports error"<<endl;
} else {
}
@@ -112,7 +112,7 @@
//For convenience we do all these cast once and for all here.
SpeexEncodeInputPin* locThis = reinterpret_cast<SpeexEncodeInputPin*> (inThisPointer);
SpeexEncodeFilter* locFilter = reinterpret_cast<SpeexEncodeFilter*>(locThis->m_pFilter);
- locThis->debugLog << "SpeexEncoded called with "<<inNumBytes<< " byte of data"<<endl;
+ //locThis->debugLog << "SpeexEncoded called with "<<inNumBytes<< " byte of data"<<endl;
//Time stamps are granule pos not directshow times
LONGLONG locFrameStart = locThis->mUptoFrame;
@@ -120,14 +120,14 @@
= fish_sound_get_frameno(locThis->mFishSound);
- locThis->debugLog << "Stamping packet "<<locFrameStart<< " to "<<locFrameEnd<<endl;
+ //locThis->debugLog << "Stamping packet "<<locFrameStart<< " to "<<locFrameEnd<<endl;
//Get a pointer to a new sample stamped with our time
IMediaSample* locSample;
HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
if (FAILED(locHR)) {
//We get here when the application goes into stop mode usually.
- locThis->debugLog<<"Getting buffer failed"<<endl;
+ //locThis->debugLog<<"Getting buffer failed"<<endl;
return locHR;
}
@@ -153,9 +153,9 @@
//locSample->AddRef();
HRESULT locHR = locThis->mOutputPin->mDataQueue->Receive(locSample); //->DownstreamFilter()->Receive(locSample);
if (locHR != S_OK) {
- locThis->debugLog<<"Sample rejected"<<endl;
+ //locThis->debugLog<<"Sample rejected"<<endl;
} else {
- locThis->debugLog<<"Sample Delivered"<<endl;
+ //locThis->debugLog<<"Sample Delivered"<<endl;
}
}
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -42,8 +42,8 @@
//#include <../src/libfishsound/private.h>
}
-#include <fstream>
-using namespace std;
+//#include <fstream>
+//using namespace std;
class SpeexEncodeInputPin
: public AbstractAudioEncodeInputPin
{
@@ -64,7 +64,7 @@
//SpeexDecodeOutputPin* mOutputPin;
//__int64 mUptoFrame;
- fstream debugLog;
+ //fstream debugLog;
FishSound* mFishSound;
FishSoundInfo mFishInfo;
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -6,13 +6,13 @@
, mTheoraEncodeSettings(NULL)
{
- debugLog.open("G:\\logs\\TheoProps.log", ios_base::out);
+ //debugLog.open("G:\\logs\\TheoProps.log", ios_base::out);
*outHR = S_OK;
}
PropsTheoraEncoder::~PropsTheoraEncoder(void)
{
- debugLog.close();
+ //debugLog.close();
}
CUnknown* PropsTheoraEncoder::CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR)
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -3,7 +3,7 @@
#include <commctrl.h>
//Debug
-#include <fstream>
+//#include <fstream>
using namespace std;
//
class PropsTheoraEncoder
@@ -40,6 +40,6 @@
//Debug
- fstream debugLog;
+ //fstream debugLog;
//
};
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -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;
@@ -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,7 +90,7 @@
} else {
}
}
- debugLog<<"deliverData : SUCCESS"<<endl;
+ //debugLog<<"deliverData : SUCCESS"<<endl;
return S_OK;
} else {
throw 0;
@@ -108,7 +108,7 @@
LONGLONG locFrameEnd = 0;
HRESULT locHR = S_OK;
if (!mBegun) {
- debugLog<<"encodeData : First time"<<endl;
+ //debugLog<<"encodeData : First time"<<endl;
mBegun = true;
StampedOggPacket** locHeaders;
@@ -401,8 +401,8 @@
//End YV12 specifics
//
- debugLog<<"Width =y_w = y_s = "<<mWidth<<" ::: "<<"Height=y_h= "<<mHeight<<endl;
- debugLog<<"uv_w=uv_s= "<<mYUV.uv_stride<<" ::: " <<"uv_height = "<<mYUV.uv_height<<endl;
+ //debugLog<<"Width =y_w = y_s = "<<mWidth<<" ::: "<<"Height=y_h= "<<mHeight<<endl;
+ //debugLog<<"uv_w=uv_s= "<<mYUV.uv_stride<<" ::: " <<"uv_height = "<<mYUV.uv_height<<endl;
//=mVideoFormat->bmiHeader.biWidth;
//=mVideoFormat->bmiHeader.biHeight;
//mTheoraInfo.offset_x=0;
@@ -412,7 +412,7 @@
//HACK:::Bit of a hack to convert dshow nanos to a fps num/denom.
unsigned long locNum = (((double)10000000) / ((double)mVideoFormat->AvgTimePerFrame)) + (double)0.5;
- debugLog<<"FPS = "<<locNum<<endl;
+ //debugLog<<"FPS = "<<locNum<<endl;
mTheoraInfo.fps_numerator = locNum;
mTheoraInfo.fps_denominator = 1;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -41,14 +41,14 @@
mParentFilter(inParentFilter)
{
- debugLog.open("C:\\temp\\aaein.log", ios_base::out);
+ //debugLog.open("C:\\temp\\aaein.log", ios_base::out);
//ConstructCodec();
}
AbstractAudioEncodeInputPin::~AbstractAudioEncodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
//DestroyCodec();
}
@@ -71,27 +71,27 @@
STDMETHODIMP AbstractAudioEncodeInputPin::Receive(IMediaSample* inSample) {
- debugLog <<endl<< "Received sample..."<<endl;
+ //debugLog <<endl<< "Received sample..."<<endl;
HRESULT locHR;
BYTE* locBuff = NULL;
locHR = inSample->GetPointer(&locBuff);
if (FAILED(locHR)) {
- debugLog << "Failed to get pointer... bailing out"<<endl;
+ //debugLog << "Failed to get pointer... bailing out"<<endl;
return locHR;
} else {
long locResult = encodeData(locBuff, inSample->GetActualDataLength());
if (locResult >= 0) {
- debugLog << "Encode Data returns 0... OK"<<endl;
+ //debugLog << "Encode Data returns 0... OK"<<endl;
return S_OK;
} else {
- debugLog<< "Encode Data returns "<<locResult<<" FAILURE"<<endl;
+ //debugLog<< "Encode Data returns "<<locResult<<" FAILURE"<<endl;
return S_FALSE;
}
}
- debugLog<<"Receive falls through... returning OK"<<endl;
+ //debugLog<<"Receive falls through... returning OK"<<endl;
return S_OK;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeInputPin.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -32,9 +32,12 @@
#pragma once
#include "abstractaudioencodedllstuff.h"
-#include <fstream>
-using namespace std;
+//Debug Only
+//#include <fstream>
+//
+//using namespace std;
+
class AbstractAudioEncodeOutputPin;
class AbstractAudioEncodeFilter;
@@ -85,7 +88,10 @@
AbstractAudioEncodeFilter* mParentFilter;
CMediaType* mAcceptableMediaType;
- fstream debugLog;
+ //Debug only
+ //fstream debugLog;
+ //
+
//unsigned long mFrameSize;
//unsigned long mNumChannels;
//unsigned long mSampleRate;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -39,8 +39,8 @@
, mBufferLock(NULL)
{
mBufferLock = new CCritSec;
- debugLog.open("G:\\httpdebug.log", ios_base::out);
- fileDump.open("G:\\filedump.ogg", ios_base::out|ios_base::binary);
+ //debugLog.open("G:\\httpdebug.log", ios_base::out);
+ //fileDump.open("G:\\filedump.ogg", ios_base::out|ios_base::binary);
WORD locWinsockVersion = MAKEWORD(1,1);
WSADATA locWinsockData;
int locRet= 0;
@@ -48,12 +48,12 @@
locRet = WSAStartup(locWinsockVersion, &locWinsockData);
if ((locRet != 0) || (locWinsockData.wVersion != locWinsockVersion)) {
//Failed to setup.
- debugLog<<"Failed to start winsock V "<<locWinsockData.wVersion<<endl;
+ //debugLog<<"Failed to start winsock V "<<locWinsockData.wVersion<<endl;
WSACleanup();
throw 0;
}
- debugLog<<"Winsock started"<<endl;
+ //debugLog<<"Winsock started"<<endl;
@@ -61,15 +61,15 @@
HTTPFileSource::~HTTPFileSource(void)
{
- debugLog<<"Winsock ended"<<endl;
- debugLog.close();
- fileDump.close();
+ //debugLog<<"Winsock ended"<<endl;
+ //debugLog.close();
+ //fileDump.close();
delete mBufferLock;
WSACleanup();
}
void HTTPFileSource::DataProcessLoop() {
- debugLog<<"DataProcessLoop: "<<endl;
+ //debugLog<<"DataProcessLoop: "<<endl;
int locNumRead = 0;
char* locBuff = NULL;
const unsigned long RECV_BUFF_SIZE = 1024;
@@ -79,53 +79,53 @@
locNumRead = recv(mSocket, locBuff, RECV_BUFF_SIZE, 0);
if (locNumRead == SOCKET_ERROR) {
int locErr = WSAGetLastError();
- debugLog<<"Socket error receiving - Err No = "<<locErr<<endl;
+ //debugLog<<"Socket error receiving - Err No = "<<locErr<<endl;
mWasError = true;
break;
}
if (locNumRead == 0) {
- debugLog<<"Read last bytes..."<<endl;
+ //debugLog<<"Read last bytes..."<<endl;
mIsEOF = true;
break;
}
{//CRITICAL SECTION - PROTECTING BUFFER STATE
CAutoLock locLock(mBufferLock);
- debugLog <<"Num Read = "<<locNumRead<<endl;
+ //debugLog <<"Num Read = "<<locNumRead<<endl;
if (mSeenResponse) {
//Add to buffer
mStreamBuffer.write(locBuff, locNumRead);
- debugLog<<"Added to buffer "<<locNumRead<<" bytes."<<endl;
+ //debugLog<<"Added to buffer "<<locNumRead<<" bytes."<<endl;
//Dump to file
- fileDump.write(locBuff, locNumRead);
+ //fileDump.write(locBuff, locNumRead);
} else {
string locTemp = locBuff;
- debugLog<<"Binary follows... "<<endl<<locTemp<<endl;
+ //debugLog<<"Binary follows... "<<endl<<locTemp<<endl;
size_t locPos = locTemp.find("\r\n\r\n");
if (locPos != string::npos) {
//Found the break
- debugLog<<"locPos = "<<locPos<<endl;
+ //debugLog<<"locPos = "<<locPos<<endl;
mSeenResponse = true;
mLastResponse = locTemp.substr(0, locPos);
char* locBuff2 = locBuff + locPos + 4; //View only - don't delete.
locTemp = locBuff2;
- debugLog<<"Start of data follows"<<endl<<locTemp<<endl;
+ //debugLog<<"Start of data follows"<<endl<<locTemp<<endl;
mStreamBuffer.write(locBuff2, locNumRead - (locPos + 4));
//Dump to file
- fileDump.write(locBuff2, locNumRead - (locPos + 4));
+ //fileDump.write(locBuff2, locNumRead - (locPos + 4));
if(mStreamBuffer.fail()) {
- debugLog<<"Buffering failure..."<<endl;
+ //debugLog<<"Buffering failure..."<<endl;
}
size_t locG, locP;
locG = mStreamBuffer.tellg();
locP = mStreamBuffer.tellp();
- debugLog << "Get : "<<locG<<" ---- Put : "<<locP<<endl;
- debugLog<<"Added to Buffer "<<locNumRead - (locPos+4)<<" bytes... first after response."<<endl;
+ //debugLog << "Get : "<<locG<<" ---- Put : "<<locP<<endl;
+ //debugLog<<"Added to Buffer "<<locNumRead - (locPos+4)<<" bytes... first after response."<<endl;
}
}
} //END CRITICAL SECTION
@@ -138,7 +138,7 @@
bool HTTPFileSource::setupSocket(string inSourceLocation) {
- debugLog<<"Setup Socket:"<<endl;
+ //debugLog<<"Setup Socket:"<<endl;
IN_ADDR locAddress; //iaHost
LPHOSTENT locHostData;; //lpHost
@@ -156,14 +156,14 @@
if (locHostData == NULL) {
- debugLog<<"LocHostData is NULL"<<endl;
+ //debugLog<<"LocHostData is NULL"<<endl;
//Failed
return false;
}
mSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (mSocket == INVALID_SOCKET) {
- debugLog<<"Socket Invalid"<<endl;
+ //debugLog<<"Socket Invalid"<<endl;
//Failed
return false;
}
@@ -193,7 +193,7 @@
int locRetVal = 0;
locRetVal = connect(mSocket, (LPSOCKADDR)&locServiceSocketAddr, sizeof(SOCKADDR_IN));
if (locRetVal == SOCKET_ERROR) {
- debugLog<<"Failed to connect..."<<endl;
+ //debugLog<<"Failed to connect..."<<endl;
closesocket(mSocket);
return false;
}
@@ -206,23 +206,23 @@
string HTTPFileSource::assembleRequest(string inFilePath) {
string retRequest;
retRequest = "GET " + inFilePath+ " HTTP/1.1\n" + "Host: " + mServerName+ "\n\n";
- debugLog<<"Assembled Req : "<<endl<<retRequest<<endl;
+ //debugLog<<"Assembled Req : "<<endl<<retRequest<<endl;
return retRequest;
}
bool HTTPFileSource::httpRequest(string inRequest) {
- debugLog<<"Http Request:"<<endl;
+ //debugLog<<"Http Request:"<<endl;
int locRetVal = send(mSocket, inRequest.c_str(), inRequest.length(), 0);
if (locRetVal == SOCKET_ERROR) {
- debugLog<<"Socket error on send"<<endl;
+ //debugLog<<"Socket error on send"<<endl;
closesocket(mSocket);
return false;
}
return true;
}
DWORD HTTPFileSource::ThreadProc(void) {
- debugLog<<"ThreadProc:"<<endl;
+ //debugLog<<"ThreadProc:"<<endl;
while(true) {
DWORD locThreadCommand = GetRequest();
@@ -249,12 +249,12 @@
//Close the socket down
//Open up a new one to the same place.
//Make the partial content request.
- debugLog<<"Seek ::::: EOROR NOT IMPL"<<endl;
+ //debugLog<<"Seek ::::: EOROR NOT IMPL"<<endl;
return 0;
}
bool HTTPFileSource::splitURL(string inURL) {
- debugLog<<"Split url:"<<endl;
+ //debugLog<<"Split url:"<<endl;
string locProtocol;
string locServerName;
string locPath;
@@ -300,12 +300,12 @@
} else {
mPort = 0;
}
- debugLog<<"Proto : "<<locProtocol<<endl<<"Server : "<<locServerName<<endl<<" Path : "<<mFileName<<" Port : "<<mPort<<endl;
+ //debugLog<<"Proto : "<<locProtocol<<endl<<"Server : "<<locServerName<<endl<<" Path : "<<mFileName<<" Port : "<<mPort<<endl;
return true;
}
void HTTPFileSource::closeSocket() {
- debugLog<<"Close Socket:"<<endl;
+ //debugLog<<"Close Socket:"<<endl;
closesocket(mSocket);
}
void HTTPFileSource::close() {
@@ -325,7 +325,7 @@
//
mSeenResponse = false;
mLastResponse = "";
- debugLog<<"Open:"<<endl;
+ //debugLog<<"Open:"<<endl;
{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
CAutoLock locLock(mBufferLock);
mStreamBuffer.flush();
@@ -333,21 +333,21 @@
mStreamBuffer.seekg(0, ios_base::beg);
mStreamBuffer.seekp(0, ios_base::beg);
if(mStreamBuffer.fail()) {
- debugLog<<"OPEN : Stream buffer already fucked"<<endl;
+ //debugLog<<"OPEN : Stream buffer already fucked"<<endl;
}
} //END CRITICAL SECTION
bool locIsOK = setupSocket(inSourceLocation);
if (!locIsOK) {
- debugLog<<"Setup socket FAILED"<<endl;
+ //debugLog<<"Setup socket FAILED"<<endl;
closeSocket();
return false;
}
- debugLog<<"Sending request..."<<endl;
+ //debugLog<<"Sending request..."<<endl;
httpRequest(assembleRequest(mFileName));
- debugLog<<"Socket ok... starting thread"<<endl;
+ //debugLog<<"Socket ok... starting thread"<<endl;
locIsOK = startThread();
@@ -364,12 +364,12 @@
unsigned long locSizeBuffed = mStreamBuffer.tellp() - mStreamBuffer.tellg();
- debugLog<<"Amount Buffered = "<<locSizeBuffed<<endl;
+ //debugLog<<"Amount Buffered = "<<locSizeBuffed<<endl;
if ((locSizeBuffed == 0) && mIsEOF) {
- debugLog<<"It is EOF"<<endl;
+ //debugLog<<"It is EOF"<<endl;
return true;
} else {
- debugLog<<"It's not EOF"<<endl;
+ //debugLog<<"It's not EOF"<<endl;
return false;
}
} //END CRITICAL SECTION
@@ -382,19 +382,19 @@
{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
CAutoLock locLock(mBufferLock);
- debugLog<<"Read:"<<endl;
+ //debugLog<<"Read:"<<endl;
if(isEOF() || mWasError) {
- debugLog<<"Can't read is error or eof"<<endl;
+ //debugLog<<"Can't read is error or eof"<<endl;
return 0;
} else {
- debugLog<<"Reading from buffer"<<endl;
+ //debugLog<<"Reading from buffer"<<endl;
mStreamBuffer.read(outBuffer, inNumBytes);
unsigned long locNumRead = mStreamBuffer.gcount();
if (locNumRead == 0) {
mStreamBuffer.clear();
}
- debugLog<<locNumRead<<" bytes read from buffer"<<endl;
+ //debugLog<<locNumRead<<" bytes read from buffer"<<endl;
return locNumRead;
}
} //END CRITICAL SECTION
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -34,7 +34,7 @@
//#include <stdlib.h>
#include <string>
#include <sstream>
-#include <fstream>
+//#include <fstream>
using namespace std;
class OGG_DEMUX_API HTTPFileSource
: public IFilterDataSource
@@ -78,8 +78,8 @@
SOCKET mSocket;
stringstream mStreamBuffer;
- fstream debugLog;
- fstream fileDump;
+ //fstream debugLog;
+ //fstream fileDump;
bool mIsEOF;
bool mWasError;
bool mIsOpen;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -100,13 +100,13 @@
m_pLock = new CCritSec;
mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
- debugLog.open("C:\\temp\\muxer.log", ios_base::out);
+ //debugLog.open("C:\\temp\\muxer.log", ios_base::out);
}
OggMuxFilter::~OggMuxFilter(void)
{
- debugLog.close();
+ //debugLog.close();
//DbgLog((LOG_ERROR, 1, TEXT("****************** DESTRUCTOR **********************")));
delete m_pLock;
@@ -144,7 +144,7 @@
}
bool OggMuxFilter::acceptOggPage(OggPage* inOggPage) {
- debugLog<<"Page accepted... writing..."<<endl;
+ //debugLog<<"Page accepted... writing..."<<endl;
unsigned char* locPageData = inOggPage->createRawPageData();
mOutputFile.write((char*)locPageData, inOggPage->pageSize());
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -95,7 +95,7 @@
OggPageInterleaver* mInterleaver;
fstream mOutputFile;
- fstream debugLog;
+ //fstream debugLog;
HRESULT mHR;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -49,12 +49,12 @@
mPaginator.setParameters(locSettings);
mPaginator.setPageCallback(mMuxStream);
- debugLog.open("C:\\temp\\oggmuxinpin.log", ios_base::out);
+ //debugLog.open("C:\\temp\\oggmuxinpin.log", ios_base::out);
}
OggMuxInputPin::~OggMuxInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
}
HRESULT OggMuxInputPin::SetMediaType(const CMediaType* inMediaType) {
@@ -124,7 +124,7 @@
inSample->GetPointer(&locSampleBuff);
HRESULT locHR = inSample->GetTime(&locStart, &locEnd);
- debugLog <<"Received "<<locStart<<" - "<<locEnd<<endl;
+ //debugLog <<"Received "<<locStart<<" - "<<locEnd<<endl;
long locBuffSize = inSample->GetActualDataLength();
unsigned char* locBuff = new unsigned char[locBuffSize];
memcpy((void*)locBuff, (const void*)locSampleBuff, inSample->GetActualDataLength());
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -76,5 +76,5 @@
OggPaginator mPaginator;
OggMuxStream* mMuxStream;
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -34,7 +34,7 @@
OggDataBuffer::OggDataBuffer(void)
{
- debugLog.open("G:\\logs\\OggDataBuffer.log", ios_base::out);
+ //debugLog.open("G:\\logs\\OggDataBuffer.log", ios_base::out);
pendingPage = NULL;
mState = AWAITING_BASE_HEADER;
mNumBytesNeeded = OggPageHeader::OGG_BASE_HEADER_SIZE;
@@ -42,7 +42,7 @@
OggDataBuffer::~OggDataBuffer(void)
{
- debugLog.close();
+ //debugLog.close();
delete pendingPage;
}
@@ -76,7 +76,7 @@
unsigned long OggDataBuffer::numBytesAvail() {
//Returns how many bytes are available in the buffer
unsigned long locBytesAvail = mStream.tellp() - mStream.tellg();
- debugLog<<"Bytes avail = "<<locBytesAvail<<endl;
+ //debugLog<<"Bytes avail = "<<locBytesAvail<<endl;
return locBytesAvail;
}
@@ -85,7 +85,7 @@
return mState;
}
bool OggDataBuffer::dispatch(OggPage* inOggPage) {
- debugLog<<"Dispatching page..."<<endl;
+ //debugLog<<"Dispatching page..."<<endl;
bool locIsOK;
//Fire off the oggpage to whoever is registered to get it
@@ -120,20 +120,20 @@
bool OggDataBuffer::feed(const char* inData, unsigned long inNumBytes) {
if (inNumBytes != 0) {
- debugLog<<"Fed "<<inNumBytes<<" bytes..."<<endl;
+ //debugLog<<"Fed "<<inNumBytes<<" bytes..."<<endl;
mStream.write(inData, inNumBytes);
//FIX ::: Need error checking.
return processBuffer();
} else {
- debugLog<<"Fed *zero* bytes..."<<endl;
+ //debugLog<<"Fed *zero* bytes..."<<endl;
return true;
}
}
void OggDataBuffer::processBaseHeader() {
- debugLog<<"ProcessBaseHeader : "<<endl;
+ //debugLog<<"ProcessBaseHeader : "<<endl;
//Delete the previous page
delete pendingPage;
//make a fresh one
@@ -142,72 +142,72 @@
//Make a local buffer
unsigned char* locBuff = new unsigned char[OggPageHeader::OGG_BASE_HEADER_SIZE];
- debugLog<<"ProcessBaseHeader : Reading from stream..."<<endl;
+ //debugLog<<"ProcessBaseHeader : Reading from stream..."<<endl;
//Read from the stream buffer to it
mStream.read((char*)locBuff, OggPageHeader::OGG_BASE_HEADER_SIZE);
if(mStream.fail()) {
- debugLog<<"ProcessBaseHeader : Read FAILED"<<endl;
+ //debugLog<<"ProcessBaseHeader : Read FAILED"<<endl;
}
//Set the base header into the pending page
pendingPage->header()->setBaseHeader((unsigned char*)locBuff);
//NOTE ::: The page will delete the buffer when it's done. Don't delete it here
- debugLog<<"ProcessBaseHeader : Setting state to AWAITING_SEG_TABLE"<<endl;
+ //debugLog<<"ProcessBaseHeader : Setting state to AWAITING_SEG_TABLE"<<endl;
//Change the state.
mState = AWAITING_SEG_TABLE;
//Set the number of bytes we want for next time
mNumBytesNeeded = pendingPage->header()->NumPageSegments();
- debugLog<<"ProcessBaseHeader : Bytes needed for seg table = "<<mNumBytesNeeded<<endl;
+ //debugLog<<"ProcessBaseHeader : Bytes needed for seg table = "<<mNumBytesNeeded<<endl;
}
void OggDataBuffer::processSegTable() {
- debugLog<<"ProcessSegTable : "<<endl;
+ //debugLog<<"ProcessSegTable : "<<endl;
unsigned long locNumSegs = pendingPage->header()->NumPageSegments();
- debugLog<<"ProcessSegTable : Num segs = "<<locNumSegs<<endl;
+ //debugLog<<"ProcessSegTable : Num segs = "<<locNumSegs<<endl;
//Make a local buffer
unsigned char* locBuff = new unsigned char[locNumSegs];
- debugLog<<"ProcessSegTable : Reading from buffer..."<<endl;
+ //debugLog<<"ProcessSegTable : Reading from buffer..."<<endl;
//Read from the stream buffer to it
mStream.read((char*)locBuff, locNumSegs);
if(mStream.fail()) {
- debugLog<<"ProcessSegTable : Read FAILED"<<endl;
+ //debugLog<<"ProcessSegTable : Read FAILED"<<endl;
}
//Set the data into the pending pages segtable
pendingPage->header()->setSegmentTable(locBuff);
//NOTE ::: The seg table will delete the buffer itself. Don't delete here.
- debugLog<<"ProcessSegTable : Transition to AWAITING_DATA"<<endl;
+ //debugLog<<"ProcessSegTable : Transition to AWAITING_DATA"<<endl;
mState = AWAITING_DATA;
//Set the number of bytes we want for next time
mNumBytesNeeded = pendingPage->header()->dataSize();
- debugLog<<"ProcessSegTable : Num bytes needed for data = "<< mNumBytesNeeded<<endl;
+ //debugLog<<"ProcessSegTable : Num bytes needed for data = "<< mNumBytesNeeded<<endl;
}
bool OggDataBuffer::processDataSegment() {
- debugLog<<"ProcessDataSegment : "<<endl;
+ //debugLog<<"ProcessDataSegment : "<<endl;
//Make a local buffer
unsigned long locPageDataSize = pendingPage->header()->dataSize();
- debugLog<<"ProcessDataSegment : Page data size = "<<locPageDataSize<<endl;
+ //debugLog<<"ProcessDataSegment : Page data size = "<<locPageDataSize<<endl;
unsigned char* locBuff = NULL;// = new unsigned char[locPageDataSize];
//unsigned long locPacketOffset = 0;
unsigned char* locSegTable = pendingPage->header()->SegmentTable()->segmentTable();
unsigned int locNumSegs = pendingPage->header()->SegmentTable()->numSegments();
- debugLog<<"ProcessDataSegment : Num segs = "<<locNumSegs<<endl;
+ //debugLog<<"ProcessDataSegment : Num segs = "<<locNumSegs<<endl;
unsigned long locCurrPackSize = 0;
bool locIsLastSeg = false;
@@ -222,7 +222,7 @@
//This pointer is given to the packet... it deletes it.
locBuff = new unsigned char[locCurrPackSize];
mStream.read((char*)(locBuff), locCurrPackSize);
- debugLog<<"ProcessDataSegment : Adding packet size = "<<locCurrPackSize<<endl;
+ //debugLog<<"ProcessDataSegment : Adding packet size = "<<locCurrPackSize<<endl;
pendingPage->addPacket( new StampedOggPacket(locBuff, locCurrPackSize, (locSegTable[i] != 255), 0, pendingPage->header()->GranulePos()->value(), StampedOggPacket::OGG_END_ONLY ) );
//locPacketOffset += locCurrPackSize;
@@ -230,11 +230,11 @@
}
}
- debugLog<<"ProcessDataSegment : Transition to AWAITING_BASE_HEADER"<<endl;
+ //debugLog<<"ProcessDataSegment : Transition to AWAITING_BASE_HEADER"<<endl;
mState = AWAITING_BASE_HEADER;
mNumBytesNeeded = OggPageHeader::OGG_BASE_HEADER_SIZE;
- debugLog<<"ProcessDataSegment : num bytes needed = "<<mNumBytesNeeded<<endl;
+ //debugLog<<"ProcessDataSegment : num bytes needed = "<<mNumBytesNeeded<<endl;
return dispatch(pendingPage);
}
@@ -248,40 +248,40 @@
// int i = i;
//}
- debugLog<<"ClearData : Transition back to AWAITING_BASE_HEADER"<<endl;
+ //debugLog<<"ClearData : Transition back to AWAITING_BASE_HEADER"<<endl;
mState = eState::AWAITING_BASE_HEADER;
mNumBytesNeeded = OggPageHeader::OGG_BASE_HEADER_SIZE;
- debugLog<<"ClearData : Num bytes needed = "<<mNumBytesNeeded<<endl;
+ //debugLog<<"ClearData : Num bytes needed = "<<mNumBytesNeeded<<endl;
}
bool OggDataBuffer::processBuffer() {
- debugLog<<"ProcessBuffer :"<<endl;
+ //debugLog<<"ProcessBuffer :"<<endl;
bool locErr;
while (numBytesAvail() >= mNumBytesNeeded) {
- debugLog<<"ProcessBuffer : Bytes Needed = "<<mNumBytesNeeded<<" --- "<<"Bytes avail = "<<numBytesAvail()<<endl;
+ //debugLog<<"ProcessBuffer : Bytes Needed = "<<mNumBytesNeeded<<" --- "<<"Bytes avail = "<<numBytesAvail()<<endl;
switch (mState) {
case eState::AWAITING_BASE_HEADER:
- debugLog<<"ProcessBuffer : State = AWAITING_BASE_HEADER"<<endl;
+ //debugLog<<"ProcessBuffer : State = AWAITING_BASE_HEADER"<<endl;
//If theres enough data to form the base header
if (numBytesAvail() >= OggPageHeader::OGG_BASE_HEADER_SIZE) {
- debugLog<<"ProcessBuffer : Enough to process..."<<endl;
+ //debugLog<<"ProcessBuffer : Enough to process..."<<endl;
processBaseHeader();
}
break;
case eState::AWAITING_SEG_TABLE:
- debugLog<<"ProcessBuffer : State = AWAITING_SEG_TABLE"<<endl;
+ //debugLog<<"ProcessBuffer : State = AWAITING_SEG_TABLE"<<endl;
//If there is enough data to get the segt table
if (numBytesAvail() >= pendingPage->header()->NumPageSegments()) {
- debugLog<<"ProcessBuffer : Enough to process..."<<endl;
+ //debugLog<<"ProcessBuffer : Enough to process..."<<endl;
processSegTable();
}
break;
case eState::AWAITING_DATA:
- debugLog<<"ProcessBuffer : State = AWAITING_DATA"<<endl;
+ //debugLog<<"ProcessBuffer : State = AWAITING_DATA"<<endl;
//If all the data segment is available
if (numBytesAvail() >= pendingPage->header()->dataSize()) {
- debugLog<<"ProcessBuffer : Enough to process..."<<endl;
+ //debugLog<<"ProcessBuffer : Enough to process..."<<endl;
locErr = processDataSegment();
if (!locErr) {
return false;
@@ -290,7 +290,7 @@
break;
default:
//Do sometyhing ??
- debugLog<<"ProcessBuffer : Ogg Buffer Error"<<endl;
+ //debugLog<<"ProcessBuffer : Ogg Buffer Error"<<endl;
break;
}
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -36,7 +36,7 @@
#include "IOggCallback.h"
//Only needed for debugging
-#include <fstream>
+//#include <fstream>
//
using namespace std;
@@ -89,7 +89,7 @@
vector<IOggCallback*> mVirtualCallbackList;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
//
private:
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-07-03 21:30:01 UTC (rev 6971)
@@ -35,12 +35,12 @@
: mFileWriter(inFileWriter)
, mNotifier(inNotifier)
{
- debugLog.open("G:\\logs\\interleaver.log", ios_base::out);
+ //debugLog.open("G:\\logs\\interleaver.log", ios_base::out);
}
OggPageInterleaver::~OggPageInterleaver(void)
{
- debugLog.close();
+ //debugLog.close();
}
OggMuxStream* OggPageInterleaver::newStream() {
@@ -101,11 +101,11 @@
if (!mInputStreams[i]->isEmpty() && mInputStreams[i]->isActive()) {
if (locLowestStream == NULL) {
locLowestStream = mInputStreams[i];
- debugLog<<"writeLowest : Defaulting stream "<<i<<endl;
+ //debugLog<<"writeLowest : Defaulting stream "<<i<<endl;
} else {
__int64 locCurrLowTime = locLowestStream->scaledFrontTime();
__int64 locTestLowTime = mInputStreams[i]->scaledFrontTime();
- debugLog<<"writeLowest : Curr = "<<locCurrLowTime<<" -- Test["<<i<<"] = "<<locTestLowTime<<endl;
+ //debugLog<<"writeLowest : Curr = "<<locCurrLowTime<<" -- Test["<<i<<"] = "<<locTestLowTime<<endl;
if (locTestLowTime == 3579139411666666) {
locTestLowTime = locTestLowTime;
}
@@ -120,7 +120,7 @@
(locTestLowTime < locCurrLowTime)
)
{
- debugLog<<"writeLowest : Selecting stream "<<i<<endl;
+ //debugLog<<"writeLowest : Selecting stream "<<i<<endl;
locLowestStream = mInputStreams[i];
}
}
@@ -129,7 +129,7 @@
if (locLowestStream == NULL) {
throw 0;
} else {
- debugLog<<"writeLowest : Writing..."<<endl;
+ //debugLog<<"writeLowest : Writing..."<<endl;
mFileWriter->acceptOggPage(locLowestStream->popFront());
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-07-03 20:27:19 UTC (rev 6970)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-07-03 21:30:01 UTC (rev 6971)
@@ -35,7 +35,8 @@
#include <vector>
//DEBUG ONLY
-#include <fstream>
+//#include <fstream>
+//
using namespace std;
class LIBOOOGG_API OggPageInterleaver
: public INotifyArrival
@@ -61,6 +62,6 @@
INotifyComplete* mNotifier;
//DEBUG ONLY
- fstream debugLog;
+ //fstream debugLog;
//
};
More information about the commits
mailing list