[xiph-commits] r8433 - in trunk/oggdsf/src/lib:
core/directshow/dsfAnxMux core/directshow/dsfOggMux
core/ogg/libOOOgg helper/libilliCore
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Wed Dec 15 22:58:56 PST 2004
Author: illiminable
Date: 2004-12-15 22:58:56 -0800 (Wed, 15 Dec 2004)
New Revision: 8433
Modified:
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.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/OggMuxStream.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp
trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h
Log:
* Fix anx mux
* Macronate some __int64 shit
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -79,3 +79,8 @@
AnxMuxFilter::~AnxMuxFilter(void)
{
}
+
+HRESULT AnxMuxFilter::addAnotherPin() {
+ mInputPins.push_back(new AnxMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
+ return S_OK;
+}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -55,6 +55,8 @@
};
+
+ virtual HRESULT addAnotherPin();
protected:
eAnxMuxState mAnxMuxState;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -103,4 +103,13 @@
}
-}
\ No newline at end of file
+}
+
+ static StampedOggPacket* makeFishBone_3_0 ( unsigned __int64 inGranuleRateNum
+ , unsigned __int64 inGranuleDenom
+ , unsigned long inNumSecHeaders
+ , unsigned short inGranuleShift
+ , vector<string> inMessageHeaders
+ ) {
+
+ }
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -49,11 +49,10 @@
, const unsigned char* inUTC
);
- static StampedOggPacket* makeFishBone_3_0 ( unsigned short inVersionMajor
- , unsigned short inVersionMinor
- , unsigned __int64 inGranuleRateNum
+ static StampedOggPacket* makeFishBone_3_0 ( unsigned __int64 inGranuleRateNum
, unsigned __int64 inGranuleDenom
, unsigned long inNumSecHeaders
+ , unsigned short inGranuleShift
, vector<string> inMessageHeaders
);
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -146,7 +146,7 @@
}
-STDMETHODIMP OggMuxFilter::addAnotherPin() {
+HRESULT OggMuxFilter::addAnotherPin() {
mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
return S_OK;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -82,7 +82,7 @@
STDMETHODIMP Stop(void);
//Helpers
- STDMETHODIMP addAnotherPin();
+ virtual HRESULT addAnotherPin();
virtual void NotifyComplete();
protected:
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -281,7 +281,7 @@
unsigned long locCurrPackSize = 0;
bool locIsFirstPacket = true;
- __int64 locPrevGranPos = 0;
+ LOOG_INT64 locPrevGranPos = 0;
for (unsigned long i = 0; i < locNumSegs; i++) {
//Packet sums the lacing values of the segment table.
@@ -336,7 +336,7 @@
mPrevGranPos = pendingPage->header()->GranulePos();
//First packet, check if the continuation flag is set.
- if ((pendingPage->header()->HeaderFlags() & OggPageHeader::eHeadFlags::CONTINUATION) == OggPageHeader::eHeadFlags::CONTINUATION) {
+ if ((pendingPage->header()->HeaderFlags() & OggPageHeader::CONTINUATION) == OggPageHeader::CONTINUATION) {
//Continuation flag is set.
locIsContinuation = true;
}
@@ -380,7 +380,7 @@
mNumBytesNeeded = OggPageHeader::OGG_BASE_HEADER_SIZE;
- mState = eState::AWAITING_BASE_HEADER;
+ mState = AWAITING_BASE_HEADER;
////debugLog<<"ClearData : Num bytes needed = "<<mNumBytesNeeded<<endl;
}
@@ -394,7 +394,7 @@
switch (mState) {
//QUERY::: Should it be a bug when the if state inside the switch falls through,... potential for infinite loop.
- case eState::AWAITING_BASE_HEADER:
+ case AWAITING_BASE_HEADER:
//debugLog<<"ProcessBuffer : State = AWAITING_BASE_HEADER"<<endl;
//If theres enough data to form the base header
@@ -411,7 +411,7 @@
}
break;
- case eState::AWAITING_SEG_TABLE:
+ case AWAITING_SEG_TABLE:
//debugLog<<"ProcessBuffer : State = AWAITING_SEG_TABLE"<<endl;
//If there is enough data to get the segt table
@@ -428,7 +428,7 @@
}
break;
- case eState::AWAITING_DATA:
+ case AWAITING_DATA:
//debugLog<<"ProcessBuffer : State = AWAITING_DATA"<<endl;
//If all the data segment is available
if (numBytesAvail() >= pendingPage->header()->dataSize()) {
@@ -445,7 +445,7 @@
}
break;
- case eState::LOST_PAGE_SYNC:
+ case LOST_PAGE_SYNC:
//TODO::: Insert resync code here.
//debugLog<<"ProcessBuffer : State = LOST_PAGE_SYNC"<<endl;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -109,7 +109,7 @@
unsigned long mNumBytesNeeded;
eState mState;
OggPage* pendingPage;
- __int64 mPrevGranPos;
+ LOOG_INT64 mPrevGranPos;
//Callback pointers
IOggCallback* mVirtualCallback;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -49,10 +49,10 @@
//LEAK::: Need to delete the contents of the queue later.
}
-__int64 OggMuxStream::granuleNumerator() {
+LOOG_INT64 OggMuxStream::granuleNumerator() {
return mConvNumerator;
}
-__int64 OggMuxStream::granuleDenominator() {
+LOOG_INT64 OggMuxStream::granuleDenominator() {
return mConvDenominator;
}
unsigned long OggMuxStream::numAvail() {
@@ -88,21 +88,21 @@
}
return retPage;
}
-__int64 OggMuxStream::frontTime() {
- __int64 retTime = INT64_MAX;
+LOOG_INT64 OggMuxStream::frontTime() {
+ LOOG_INT64 retTime = INT64_MAX;
if (!mPageQueue.empty()) {
retTime = mPageQueue.front()->header()->GranulePos();;
}
return retTime;
}
-__int64 OggMuxStream::scaledFrontTime() {
+LOOG_INT64 OggMuxStream::scaledFrontTime() {
return convertTime(frontTime());
}
-__int64 OggMuxStream::convertTime(__int64 inGranulePos) {
- __int64 retTime = INT64_MAX;
+LOOG_INT64 OggMuxStream::convertTime(__int64 inGranulePos) {
+ LOOG_INT64 retTime = INT64_MAX;
if (inGranulePos != INT64_MAX) {
if (mIsSensibleTime) {
retTime = (inGranulePos * mConvScaleFactor * mConvDenominator) / mConvNumerator;
@@ -112,7 +112,7 @@
unsigned long locInterFrameNo = (inGranulePos) % locMod;
- __int64 locAbsFramePos = (inGranulePos >> mConvTheoraLogKeyFrameInterval) + locInterFrameNo;
+ LOOG_INT64 locAbsFramePos = (inGranulePos >> mConvTheoraLogKeyFrameInterval) + locInterFrameNo;
retTime = (locAbsFramePos * mConvScaleFactor * mConvDenominator) / mConvNumerator;
@@ -124,7 +124,7 @@
}
-bool OggMuxStream::setConversionParams(__int64 inNumerator, __int64 inDenominator, __int64 inScaleFactor) {
+bool OggMuxStream::setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor) {
mConvNumerator = inNumerator;
mConvDenominator = inDenominator;
mConvScaleFactor = inScaleFactor;
@@ -132,7 +132,7 @@
return true;
}
-bool OggMuxStream::setConversionParams(__int64 inNumerator, __int64 inDenominator, __int64 inScaleFactor, __int64 inTheoraLogKFI) {
+bool OggMuxStream::setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor, LOOG_INT64 inTheoraLogKFI) {
mConvNumerator = inNumerator;
mConvDenominator = inDenominator;
mConvScaleFactor = inScaleFactor;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -44,7 +44,7 @@
OggMuxStream(INotifyArrival* inNotifier);
virtual ~OggMuxStream(void);
- static const __int64 INT64_MAX = 9223372036854775807;
+ static const LOOG_INT64 INT64_MAX = 9223372036854775807;
//IOggCallback implementaion.
virtual bool acceptOggPage(OggPage* inOggPage);
@@ -56,8 +56,8 @@
virtual unsigned long numAvail();
- virtual __int64 frontTime();
- virtual __int64 scaledFrontTime();
+ virtual LOOG_INT64 frontTime();
+ virtual LOOG_INT64 scaledFrontTime();
virtual bool isEmpty();
virtual bool isEOS();
@@ -66,25 +66,25 @@
virtual bool isActive();
virtual void setIsActive(bool inIsActive);
- virtual bool setConversionParams(__int64 inNumerator, __int64 inDenominator, __int64 inScaleFactor, __int64 inTheoraLogKFI);
- bool setConversionParams(__int64 inNumerator, __int64 inDenominator, __int64 inScaleFactor);
+ virtual bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor, __int64 inTheoraLogKFI);
+ bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor);
- __int64 granuleNumerator();
- __int64 granuleDenominator();
+ LOOG_INT64 granuleNumerator();
+ LOOG_INT64 granuleDenominator();
protected:
INotifyArrival* mNotifier;
- __int64 convertTime(__int64 inGranulePos);
+ LOOG_INT64 convertTime(__int64 inGranulePos);
bool mIsEOS;
bool mIsActive;
bool mIsSensibleTime;
- __int64 mConvNumerator;
- __int64 mConvDenominator;
- __int64 mConvScaleFactor;
- __int64 mConvTheoraLogKeyFrameInterval;
+ LOOG_INT64 mConvNumerator;
+ LOOG_INT64 mConvDenominator;
+ LOOG_INT64 mConvScaleFactor;
+ LOOG_INT64 mConvTheoraLogKeyFrameInterval;
//fstream debugLog;
deque<OggPage*> mPageQueue;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -47,8 +47,8 @@
bool mLooseMode;
unsigned long mNumIgnorePackets;
- __int64 mPrevGranPos;
- __int64 mCurrentGranPos;
+ LOOG_INT64 mPrevGranPos;
+ LOOG_INT64 mCurrentGranPos;
bool processPage(OggPage* inOggPage, bool inIncludeFirst, bool inIncludeLast);
ePacketiserState mPacketiserState;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -171,7 +171,7 @@
return mHeaderFlags;
}
-__int64 OggPageHeader::GranulePos()
+LOOG_INT64 OggPageHeader::GranulePos()
{
return mGranulePos;
}
@@ -210,7 +210,7 @@
mHeaderFlags = inVal;
}
-void OggPageHeader::setGranulePos(__int64 inGranulePos)
+void OggPageHeader::setGranulePos(LOOG_INT64 inGranulePos)
{
mGranulePos = inGranulePos;
}
@@ -325,14 +325,14 @@
bool OggPageHeader::isBOS() {
- return ((mHeaderFlags & eHeadFlags::BOS) != 0 );
+ return ((mHeaderFlags & BOS) != 0 );
}
bool OggPageHeader::isEOS() {
- return ((mHeaderFlags & eHeadFlags::EOS) != 0 );
+ return ((mHeaderFlags & EOS) != 0 );
}
bool OggPageHeader::isContinuation() {
- return ((mHeaderFlags & eHeadFlags::CONTINUATION) != 0 );
+ return ((mHeaderFlags & CONTINUATION) != 0 );
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -62,7 +62,7 @@
static const unsigned char OGG_CAPTURE_PATTERN_SIZE = 4;
static const unsigned char OGG_BASE_HEADER_SIZE = 27;
- static const __int64 UNKNOWN_GRANULE_POS = -1;
+ static const LOOG_INT64 UNKNOWN_GRANULE_POS = -1;
enum ePageState {
INVALID,
BLANK,
@@ -115,7 +115,7 @@
//Accesors
unsigned char StructureVersion();
unsigned char HeaderFlags();
- __int64 GranulePos();
+ LOOG_INT64 GranulePos();
unsigned long StreamSerialNo();
unsigned long PageSequenceNo();
unsigned long CRCChecksum();
@@ -125,7 +125,7 @@
//Mutators
void setStructureVersion(unsigned char inVal);
void setHeaderFlags(unsigned char inVal);
- void setGranulePos(__int64 inPtr);
+ void setGranulePos(LOOG_INT64 inPtr);
void setGranulePos(const unsigned char* inPtr);
void setStreamSerialNo(unsigned long inVal);
void setStreamSerialNo(const unsigned char* inPtr);
@@ -152,7 +152,7 @@
//Header fields
unsigned char mStructureVersion;
unsigned char mHeaderFlags;
- __int64 mGranulePos;
+ LOOG_INT64 mGranulePos;
unsigned long mStreamSerialNo;
unsigned long mPageSequenceNo;
unsigned long mCRCChecksum;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -119,8 +119,8 @@
//debugLog<<"writeLowest : Defaulting stream "<<i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
//debugLog<<"writeLowest : Defaulting stream "<<i<<endl;
} else {
- __int64 locCurrLowTime = locLowestStream->scaledFrontTime();
- __int64 locTestLowTime = mInputStreams[i]->scaledFrontTime();
+ LOOG_INT64 locCurrLowTime = locLowestStream->scaledFrontTime();
+ LOOG_INT64 locTestLowTime = mInputStreams[i]->scaledFrontTime();
//__int64 locCurrLowTimeUNS = locLowestStream->frontTime();
//__int64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -45,7 +45,7 @@
{
}
-StampedOggPacket::StampedOggPacket(unsigned char* inPackData, unsigned long inPacketSize, bool inIsTruncated, bool inIsContinuation, __int64 inStartTime = 0, __int64 inEndTime = 0, unsigned short inStampType = 0)
+StampedOggPacket::StampedOggPacket(unsigned char* inPackData, unsigned long inPacketSize, bool inIsTruncated, bool inIsContinuation, LOOG_INT64 inStartTime = 0, __int64 inEndTime = 0, unsigned short inStampType = 0)
: OggPacket(inPackData, inPacketSize, inIsTruncated, inIsContinuation)
, mStartTime(inStartTime)
, mEndTime(inEndTime)
@@ -103,21 +103,21 @@
StampedOggPacket* retPack = new StampedOggPacket(locBuff, mPacketSize, mIsTruncated, mIsContinuation, mStartTime, mEndTime, mStampType); //Caller takes responsibiility for this.
return retPack;
}
-__int64 StampedOggPacket::startTime() {
+LOOG_INT64 StampedOggPacket::startTime() {
return mStartTime;
}
-__int64 StampedOggPacket::endTime() {
+LOOG_INT64 StampedOggPacket::endTime() {
return mEndTime;
}
-void StampedOggPacket::setStartTime(__int64 inStartTime) {
+void StampedOggPacket::setStartTime(LOOG_INT64 inStartTime) {
mStartTime = inStartTime;
}
-void StampedOggPacket::setEndTime(__int64 inEndTime) {
+void StampedOggPacket::setEndTime(LOOG_INT64 inEndTime) {
mEndTime = inEndTime;
}
-void StampedOggPacket::setTimeStamp(__int64 inStartTime, __int64 inEndTime, StampedOggPacket::eStampType inStampType) {
+void StampedOggPacket::setTimeStamp(LOOG_INT64 inStartTime, LOOG_INT64 inEndTime, StampedOggPacket::eStampType inStampType) {
mStartTime = inStartTime;
mEndTime = inEndTime;
mStampType = inStampType;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -38,7 +38,7 @@
public:
//Constructors
StampedOggPacket(void);
- StampedOggPacket(unsigned char* inPackData, unsigned long inPacketSize, bool inIsTruncated, bool inIsContinuation, __int64 inStartTime, __int64 inEndTime, unsigned short inStampType);
+ StampedOggPacket(unsigned char* inPackData, unsigned long inPacketSize, bool inIsTruncated, bool inIsContinuation, LOOG_INT64 inStartTime, __int64 inEndTime, unsigned short inStampType);
virtual ~StampedOggPacket(void);
virtual OggPacket* clone();
@@ -53,19 +53,19 @@
unsigned short mStampType;
//Time stamp access
- __int64 startTime();
- __int64 endTime();
+ LOOG_INT64 startTime();
+ LOOG_INT64 endTime();
- void setStartTime(__int64 inStartTime);
- void setEndTime(__int64 inEndTime);
- void StampedOggPacket::setTimeStamp(__int64 inStartTime, __int64 inEndTime, StampedOggPacket::eStampType inStampType);
+ void setStartTime(LOOG_INT64 inStartTime);
+ void setEndTime(LOOG_INT64 inEndTime);
+ void StampedOggPacket::setTimeStamp(LOOG_INT64 inStartTime, LOOG_INT64 inEndTime, StampedOggPacket::eStampType inStampType);
//Merge function
virtual void merge(const StampedOggPacket* inMorePacket);
protected:
- __int64 mStartTime;
- __int64 mEndTime;
+ LOOG_INT64 mStartTime;
+ LOOG_INT64 mEndTime;
private:
StampedOggPacket& operator=(const StampedOggPacket& other); /* Don't assign me */
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -45,17 +45,22 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
-#include <windows.h>
+
#include <string>
#include <vector>
-//#include <fstream>
-//#include <iostream>
-//#include <iomanip>
-//#include <sstream>
-//#include <algorithm>
+#ifdef WIN32
+#include <windows.h>
+# define LOOG_INT64 signed __int64
+# define LOOG_UINT64 unsigned __int64
+#else
+# define LOOG_INT64 int64_t
+# define LOOG_UINT64 uint64_t
+#endif
+
+
using namespace std;
// TODO: reference additional headers your program requires here
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -65,7 +65,7 @@
return retVal;
}
-string StringHelper::numToString(unsigned __int64 inNum) {
+string StringHelper::numToString(LOOG_UINT64 inNum) {
char locDigit = 0;
string retStr = "";
string temp = "";
@@ -83,9 +83,9 @@
return retStr;
}
-unsigned __int64 StringHelper::stringToNum(string inString) {
+LOOG_UINT64 StringHelper::stringToNum(string inString) {
int locDigit = 0;
- unsigned __int64 retVal = 0;
+ LOOG_UINT64 retVal = 0;
size_t locStrLen = inString.length();
for (unsigned long i = 0; i < locStrLen; i++) {
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -46,8 +46,8 @@
static unsigned char digitToHex(unsigned char inChar);
static string charToHexString(unsigned char inChar);
- static string numToString(unsigned __int64 inNum);
- static unsigned __int64 stringToNum(string inString);
+ static string numToString(LOOG_UINT64 inNum);
+ static LOOG_UINT64 stringToNum(string inString);
static wstring StringHelper::toWStr(string inString);
static string StringHelper::toNarrowStr(wstring inString);
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp 2004-12-16 06:58:56 UTC (rev 8433)
@@ -29,8 +29,8 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
-#include "StdAfx.h"
-#include ".\iLE_Math.h"
+#include "stdafx.h"
+#include "iLE_Math.h"
iLE_Math::iLE_Math(void)
{
@@ -68,8 +68,8 @@
unsigned short iLE_Math::charArrToUShort(const unsigned char* inCharArray) {
return (inCharArray[1] << 8) + inCharArray[0];
}
-__int64 iLE_Math::CharArrToInt64(const unsigned char* inCharArray) {
- __int64 locData = 0;
+LOOG_INT64 iLE_Math::CharArrToInt64(const unsigned char* inCharArray) {
+ LOOG_INT64 locData = 0;
for (int i = 7; i >= 0; i--) {
locData <<= 8;
@@ -78,7 +78,7 @@
return locData;
}
-void iLE_Math::Int64ToCharArr(__int64 inInt64, unsigned char* outCharArray) {
+void iLE_Math::Int64ToCharArr(LOOG_INT64 inInt64, unsigned char* outCharArray) {
for (unsigned char i = 0; i < 8; i++) {
//This way sux !
outCharArray[i] = (unsigned char)((inInt64 << ((7 - i) * 8)) >> 56);
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -41,7 +41,7 @@
static void ULongToCharArr(unsigned long inLong, unsigned char* outCharArray);
static void UShortToCharArr(unsigned short inShort, unsigned char* outCharArray);
- static __int64 CharArrToInt64(const unsigned char* inCharArray);
- static void Int64ToCharArr(__int64 inInt64, unsigned char* outCharArray);
+ static LOOG_INT64 CharArrToInt64(const unsigned char* inCharArray);
+ static void Int64ToCharArr(LOOG_INT64 inInt64, unsigned char* outCharArray);
static unsigned short charArrToUShort(const unsigned char* inCharArray);
};
Modified: trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h 2004-12-16 06:17:41 UTC (rev 8432)
+++ trunk/oggdsf/src/lib/helper/libilliCore/stdafx.h 2004-12-16 06:58:56 UTC (rev 8433)
@@ -8,6 +8,14 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
-#include <windows.h>
+
// TODO: reference additional headers your program requires here
+#ifdef WIN32
+#include <windows.h>
+# define LOOG_INT64 signed __int64
+# define LOOG_UINT64 unsigned __int64
+#else
+# define LOOG_INT64 int64_t
+# define LOOG_UINT64 uint64_t
+#endif
\ No newline at end of file
More information about the commits
mailing list