[xiph-commits] r8050 - in trunk/oggdsf/src/lib:
codecs/flac/filters/dsfFLACEncoder codecs/flac/libs/libFLACHelper
core/directshow/dsfAbstractAudioEncoder
core/directshow/dsfAnxDemux core/directshow/dsfOggDemux
core/directshow/dsfOggMux core/directshow/dsfSeeking
core/directshow/dsfSubtitleVMR9 core/ogg/libOOOgg
core/ogg/libOOOggSeek
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Oct 17 22:50:14 PDT 2004
Author: illiminable
Date: 2004-10-17 22:50:14 -0700 (Sun, 17 Oct 2004)
New Revision: 8050
Modified:
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
Log:
* Undebugamalise.
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -38,12 +38,12 @@
{
- debugLog.open("G:\\logs\\FLACenc.log", ios_base::out);
+ //debugLog.open("G:\\logs\\FLACenc.log", ios_base::out);
}
FLACEncodeInputPin::~FLACEncodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
DestroyCodec();
}
@@ -181,27 +181,27 @@
// locBuffer[5] = 1;
// locBuffer[6] = 0;
- debugLog<<"Write CAllback.."<<endl;
+ //debugLog<<"Write CAllback.."<<endl;
LONGLONG locFrameStart = 0;
LONGLONG locFrameEnd = 0;
if (!mTweakedHeaders) {
- debugLog<<"Still tweaking headers..."<<endl;
+ //debugLog<<"Still tweaking headers..."<<endl;
//Still handling headers...
unsigned char* locBuf = new unsigned char[inNumBytes];
memcpy((void*)locBuf, (const void*) inBuffer, inNumBytes);
- debugLog<<"Sending header to tweaker..."<<endl;
+ //debugLog<<"Sending header to tweaker..."<<endl;
FLACHeaderTweaker::eFLACAcceptHeaderResult locResult = mHeaderTweaker.acceptHeader(new OggPacket(locBuf, inNumBytes, false, false));
- debugLog<<"Tweaker returned... "<<(int)locResult<<endl;
+ //debugLog<<"Tweaker returned... "<<(int)locResult<<endl;
if (locResult == FLACHeaderTweaker::LAST_HEADER_ACCEPTED) {
- debugLog<<"Last Header accepted..."<<endl;
+ //debugLog<<"Last Header accepted..."<<endl;
//Send all the headers
mTweakedHeaders = true;
for (int i = 0; i < mHeaderTweaker.numNewHeaders(); i++) {
//Loop through firing out all the headers.
- debugLog<<"Sending new header "<<i<<endl;
+ //debugLog<<"Sending new header "<<i<<endl;
//Get a pointer to a new sample stamped with our time
IMediaSample* locSample;
@@ -229,9 +229,9 @@
HRESULT locHR = mOutputPin->mDataQueue->Receive(locSample); //->DownstreamFilter()->Receive(locSample);
if (locHR != S_OK) {
- debugLog<<"Sample rejected"<<endl;
+ //debugLog<<"Sample rejected"<<endl;
} else {
- debugLog<<"Sample Delivered"<<endl;
+ //debugLog<<"Sample Delivered"<<endl;
}
}
@@ -243,10 +243,10 @@
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
} else if (locResult == FLACHeaderTweaker::HEADER_ACCEPTED) {
//Another header added.
- debugLog<<"Header accepted"<<endl;
+ //debugLog<<"Header accepted"<<endl;
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
} else {
- debugLog<<"Header failed..."<<endl;
+ //debugLog<<"Header failed..."<<endl;
return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -79,7 +79,7 @@
//SpeexDecodeOutputPin* mOutputPin;
//__int64 mUptoFrame;
- fstream debugLog;
+ //fstream debugLog;
/* FishSound* mFishSound;
FishSoundInfo mFishInfo;*/
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -36,48 +36,48 @@
: mSeenAllHeaders(false)
{
- debugLog.open("G:\\logs\\flactweaker.log", ios_base::out);
+ //debugLog.open("G:\\logs\\flactweaker.log", ios_base::out);
}
FLACHeaderTweaker::~FLACHeaderTweaker(void)
{
- debugLog<<"Pre delete old..."<<endl;
+ //debugLog<<"Pre delete old..."<<endl;
deleteOldHeaders();
- debugLog<<"Pre delete new..."<<endl;
+ //debugLog<<"Pre delete new..."<<endl;
deleteNewHeaders();
- debugLog<<"Post delete..."<<endl;
- debugLog.close();
+ //debugLog<<"Post delete..."<<endl;
+ //debugLog.close();
}
FLACHeaderTweaker::eFLACAcceptHeaderResult FLACHeaderTweaker::acceptHeader(OggPacket* inHeader) {
- debugLog<<endl<<"Accepting header.."<<endl;
- debugLog<<inHeader->toPackDumpString()<<endl;
+ //debugLog<<endl<<"Accepting header.."<<endl;
+ //debugLog<<inHeader->toPackDumpString()<<endl;
const unsigned char MORE_HEADERS_MASK = 128;
if (!mSeenAllHeaders) {
- debugLog<<"Still tweaking... adding to old list..."<<endl;
+ //debugLog<<"Still tweaking... adding to old list..."<<endl;
mOldHeaderList.push_back(inHeader);
if ((inHeader->packetData()[0] & MORE_HEADERS_MASK) != 0) {
- debugLog<<"This is the last header..."<<endl;
+ //debugLog<<"This is the last header..."<<endl;
//Last header
mSeenAllHeaders = true;
if (createNewHeaderList()) {
- debugLog<<"Create new headers OK"<<endl;
+ //debugLog<<"Create new headers OK"<<endl;
return LAST_HEADER_ACCEPTED;
} else {
- debugLog<<"Create new headers FAILED"<<endl;
+ //debugLog<<"Create new headers FAILED"<<endl;
return HEADER_ERROR;
}
} else {
- debugLog<<"Still need more ehaders..."<<endl;
+ //debugLog<<"Still need more ehaders..."<<endl;
//Still more headers to come...
return HEADER_ACCEPTED;
}
} else {
- debugLog<<"All headers already seen"<<endl;
+ //debugLog<<"All headers already seen"<<endl;
return ALL_HEADERS_ALREADY_SEEN;
}
@@ -85,9 +85,9 @@
bool FLACHeaderTweaker::createNewHeaderList() {
- debugLog<<"Create new header list method"<<endl;
+ //debugLog<<"Create new header list method"<<endl;
- debugLog<<"Filling first pack"<<endl;
+ //debugLog<<"Filling first pack"<<endl;
unsigned char* locFirstPackBuff = new unsigned char[51];
locFirstPackBuff[0] = '\177';
locFirstPackBuff[1] = 'F';
@@ -103,12 +103,12 @@
locFirstPackBuff[11] = 'a';
locFirstPackBuff[12] = 'C';
- debugLog<<"Copying in packet data"<<endl;
+ //debugLog<<"Copying in packet data"<<endl;
memcpy((void*)(locFirstPackBuff + 13), (const void*) mOldHeaderList[1]->packetData(), 38);
mNewHeaderList.empty();
mNewHeaderList.clear();
- debugLog<<"Putting first header into new list"<<endl;
+ //debugLog<<"Putting first header into new list"<<endl;
mNewHeaderList.push_back(new OggPacket(locFirstPackBuff, 51, false, false));
locFirstPackBuff = NULL;
@@ -118,10 +118,10 @@
//Start at 2, 0 is just fLaC, 1 is the stream info
for (int i = 2; i < mOldHeaderList.size(); i++) {
//Loop through to find the comment packet...
- debugLog<<"Scanning old header "<<i<<endl;
+ //debugLog<<"Scanning old header "<<i<<endl;
if ( ((mOldHeaderList[i]->packetData()[0]) & 127) == 4) {
//It's the comment packet.
- debugLog<<"Found a comment packet..."<<endl;
+ //debugLog<<"Found a comment packet..."<<endl;
locFoundComment = true;
locCommentNo = i;
mNewHeaderList.push_back(mOldHeaderList[i]->clone());
@@ -129,7 +129,7 @@
}
if (locFoundComment != true) {
- debugLog<<"No comments present... FATALITY !"<<endl;
+ //debugLog<<"No comments present... FATALITY !"<<endl;
//Maybe make one... for now bail out !
throw 0;
}
@@ -137,7 +137,7 @@
for (int i = 2; i < mOldHeaderList.size(); i++) {
if (i != locCommentNo) {
- debugLog<<"Adding another ehader..."<<endl;
+ //debugLog<<"Adding another ehader..."<<endl;
//If it's not the comment packet we already added, put it in the list.
mNewHeaderList.push_back(mOldHeaderList[i]->clone());
}
@@ -147,16 +147,16 @@
//Loop through the new headers and make sure the flags are set right.
if (i != mNewHeaderList.size() -1) {
//Clear the first bit
- debugLog<<"Clearing header bit "<<i<<endl;
+ //debugLog<<"Clearing header bit "<<i<<endl;
mNewHeaderList[i]->packetData()[0] = mNewHeaderList[i]->packetData()[0] & 127;
} else {
- debugLog<<"Setting header bit "<<i<<endl;
+ //debugLog<<"Setting header bit "<<i<<endl;
//Set the first bit on the last header
mNewHeaderList[i]->packetData()[0] = mNewHeaderList[i]->packetData()[0] | 128;
}
}
- debugLog<<"Deleting old headers..."<<endl;
+ //debugLog<<"Deleting old headers..."<<endl;
deleteOldHeaders();
return true;
@@ -166,22 +166,22 @@
void FLACHeaderTweaker::deleteOldHeaders() {
int locSize = mOldHeaderList.size();
- debugLog<<"Num old headers... = "<<locSize<<endl;
+ //debugLog<<"Num old headers... = "<<locSize<<endl;
for (int i = 0; i < locSize; i++) {
delete mOldHeaderList[i];
}
- debugLog<<"Post old delete loop..."<<endl;
+ //debugLog<<"Post old delete loop..."<<endl;
mOldHeaderList.clear();
}
void FLACHeaderTweaker::deleteNewHeaders() {
int locSize = mNewHeaderList.size();
- debugLog<<"Num new headers... = "<<locSize<<endl;
+ //debugLog<<"Num new headers... = "<<locSize<<endl;
for (int i = 0; i < locSize; i++) {
delete mNewHeaderList[i];
}
- debugLog<<"Post new delete loop"<<endl;
+ //debugLog<<"Post new delete loop"<<endl;
mNewHeaderList.clear();
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -62,6 +62,6 @@
vector<OggPacket*> mNewHeaderList;
- fstream debugLog;
+ //fstream debugLog;
bool mSeenAllHeaders;
};
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -35,14 +35,14 @@
FLACMetadataSplitter::FLACMetadataSplitter(void)
: mMetadataBlock(NULL)
{
- debugLog.open("G:\\logs\\flacsplitter.log", ios_base::out);
+ //debugLog.open("G:\\logs\\flacsplitter.log", ios_base::out);
}
FLACMetadataSplitter::~FLACMetadataSplitter(void)
{
delete mMetadataBlock;
//Delete stuff !!
- debugLog.close();
+ //debugLog.close();
}
StampedOggPacket* FLACMetadataSplitter::convertToStampedPacket(OggPacket* inPacket) {
//Convert the old packet to the new one.
@@ -58,7 +58,7 @@
}
bool FLACMetadataSplitter::loadMetadata(OggPacket* inMetadata) {
- debugLog<<"Load Metadata"<<endl;
+ //debugLog<<"Load Metadata"<<endl;
delete mMetadataBlock;
mMetadataBlock = inMetadata;
return splitMetadata();
@@ -79,7 +79,7 @@
}
bool FLACMetadataSplitter::splitMetadata() {
- debugLog<<"Splitmetadata"<<endl;
+ //debugLog<<"Splitmetadata"<<endl;
//emptyList();
//OggPacket* locPacket = NULL;
unsigned char* locBuff = NULL;
@@ -87,11 +87,11 @@
return false;
} else {
if (verifyCodecID()) {
- debugLog<<"Start adding packets..."<<endl;
+ //debugLog<<"Start adding packets..."<<endl;
addCodecIdent();
addStreamInfo();
addOtherHeaders();
- debugLog<<"Done adding packets..."<<endl;
+ //debugLog<<"Done adding packets..."<<endl;
} else {
return false;
}
@@ -101,7 +101,7 @@
}
bool FLACMetadataSplitter::addOtherHeaders() {
- debugLog<<"Add other headers..."<<endl;
+ //debugLog<<"Add other headers..."<<endl;
unsigned long locUpto = 42;
unsigned long locMetaSize = mMetadataBlock->packetSize();
unsigned char* locSourceBuff = mMetadataBlock->packetData(); //Don't delete !
@@ -109,23 +109,23 @@
unsigned long locPacketSize = 0;
OggPacket* locPacket = NULL;
- debugLog<<"Metadata size = "<<locMetaSize<<endl;
+ //debugLog<<"Metadata size = "<<locMetaSize<<endl;
while ( locUpto < locMetaSize) {
- debugLog<<"Add others loop... upto = "<<locUpto<<endl;
+ //debugLog<<"Add others loop... upto = "<<locUpto<<endl;
for (int i = 1; i < 4; i++) {
locPacketSize <<=8;
locPacketSize += locSourceBuff[locUpto+i];
}
locPacketSize += 4;
- debugLog<<"Packet size = "<<locPacketSize<<endl;
+ //debugLog<<"Packet size = "<<locPacketSize<<endl;
//locUpto += 4;
locNewBuff = new unsigned char[locPacketSize];
memcpy((void*)locNewBuff, (const void*)(locSourceBuff + locUpto), locPacketSize);
locPacket = new OggPacket(locNewBuff, locPacketSize, false, false);
- debugLog<<"Adding other packet..."<<endl;
- debugLog<<locPacket->toPackDumpString()<<endl;
+ //debugLog<<"Adding other packet..."<<endl;
+ //debugLog<<locPacket->toPackDumpString()<<endl;
mHeaderTweaker.acceptHeader(locPacket);
locPacket = NULL;
@@ -137,19 +137,19 @@
return true;
}
bool FLACMetadataSplitter::addStreamInfo() {
- debugLog<<"addstreaminfo..."<<endl;
+ //debugLog<<"addstreaminfo..."<<endl;
OggPacket* locPacket = NULL;
unsigned char* locBuff = new unsigned char[38];
memcpy((void*)locBuff, (const void*)(mMetadataBlock->packetData()+4), 38);
locPacket = new OggPacket(locBuff, 38, false, false); //No need to delete
- debugLog<<"Adding stream info packet..."<<endl;
- debugLog<<locPacket->toPackDumpString()<<endl;
+ //debugLog<<"Adding stream info packet..."<<endl;
+ //debugLog<<locPacket->toPackDumpString()<<endl;
mHeaderTweaker.acceptHeader(locPacket);
return true;
}
bool FLACMetadataSplitter::addCodecIdent() {
- debugLog<<"Add codec ident"<<endl;
+ //debugLog<<"Add codec ident"<<endl;
OggPacket* locPacket = NULL;
unsigned char* locBuff = new unsigned char[4];
locBuff[0] = 'f';
@@ -163,10 +163,10 @@
bool FLACMetadataSplitter::verifyCodecID() {
if ((strncmp((char*)mMetadataBlock->packetData(), "fLaC\000\000\000\042", 8)) == 0) {
- debugLog<<"Codec verified"<<endl;
+ //debugLog<<"Codec verified"<<endl;
return true;
} else {
- debugLog<<"Codec NOT VERIFIED"<<endl;
+ //debugLog<<"Codec NOT VERIFIED"<<endl;
return false;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -61,5 +61,5 @@
bool splitMetadata();
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeFilter.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioEncoder/AbstractAudioEncodeFilter.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -65,6 +65,8 @@
return mInputPin;
} else if (inPinNo == 1) {
return mOutputPin;
+ } else {
+ return NULL;
}
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -67,12 +67,12 @@
: OggDemuxSourceFilter(CLSID_AnxDemuxSourceFilter)
{
mStreamMapper = new AnxStreamMapper(this);
- anxDebug.open("G:\\logs\\anxdemux.log", ios_base::out);
+ //anxDebug.open("G:\\logs\\anxdemux.log", ios_base::out);
}
AnxDemuxSourceFilter::~AnxDemuxSourceFilter(void)
{
- anxDebug<<"Deconstructing anx filter"<<endl;
+ //anxDebug<<"Deconstructing anx filter"<<endl;
}
@@ -81,13 +81,13 @@
//Initialise the file here and setup all the streams
CAutoLock locLock(m_pLock);
mFileName = inFileName;
- anxDebug<<"Anx opens : "<<StringHelper::toNarrowStr(mFileName)<<endl;
+ //anxDebug<<"Anx opens : "<<StringHelper::toNarrowStr(mFileName)<<endl;
//ANX::: Needs to override ??? Or just modify the seeker.
mSeekTable = new AutoAnxSeekTable(StringHelper::toNarrowStr(mFileName));
- anxDebug<<"After seek table instantiation"<<endl;
+ //anxDebug<<"After seek table instantiation"<<endl;
mSeekTable->buildTable();
- anxDebug<<"After build table..."<<endl;
+ //anxDebug<<"After build table..."<<endl;
return SetUpPins();
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -56,5 +56,5 @@
STDMETHODIMP Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType);
protected:
- fstream anxDebug;
+ //fstream anxDebug;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -40,7 +40,7 @@
, mCMMLFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
- debugLog.open("G:\\logs\\cmmlstream.log", ios_base::out);
+ //debugLog.open("G:\\logs\\cmmlstream.log", ios_base::out);
}
CMMLStream::~CMMLStream(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -35,8 +35,8 @@
: mBufferLock(NULL)
{
mBufferLock = new CCritSec;
- debugLog.open("G:\\logs\\httpdebug.log", ios_base::out | ios_base::ate | ios_base::app);
- debugLog<<"==========================================="<<endl;
+ //debugLog.open("G:\\logs\\httpdebug.log", ios_base::out | ios_base::ate | ios_base::app);
+ //debugLog<<"==========================================="<<endl;
//fileDump.open("G:\\filedump.ogg", ios_base::out|ios_base::binary);
@@ -46,10 +46,10 @@
HTTPFileSource::~HTTPFileSource(void)
{
- debugLog<<"About to close socket"<<endl;
+ //debugLog<<"About to close socket"<<endl;
close();
- debugLog<<"Winsock ended"<<endl;
- debugLog.close();
+ //debugLog<<"Winsock ended"<<endl;
+ //debugLog.close();
//fileDump.close();
delete mBufferLock;
@@ -64,7 +64,7 @@
locBuff = new char[RECV_BUFF_SIZE];
while(true) {
if(CheckRequest(&locCommand) == TRUE) {
- debugLog<<"Thread Data Process loop received breakout signal..."<<endl;
+ //debugLog<<"Thread Data Process loop received breakout signal..."<<endl;
delete[] locBuff;
return;
}
@@ -73,13 +73,13 @@
//debugLog<<"recv complete"<<endl;
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;
delete[] locBuff;
return;
@@ -180,16 +180,16 @@
void HTTPFileSource::close() {
//Killing thread
- debugLog<<"HTTPFileSource::close()"<<endl;
+ //debugLog<<"HTTPFileSource::close()"<<endl;
if (ThreadExists() == TRUE) {
- debugLog<<"Calling Thread to EXIT"<<endl;
+ //debugLog<<"Calling Thread to EXIT"<<endl;
CallWorker(THREAD_EXIT);
- debugLog<<"Killing thread..."<<endl;
+ //debugLog<<"Killing thread..."<<endl;
Close();
- debugLog<<"After Close called on CAMThread"<<endl;
+ //debugLog<<"After Close called on CAMThread"<<endl;
}
- debugLog<<"Closing socket..."<<endl;
+ //debugLog<<"Closing socket..."<<endl;
//Close the socket down.
closeSocket();
}
@@ -206,7 +206,7 @@
//
mSeenResponse = false;
mLastResponse = "";
- debugLog<<"Open: "<<inSourceLocation<<endl;
+ //debugLog<<"Open: "<<inSourceLocation<<endl;
{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
CAutoLock locLock(mBufferLock);
@@ -232,7 +232,7 @@
locCacheFileName += StringHelper::numToString(locRand);
locCacheFileName += ".ogg";
- debugLog<<"Cache file = "<<locCacheFileName<<endl;
+ //debugLog<<"Cache file = "<<locCacheFileName<<endl;
if(mFileCache.open(locCacheFileName)) {
//debugLog<<"OPEN : Cach file opened"<<endl;
}
@@ -241,16 +241,16 @@
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;
//How is filename already set ??
httpRequest(assembleRequest(mFileName));
- debugLog<<"Socket ok... starting thread"<<endl;
+ //debugLog<<"Socket ok... starting thread"<<endl;
locIsOK = startThread();
@@ -269,7 +269,7 @@
//debugLog<<"isEOF : Amount Buffered avail = "<<locSizeBuffed<<endl;
if ((locSizeBuffed == 0) && mIsEOF) {
- debugLog<<"isEOF : It is EOF"<<endl;
+ //debugLog<<"isEOF : It is EOF"<<endl;
return true;
} else {
//debugLog<<"isEOF : It's not EOF"<<endl;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -75,7 +75,7 @@
//stringstream mStreamBuffer;
SingleMediaFileCache mFileCache;
- fstream debugLog;
+ //fstream debugLog;
//fstream fileDump;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -114,11 +114,11 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
- debugLog.open("g:\\logs\\sourcelog.log", ios_base::out | ios_base::ate | ios_base::app);
+ //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out | ios_base::ate | ios_base::app);
//debugLog<<"Test..."<<endl;
//debugLog.seekp(0, ios_base::end);
//debugLog<<"Test2..."<<endl;
- debugLog << "**************** Starting LOg ********************"<<endl;
+ //debugLog << "**************** Starting LOg ********************"<<endl;
}
@@ -152,10 +152,10 @@
//delete mStreamLock;
//delete mSourceFileLock;
//delete mDemuxLock;
- debugLog<<"Deleting Data Source : "<<(int)mDataSource<<endl;
+ //debugLog<<"Deleting Data Source : "<<(int)mDataSource<<endl;
mDataSource->close();
delete mDataSource;
- debugLog.close();
+ //debugLog.close();
delete mStreamMapper;
@@ -209,7 +209,7 @@
CAutoLock locLock(m_pLock);
mFileName = inFileName;
- debugLog<<"Loading : "<<StringHelper::toNarrowStr(mFileName)<<endl;
+ //debugLog<<"Loading : "<<StringHelper::toNarrowStr(mFileName)<<endl;
//debugLog << "Opening source file : "<<StringHelper::toNarrowStr(mFileName)<<endl;
mSeekTable = new AutoOggSeekTable(StringHelper::toNarrowStr(mFileName));
@@ -220,7 +220,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetCapabilities(DWORD* inCapabilities) {
if (mSeekTable->enabled()) {
- debugLog<<"GetCaps "<<mSeekingCap<<endl;
+ //debugLog<<"GetCaps "<<mSeekingCap<<endl;
*inCapabilities = mSeekingCap;
return S_OK;
} else {
@@ -231,7 +231,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetDuration(LONGLONG* outDuration) {
if (mSeekTable->enabled()) {
- debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
+ //debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
*outDuration = mSeekTable->fileDuration();
return S_OK;
} else {
@@ -251,22 +251,22 @@
STDMETHODIMP OggDemuxSourceFilter::IsFormatSupported(const GUID *pFormat){
ASSERT(pFormat != NULL);
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsFormatSupported : TRUE"<<endl;
+ //debugLog<<"IsFormatSupported : TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
+ //debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
return S_FALSE;
}
}
STDMETHODIMP OggDemuxSourceFilter::QueryPreferredFormat(GUID *pFormat){
- debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
+ //debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
*pFormat = TIME_FORMAT_MEDIA_TIME;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::SetTimeFormat(const GUID *pFormat){
- debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
+ //debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::GetTimeFormat( GUID *pFormat){
@@ -276,32 +276,32 @@
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 {
- debugLog<<"GetStopPos NOT IMPL"<<endl;
+ //debugLog<<"GetStopPos NOT IMPL"<<endl;
return E_NOTIMPL;
}
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
- debugLog<<"GetCurrentPos = NOT_IMPL"<<endl;
+ //debugLog<<"GetCurrentPos = NOT_IMPL"<<endl;
return E_NOTIMPL;
//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;
@@ -382,7 +382,7 @@
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop){
- debugLog<<"Getpos : Not IMPL"<<endl;
+ //debugLog<<"Getpos : Not IMPL"<<endl;
//debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
return E_NOTIMPL;
*pCurrent = 2 * UNITS;
@@ -392,7 +392,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
//debugLog<<"****GetAvailable : NOT IMPL"<<endl;
if (mSeekTable->enabled()) {
- debugLog<<"Get Avail ok"<<endl;
+ //debugLog<<"Get Avail ok"<<endl;
*pEarliest = 0;
*pLatest = mSeekTable->fileDuration();
} else {
@@ -400,7 +400,7 @@
}
}
STDMETHODIMP OggDemuxSourceFilter::SetRate(double dRate){
- debugLog<<"Set RATE : NOT IMPL"<<endl;
+ //debugLog<<"Set RATE : NOT IMPL"<<endl;
return E_NOTIMPL;
//debugLog<<"SetRate : "<<dRate<<endl;
return S_OK;;
@@ -408,7 +408,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetRate(double *dRate){
//debugLog<<"Get RATE : Not IMPL"<<endl;
//return E_NOTIMPL;
- debugLog <<"GetRate : Hard coded to 1.0"<<endl;
+ //debugLog <<"GetRate : Hard coded to 1.0"<<endl;
*dRate = 1.0;
return S_OK;;
}
@@ -416,15 +416,15 @@
//debugLog<<"Get Preroll : NOT IMPL"<<endl;
//return E_NOTIMPL;
*pllPreroll = 0;
- debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
+ //debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
return S_FALSE;
}
@@ -506,7 +506,7 @@
//
//Before opening make the interface
mDataSource = DataSourceFactory::createDataSource(StringHelper::toNarrowStr(mFileName).c_str());
- debugLog<<"reset Stream"<<endl;
+ //debugLog<<"reset Stream"<<endl;
mDataSource->open(StringHelper::toNarrowStr(mFileName).c_str());
mDataSource->seek(mStreamMapper->startOfData()); //Should always be zero for now.
@@ -658,7 +658,7 @@
//mSourceFile.open(StringHelper::toNarrowStr(mFileName).c_str(), ios_base::in|ios_base::binary);
//
//Before openeing create the interface
- debugLog<<"Set up pins..."<<endl;
+ //debugLog<<"Set up pins..."<<endl;
mDataSource = DataSourceFactory::createDataSource(StringHelper::toNarrowStr(mFileName).c_str());
mDataSource->open(StringHelper::toNarrowStr(mFileName).c_str());
//
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -196,7 +196,7 @@
OggStreamMapper* mStreamMapper;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -60,7 +60,7 @@
// specifies the number of headers, we can count directly, otherwise we stll use the old
// method for maximum compatability.
mNumHeadersNeeded = iBE_Math::charArrToUShort(inOggPacket->packetData() + 7);
- debugLog<<"Num FLAC Headers needed = "<<mNumHeadersNeeded<<endl;
+ //debugLog<<"Num FLAC Headers needed = "<<mNumHeadersNeeded<<endl;
if (mNumHeadersNeeded == 0) {
//Variable number
// Use the old method of setting this to 1, and then decrementing it when we see the last one.
@@ -135,7 +135,7 @@
mLastEndGranulePos = (inPos * (__int64)mFLACFormatBlock->samplesPerSec)/ UNITS;
}
bool OggFLAC_1_0_Stream::deliverCodecHeaders() {
- debugLog<<"Delivering Codec Headers... "<<mCodecHeaders->numPackets()<<endl;
+ //debugLog<<"Delivering Codec Headers... "<<mCodecHeaders->numPackets()<<endl;
StampedOggPacket* locPacket = NULL;
for (unsigned long i = 0; i < mCodecHeaders->numPackets(); i++) {
if (i==0) {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -50,8 +50,8 @@
//Need to do something here !
mSerialNo = inBOSPage->header()->StreamSerialNo();
- string locLogName = "G:\\logs\\oggstream" + StringHelper::numToString(mSerialNo) + ".log";
- debugLog.open(locLogName.c_str(), ios_base::out);
+ //string locLogName = "G:\\logs\\oggstream" + StringHelper::numToString(mSerialNo) + ".log";
+ //debugLog.open(locLogName.c_str(), ios_base::out);
mStreamLock = new CCritSec;
//This may need to be moved to derived class
//Yep, Sure did !
@@ -65,7 +65,7 @@
OggStream::~OggStream(void)
{
//debugLog<<"Destructor..."<<endl;
- debugLog.close();
+ //debugLog.close();
delete mSourcePin;
delete mCodecHeaders;
//delete mPartialPacket;
@@ -101,7 +101,7 @@
if (mAllowDispatch) {
if (mFirstRun) {
mFirstRun = false;
- debugLog<<"Delviering codec headers..."<<endl;
+ //debugLog<<"Delviering codec headers..."<<endl;
//Deliver the header data
deliverCodecHeaders();
}
@@ -125,10 +125,10 @@
//StampedOggPacket* locPacket = processPacket(inPacket);
if (inPacket != NULL) {
//We got a comlpete packet
- debugLog<<"Adding codec header..."<<endl;
+ //debugLog<<"Adding codec header..."<<endl;
mCodecHeaders->addPacket(inPacket);
mNumHeadersNeeded--;
- debugLog<<"Headers still needed = "<<mNumHeadersNeeded<<endl;
+ //debugLog<<"Headers still needed = "<<mNumHeadersNeeded<<endl;
}
return true;
}
@@ -168,7 +168,7 @@
unsigned long OggStream::numCodecHeaders() {
//TODO::: Check for null.
- debugLog<<"Num codec headers = "<<mCodecHeaders->numPackets()<<endl;
+ //debugLog<<"Num codec headers = "<<mCodecHeaders->numPackets()<<endl;
return mCodecHeaders->numPackets();
}
void OggStream::flush() {
@@ -184,7 +184,7 @@
//delete mPartialPacket;
//TODO::: Tell the packetiser to flush.
//mPartialPacket = NULL;
- debugLog<<"Flush and ignore "<<inNumPacketsToIgnore<<endl;
+ //debugLog<<"Flush and ignore "<<inNumPacketsToIgnore<<endl;
mPacketiser.reset();
mPacketiser.setNumIgnorePackets(inNumPacketsToIgnore);
}
@@ -219,10 +219,10 @@
}
bool OggStream::acceptOggPage(OggPage* inOggPage) { //Gives away page.
- debugLog<<"Accepting ogg page..."<<endl;
+ //debugLog<<"Accepting ogg page..."<<endl;
//Chaining hack for icecast.
if ( (!mAllowSeek) && (inOggPage->header()->isBOS() )) {
- debugLog<<"ice case hack"<<endl;
+ //debugLog<<"ice case hack"<<endl;
//A BOS page can only be sent here if it's a chain... otherwise
// it would have already been stripped by the demux if it was at the
// start of the file.
@@ -260,7 +260,7 @@
//ANX::: Maybe also needs override. ??
bool OggStream::dispatchPacket(StampedOggPacket* inPacket) {
- debugLog<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
+ //debugLog<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
return mSourcePin->deliverOggPacket(inPacket);
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -118,5 +118,5 @@
OggDemuxSourceFilter* mOwningFilter;
CCritSec* mStreamLock;
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -36,7 +36,7 @@
, mTheoraFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
- debugLog.open("G:\\logs\\theorastream.log", ios_base::out);
+ //debugLog.open("G:\\logs\\theorastream.log", ios_base::out);
}
TheoraStream::~TheoraStream(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -36,7 +36,7 @@
, mVorbisFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
- debugLog.open("G:\\logs\\vorbisstream.log", ios_base::out);
+ //debugLog.open("G:\\logs\\vorbisstream.log", ios_base::out);
}
VorbisStream::~VorbisStream(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -58,7 +58,7 @@
OggMuxInputPin::~OggMuxInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
}
STDMETHODIMP OggMuxInputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
@@ -74,20 +74,20 @@
HRESULT OggMuxInputPin::SetMediaType(const CMediaType* inMediaType) {
- debugLog.open("G:\\logs\\oggmuxinpin.log", ios_base::out);
- debugLog<<"Set media type..."<<endl;
+ //debugLog.open("G:\\logs\\oggmuxinpin.log", ios_base::out);
+ //debugLog<<"Set media type..."<<endl;
if ((inMediaType->majortype == MEDIATYPE_Video) && (inMediaType->subtype == MEDIASUBTYPE_Theora)) {
//Theora
sTheoraFormatBlock* locTheora = (sTheoraFormatBlock*)inMediaType->pbFormat;
- debugLog<<"Theo sample rate = "<<locTheora->frameRateNumerator<<" / "<<locTheora->frameRateDenominator<<endl;
+ //debugLog<<"Theo sample rate = "<<locTheora->frameRateNumerator<<" / "<<locTheora->frameRateDenominator<<endl;
mMuxStream->setConversionParams(locTheora->frameRateNumerator, locTheora->frameRateDenominator, 10000000, locTheora->maxKeyframeInterval);
mPaginator.setNumHeaders(3);
} else if (inMediaType->majortype == MEDIATYPE_Audio) {
if (inMediaType->subtype == MEDIASUBTYPE_Vorbis) {
//Vorbis
sVorbisFormatBlock* locVorbis = (sVorbisFormatBlock*)inMediaType->pbFormat;
- debugLog<<"Vorbis sample rate = "<<locVorbis->samplesPerSec<<endl;
+ //debugLog<<"Vorbis sample rate = "<<locVorbis->samplesPerSec<<endl;
mMuxStream->setConversionParams(locVorbis->samplesPerSec, 1, 10000000);
mPaginator.setNumHeaders(3);
@@ -100,7 +100,7 @@
//We are connected to the encoder nd getting individual metadata packets.
sFLACFormatBlock* locFLAC = (sFLACFormatBlock*)inMediaType->pbFormat;
mMuxStream->setConversionParams(locFLAC->samplesPerSec, 1, 10000000);
- debugLog<<"FLAC sample rate = "<<locFLAC->samplesPerSec<<endl;
+ //debugLog<<"FLAC sample rate = "<<locFLAC->samplesPerSec<<endl;
//mNeedsFLACHeaderTweak = true;
mNeedsFLACHeaderCount = true;
} else if (inMediaType->subtype == MEDIASUBTYPE_FLAC) {
@@ -108,7 +108,7 @@
// Need to use the header splitter class.
sFLACFormatBlock* locFLAC = (sFLACFormatBlock*)inMediaType->pbFormat;
mMuxStream->setConversionParams(locFLAC->samplesPerSec, 1, 10000000);
- debugLog<<"FLAC sample rate = "<<locFLAC->samplesPerSec<<endl;
+ //debugLog<<"FLAC sample rate = "<<locFLAC->samplesPerSec<<endl;
mNeedsFLACHeaderTweak = true;
}
@@ -214,17 +214,17 @@
//This could be to mux multi stream flac.
//Alternatively this configuration could be used to convert the old format to the new.
- debugLog<<"In the header tweak section..."<<endl;
+ //debugLog<<"In the header tweak section..."<<endl;
FLACMetadataSplitter* locFLACSplitter = new FLACMetadataSplitter;
- debugLog<<"Feeding metadata..."<<endl;
+ //debugLog<<"Feeding metadata..."<<endl;
locFLACSplitter->loadMetadata(locPacket->clone());
//delete locPacket; //Don't delete the splitter will delete when it's done.
for (int i = 0; i < locFLACSplitter->numHeaders(); i++) {
- debugLog<<"Giving pager, packet "<<i<<endl;
- debugLog<<locFLACSplitter->getHeader(i)->toPackDumpString()<<endl; //This is a leak !!
+ //debugLog<<"Giving pager, packet "<<i<<endl;
+ //debugLog<<locFLACSplitter->getHeader(i)->toPackDumpString()<<endl; //This is a leak !!
if (i==0) {
//Set the number of headers in the paginator for FLAC classic.
StampedOggPacket* locHeadPack = locFLACSplitter->getHeader(i);
@@ -232,17 +232,17 @@
delete locHeadPack;
}
mPaginator.acceptStampedOggPacket(locFLACSplitter->getHeader(i)); //This get function returns our copy which we give away.
- debugLog<<"After paginator feed..."<<endl;
+ //debugLog<<"After paginator feed..."<<endl;
}
mNeedsFLACHeaderTweak = false;
- debugLog<<"Pre delete of splitter..."<<endl;
+ //debugLog<<"Pre delete of splitter..."<<endl;
delete locFLACSplitter;
- debugLog<<"Post delete of splitter"<<endl;
+ //debugLog<<"Post delete of splitter"<<endl;
} else {
//Not truncated or contuned... its a full packet.
- debugLog<<"Normal add packet..."<<endl;
+ //debugLog<<"Normal add packet..."<<endl;
mPaginator.acceptStampedOggPacket(locPacket);
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -84,5 +84,5 @@
OggPaginator mPaginator;
OggMuxStream* mMuxStream;
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -15,8 +15,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -32,8 +32,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -57,7 +57,7 @@
mSeekDelegate->Release();
mSeekDelegate = NULL;
}
- seekDebug.close();
+ //seekDebug.close();
}
//IMediaSeeking Interface
STDMETHODIMP BasicSeekable::GetCapabilities(DWORD* inCapabilities) {
@@ -79,10 +79,10 @@
//return S_OK;
if (mSeekDelegate != NULL) {
- seekDebug<<"GetCaps : Passed on..."<<endl;
+ //seekDebug<<"GetCaps : Passed on..."<<endl;
return mSeekDelegate->GetCapabilities(inCapabilities);
} else {
- seekDebug<<"GetCaps : NULL Delegate"<<endl;
+ //seekDebug<<"GetCaps : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -104,10 +104,10 @@
if (mSeekDelegate != NULL) {
- seekDebug<<"CheckCaps : Passed on..."<<endl;
+ //seekDebug<<"CheckCaps : Passed on..."<<endl;
return mSeekDelegate->CheckCapabilities(outCapabilities);
} else {
- seekDebug<<"CheckCaps : NULL Delegate"<<endl;
+ //seekDebug<<"CheckCaps : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -125,10 +125,10 @@
//}
if (mSeekDelegate != NULL) {
- seekDebug<<"IsFromatsupp : Passed on..."<<endl;
+ //seekDebug<<"IsFromatsupp : Passed on..."<<endl;
return mSeekDelegate->IsFormatSupported(inFormat);
} else {
- seekDebug<<"IsFromatsupp : NULL Delegate"<<endl;
+ //seekDebug<<"IsFromatsupp : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -143,10 +143,10 @@
//return S_OK;
if (mSeekDelegate != NULL) {
- seekDebug<<"Query preff : Passed on..."<<endl;
+ //seekDebug<<"Query preff : Passed on..."<<endl;
return mSeekDelegate->QueryPreferredFormat(outFormat);
} else {
- seekDebug<<"Query preff : NULL Delegate"<<endl;
+ //seekDebug<<"Query preff : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -155,10 +155,10 @@
STDMETHODIMP BasicSeekable::SetTimeFormat(const GUID* inFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"SetTimeformat :Passed on..."<<endl;
+ //seekDebug<<"SetTimeformat :Passed on..."<<endl;
return mSeekDelegate->SetTimeFormat(inFormat);
} else {
- seekDebug<<"SetTimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"SetTimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -166,10 +166,10 @@
STDMETHODIMP BasicSeekable::GetTimeFormat( GUID *outFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Gettimeformat : Passed on..."<<endl;
+ //seekDebug<<"Gettimeformat : Passed on..."<<endl;
return mSeekDelegate->GetTimeFormat(outFormat);
} else {
- seekDebug<<"Gettimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"Gettimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -177,10 +177,10 @@
STDMETHODIMP BasicSeekable::GetDuration(LONGLONG* outDuration) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getdureation : Passed on..."<<endl;
+ //seekDebug<<"Getdureation : Passed on..."<<endl;
return mSeekDelegate->GetDuration(outDuration);
} else {
- seekDebug<<"Getdureation : NULL Delegate"<<endl;
+ //seekDebug<<"Getdureation : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -188,10 +188,10 @@
}
STDMETHODIMP BasicSeekable::GetStopPosition(LONGLONG* inStop) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getstoppos : Passed on..."<<endl;
+ //seekDebug<<"Getstoppos : Passed on..."<<endl;
return mSeekDelegate->GetStopPosition(inStop);
} else {
- seekDebug<<"Getstoppos : NULL Delegate"<<endl;
+ //seekDebug<<"Getstoppos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -201,10 +201,10 @@
//return E_NOTIMPL;
if (mSeekDelegate != NULL) {
- seekDebug<<"Getcurrpos : Passed on..."<<endl;
+ //seekDebug<<"Getcurrpos : Passed on..."<<endl;
return mSeekDelegate->GetCurrentPosition(outCurrent);
} else {
- seekDebug<<"Getcurrpos : NULL Delegate"<<endl;
+ //seekDebug<<"Getcurrpos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -212,26 +212,26 @@
STDMETHODIMP BasicSeekable::ConvertTimeFormat(LONGLONG* outTarget, const GUID* inTargetFormat, LONGLONG inSource, const GUID* inSourceFormat) {
//return E_NOTIMPL;
if (mSeekDelegate != NULL) {
- seekDebug<<"ConvTimeformat : Passed on..."<<endl;
+ //seekDebug<<"ConvTimeformat : Passed on..."<<endl;
return mSeekDelegate->ConvertTimeFormat(outTarget, inTargetFormat, inSource, inSourceFormat);
} else {
- seekDebug<<"ConvTimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"ConvTimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::SetPositions(LONGLONG* inoutCurrent, DWORD inCurrentFlags, LONGLONG* inStop, DWORD inStopFlags) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Set pos : Requested Time : "<<*inoutCurrent<<endl;
+ //seekDebug<<"Set pos : Requested Time : "<<*inoutCurrent<<endl;
HRESULT locHR = mSeekDelegate->SetPositions(inoutCurrent, inCurrentFlags, inStop, inStopFlags);
if (locHR == S_OK) {
//mSeekTimeBase = *inoutCurrent;
- seekDebug<<"Set Pos : Actual Time : "<<*inoutCurrent<<endl;
+ //seekDebug<<"Set Pos : Actual Time : "<<*inoutCurrent<<endl;
}
return locHR;
} else {
- seekDebug<<"Set pos : NULL Delegate"<<endl;
+ //seekDebug<<"Set pos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -239,10 +239,10 @@
}
STDMETHODIMP BasicSeekable::GetPositions(LONGLONG* outCurrent, LONGLONG* outStop) {
if (mSeekDelegate != NULL) {
- seekDebug<<"GetPos : Passed on..."<<endl;
+ //seekDebug<<"GetPos : Passed on..."<<endl;
return mSeekDelegate->GetPositions(outCurrent, outStop);
} else {
- seekDebug<<"GetPos : NULL Delegate"<<endl;
+ //seekDebug<<"GetPos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -250,10 +250,10 @@
}
STDMETHODIMP BasicSeekable::GetAvailable(LONGLONG* outEarliest, LONGLONG* outLatest) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getavail : Passed on..."<<endl;
+ //seekDebug<<"Getavail : Passed on..."<<endl;
return mSeekDelegate->GetAvailable(outEarliest, outLatest);
} else {
- seekDebug<<"Getavail : NULL Delegate"<<endl;
+ //seekDebug<<"Getavail : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -261,40 +261,40 @@
STDMETHODIMP BasicSeekable::SetRate(double inRate) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Setrate : Passed on..."<<endl;
+ //seekDebug<<"Setrate : Passed on..."<<endl;
return mSeekDelegate->SetRate(inRate);
} else {
- seekDebug<<"Setrate : NULL Delegate"<<endl;
+ //seekDebug<<"Setrate : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::GetRate(double* outRate) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getrate : Passed on..."<<endl;
+ //seekDebug<<"Getrate : Passed on..."<<endl;
return mSeekDelegate->GetRate(outRate);
} else {
- seekDebug<<"Getrate : NULL Delegate"<<endl;
+ //seekDebug<<"Getrate : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::GetPreroll(LONGLONG* outPreroll) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getpreroll : Passed on..."<<endl;
+ //seekDebug<<"Getpreroll : Passed on..."<<endl;
return mSeekDelegate->GetPreroll(outPreroll);
} else {
- seekDebug<<"Getpreroll : NULL Delegate"<<endl;
+ //seekDebug<<"Getpreroll : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::IsUsingTimeFormat(const GUID* inFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Isusingtimeformat : Passed on..."<<endl;
+ //seekDebug<<"Isusingtimeformat : Passed on..."<<endl;
return mSeekDelegate->IsUsingTimeFormat(inFormat);
} else {
- seekDebug<<"Isusingtimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"Isusingtimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -80,7 +80,7 @@
//REFERENCE_TIME mSeekTimeBase;
HRESULT mHR;
- fstream seekDebug;
+ //fstream seekDebug;
DWORD mSeekingCap;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -64,14 +64,14 @@
, mVideoWindow(NULL)
, mWindowLess(NULL)
{
- debugLog.open("G:\\logs\\vmr9_subs.log", ios_base::out);
+ //debugLog.open("G:\\logs\\vmr9_subs.log", ios_base::out);
//mOutputPin = new SubtitleVMR9OutputPin(this, m_pLock, NAME("SubtitleVMR9OutputPin"), L"Subtitle Out");
}
SubtitleVMR9Filter::~SubtitleVMR9Filter(void)
{
- debugLog<<"Destructor for subtitle renderer"<<endl;
- debugLog.close();
+ //debugLog<<"Destructor for subtitle renderer"<<endl;
+ //debugLog.close();
if (mBitmapMixer != NULL) {
mBitmapMixer->Release();
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -89,6 +89,6 @@
VMR9AlphaBitmap mAlphaBitmap;
//debug only
- fstream debugLog;
+ //fstream debugLog;
//
};
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -41,7 +41,7 @@
, mConvScaleFactor(1)
, mConvTheoraLogKeyFrameInterval(0)
{
- debugLog.open("G:\\logs\\oggmuxstream.log", ios_base::out);
+ //debugLog.open("G:\\logs\\oggmuxstream.log", ios_base::out);
}
OggMuxStream::~OggMuxStream(void)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -81,7 +81,7 @@
__int64 mConvScaleFactor;
__int64 mConvTheoraLogKeyFrameInterval;
- fstream debugLog;
+ //fstream debugLog;
deque<OggPage*> mPageQueue;
private:
OggMuxStream& operator=(const OggMuxStream& other); /* Don't assign me */
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -113,7 +113,7 @@
, mSequenceNo(0)
, mPacketCount(0)
{
- debugLog.open("G:\\logs\\paginator.log", ios_base::out);
+ //debugLog.open("G:\\logs\\paginator.log", ios_base::out);
mHeaderBuff = new unsigned char[300]; //Deleted in destructor.
@@ -123,7 +123,7 @@
{
delete mHeaderBuff;
mHeaderBuff = NULL;
- debugLog.close();
+ //debugLog.close();
}
//Calling this after you have fed in packets will cause lost data and memory leak (mPending page)
@@ -173,7 +173,7 @@
// }
//}
- debugLog<<"Accepting packet"<<endl;
+ //debugLog<<"Accepting packet"<<endl;
addPacketToPage(inOggPacket);
return true;
@@ -242,7 +242,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
@@ -263,7 +263,7 @@
}
bool OggPaginator::createFreshPage() {
- debugLog<<"Creating fresh page"<<endl;
+ //debugLog<<"Creating fresh page"<<endl;
mPendingPage = new OggPage; //Potential for leak here if setsettings called. Otherwise deleted in destructor or dispatched
mCurrentPageSize = OggPageHeader::OGG_BASE_HEADER_SIZE;
mPendingPageHasData = false;
@@ -286,7 +286,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
@@ -307,9 +307,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;
}
@@ -325,9 +325,9 @@
// significantly easier to add/modify comments without bumping data across a page which could
// require changing of all the headers in all the pages.
if ((mPacketCount < mSettings->mNumHeaders) && (mPendingPageHasData)) {
- debugLog<<"Flushing a header page..."<<endl;
- debugLog<<"PacketCount = "<<mPacketCount<<endl;
- debugLog<<"Num Headers = "<<mSettings->mNumHeaders<<endl;
+ //debugLog<<"Flushing a header page..."<<endl;
+ //debugLog<<"PacketCount = "<<mPacketCount<<endl;
+ //debugLog<<"Num Headers = "<<mSettings->mNumHeaders<<endl;
deliverCurrentPage();
}
mPacketCount++;
@@ -342,22 +342,22 @@
// a) The number of segments left * 255
// b) The number of bytes less than the desired maximum page size.
- debugLog<<"Remains in packet = "<<inRemaining<<endl;
- debugLog<<"Start at = "<<inStartAt<<endl;
- debugLog<<"Segtable size = "<<mSegmentTableSize<<endl;
- debugLog<<"Max page size = "<<mSettings->mMaxPageSize<<endl;
- debugLog<<"Current page size = "<<mCurrentPageSize<<endl;
+ //debugLog<<"Remains in packet = "<<inRemaining<<endl;
+ //debugLog<<"Start at = "<<inStartAt<<endl;
+ //debugLog<<"Segtable size = "<<mSegmentTableSize<<endl;
+ //debugLog<<"Max page size = "<<mSettings->mMaxPageSize<<endl;
+ //debugLog<<"Current page size = "<<mCurrentPageSize<<endl;
unsigned long locSpaceLeft = MIN(((255 - mSegmentTableSize) * 255) - 1, mSettings->mMaxPageSize - mCurrentPageSize);
- debugLog<<"Space left = "<<locSpaceLeft<<endl;
//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
// In this case where the packet gets broken the final segment on the page must be 255.
locSpaceLeft -= (locSpaceLeft % 255);
- debugLog<<"Adjust space left = "<<locSpaceLeft<<endl;
+ //debugLog<<"Adjust space left = "<<locSpaceLeft<<endl;
//How much we add is the minimum of
// a) How much space is left
@@ -366,7 +366,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..."<<endl;
+ //debugLog<<"How much to add..."<<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
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -84,7 +84,7 @@
OggPage* mPendingPage;
unsigned char* mHeaderBuff;
- fstream debugLog;
+ //fstream debugLog;
private:
OggPaginator& operator=(const OggPaginator& other); /* Don't assign me */
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-10-18 05:50:14 UTC (rev 8050)
@@ -48,18 +48,18 @@
, mLastIsSeekable(false)
{
-
+
mFileName = inFileName;
mOggDemux = new OggDataBuffer(true); //Deleted in destructor.
mOggDemux->registerVirtualCallback(this);
- debugLog.open("G:\\logs\\seektable.log", ios_base::out);
- debugLog<<"Constructing seek table for "<<inFileName<<endl;
+ //debugLog.open("G:\\logs\\seektable.log", ios_base::out);
+ //debugLog<<"Constructing seek table for "<<inFileName<<endl;
}
AutoOggSeekTable::~AutoOggSeekTable(void)
{
- debugLog<<"Closing file (Constructor)..."<<endl;
- debugLog.close();
+ //debugLog<<"Closing file (Constructor)..."<<endl;
+ //debugLog.close();
mFile.close();
delete mOggDemux;
}
@@ -117,19 +117,19 @@
}
}
} else if ((strncmp((char*)inOggPage->getPacket(0)->packetData(), "\177FLAC", 5) == 0)) {
- debugLog<<"Identified new flac..."<<endl;
+ //debugLog<<"Identified new flac..."<<endl;
//mPacketCount--;
//POTENTIAL BUG::: Only looks at low order byte
mNumHeaders = inOggPage->getPacket(0)->packetData()[8] + 1;
- debugLog<<"Header says there are this many headers "<<mNumHeaders<<endl;
+ //debugLog<<"Header says there are this many headers "<<mNumHeaders<<endl;
mSerialNoToTrack = inOggPage->header()->StreamSerialNo();
if (mNumHeaders == 0) {
//Variable number of headers... need to pick it up again...
- debugLog<<"Variable number of headers... 1 so far..."<<endl;
+ //debugLog<<"Variable number of headers... 1 so far..."<<endl;
mNumHeaders = 1;
isOggFLAC_1_0 = true;
} else {
- debugLog<<"Fixed number of headers..."<<endl;
+ //debugLog<<"Fixed number of headers..."<<endl;
mFoundStreamInfo = true;
}
mSampleRate = iBE_Math::charArrToULong(inOggPage->getPacket(0)->packetData() + 27) >> 12;
@@ -171,11 +171,11 @@
if ((mFoundStreamInfo) && (mSerialNoToTrack == inOggPage->header()->StreamSerialNo()) && (inOggPage->header()->GranulePos() != -1)) {
//if ((mPacketCount > 3) && (mLastIsSeekable == true)) {
- debugLog<<"Stream headers complete..."<<endl;
- debugLog<<"Num Headers = "<<mNumHeaders<<endl;
- debugLog<<"Packet COunt = "<<mPacketCount<<endl;
+ //debugLog<<"Stream headers complete..."<<endl;
+ //debugLog<<"Num Headers = "<<mNumHeaders<<endl;
+ //debugLog<<"Packet COunt = "<<mPacketCount<<endl;
if ((mPacketCount > mNumHeaders) && ((inOggPage->header()->HeaderFlags() & 1) != 1)) {
- debugLog<<"Adding seek point Time = "<<mLastSeekTime<<" -- File pos = "<<mFilePos<<endl;
+ //debugLog<<"Adding seek point Time = "<<mLastSeekTime<<" -- File pos = "<<mFilePos<<endl;
addSeekPoint(mLastSeekTime, mFilePos);
}
@@ -220,7 +220,7 @@
//debugLog<<"Anx Build table : "<<mFileName<<endl;
if (mFileName.find("http") != 0) {
- debugLog<<"Opening file... "<<endl;
+ //debugLog<<"Opening file... "<<endl;
mFile.open(mFileName.c_str(), ios_base::in | ios_base::binary);
const unsigned long BUFF_SIZE = 4096;
unsigned char* locBuff = new unsigned char[BUFF_SIZE]; //Deleted this function.
@@ -229,11 +229,11 @@
mOggDemux->feed((const unsigned char*)locBuff, mFile.gcount());
}
delete[] locBuff;
- debugLog<<"Closing File..."<<endl;
+ //debugLog<<"Closing File..."<<endl;
mFile.close();
} else {
- debugLog<<"Not SEEKABLE"<<endl;
+ //debugLog<<"Not SEEKABLE"<<endl;
mEnabled = false;
mSampleRate = 1;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h 2004-10-17 19:13:14 UTC (rev 8049)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h 2004-10-18 05:50:14 UTC (rev 8050)
@@ -78,6 +78,6 @@
//Changed for debugging to *
OggDataBuffer* mOggDemux;
- fstream debugLog;
+ //fstream debugLog;
};
More information about the commits
mailing list