[xiph-commits] r15151 - in trunk/oggdsf/src/lib: codecs/cmml/dsfCMMLDecoder codecs/flac/filters/dsfFLACDecoder codecs/ogm/filters/dsfOGMDecoder codecs/speex/filters/dsfSpeexDecoder codecs/theora/filters/dsfTheoraDecoder codecs/vorbis/filters/dsfVorbisDecoder core/directshow/dsfOggDemux2 core/ogg/libOOOggSeek
cristianadam at svn.xiph.org
cristianadam at svn.xiph.org
Sun Aug 3 11:36:38 PDT 2008
Author: cristianadam
Date: 2008-08-03 11:36:38 -0700 (Sun, 03 Aug 2008)
New Revision: 15151
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggDecoderSeek.h
Log:
Fixed Ticket #1382 (IOggCodec is not an interface)
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -53,11 +53,11 @@
//IOggDecoder Interface
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
- virtual string getCodecShortName();
- virtual string getCodecIdentString();
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual string __stdcall getCodecShortName();
+ virtual string __stdcall getCodecIdentString();
sCMMLFormatBlock* getCMMLFormatBlock() { return mCMMLFormatBlock; }
protected:
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -71,11 +71,11 @@
virtual STDMETHODIMP FLACDecodeInputPin::Receive(IMediaSample* inSample);
//IOggDecoder Interface
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
- virtual string getCodecShortName();
- virtual string getCodecIdentString();
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual string __stdcall getCodecShortName();
+ virtual string __stdcall getCodecIdentString();
protected:
Modified: trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -53,11 +53,11 @@
//IOggDecoder Interface
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
- virtual string getCodecShortName();
- virtual string getCodecIdentString();
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual string __stdcall getCodecShortName();
+ virtual string __stdcall getCodecIdentString();
enum eOGMMediaType {
OGM_VIDEO_TYPE,
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -75,19 +75,19 @@
virtual STDMETHODIMP Receive(IMediaSample* inSample);
///Called by upstream(demux) to get a conversion from granules to time
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
///Called by upstream to determine preroll data, ie how far back to seek to decode the given granule
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
///Called during pin setup to prime the decoder
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
///Returns the short name for this codec "speex"
- virtual string getCodecShortName();
+ virtual string __stdcall getCodecShortName();
///Returns the codec ident string, could include version, build etc info. Purely for display purposes.
- virtual string getCodecIdentString();
+ virtual string __stdcall getCodecIdentString();
protected:
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -62,11 +62,11 @@
virtual STDMETHODIMP GetAllocatorRequirements(ALLOCATOR_PROPERTIES *outRequestedProps);
//IOggDecoder Interface
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
- virtual string getCodecShortName();
- virtual string getCodecIdentString();
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual string __stdcall getCodecShortName();
+ virtual string __stdcall getCodecIdentString();
fstream debugLog;
virtual IOggOutputPin* getOutputPinInterface() { return mOggOutputPinInterface; }
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -76,11 +76,11 @@
virtual STDMETHODIMP Receive(IMediaSample* inSample);
//IOggDecoder Interface
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule);
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule);
- virtual IOggDecoder::eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket);
- virtual string getCodecShortName();
- virtual string getCodecIdentString();
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule);
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule);
+ virtual IOggDecoder::eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket);
+ virtual string __stdcall getCodecShortName();
+ virtual string __stdcall getCodecIdentString();
protected:
fstream debugLog;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/IOggDecoder.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -25,10 +25,10 @@
AHR_NULL_POINTER,
};
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule) = 0;
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule) = 0;
- virtual eAcceptHeaderResult showHeaderPacket(OggPacket* inCodecHeaderPacket) = 0;
- virtual string getCodecShortName() = 0;
- virtual string getCodecIdentString() = 0;
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule) = 0;
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule) = 0;
+ virtual eAcceptHeaderResult __stdcall showHeaderPacket(OggPacket* inCodecHeaderPacket) = 0;
+ virtual string __stdcall getCodecShortName() = 0;
+ virtual string __stdcall getCodecIdentString() = 0;
};
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggDecoderSeek.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggDecoderSeek.h 2008-08-03 16:39:43 UTC (rev 15150)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggDecoderSeek.h 2008-08-03 18:36:38 UTC (rev 15151)
@@ -7,8 +7,8 @@
virtual ~IOggDecoderSeek(void) {}
- virtual LOOG_INT64 convertGranuleToTime(LOOG_INT64 inGranule) = 0;
- virtual LOOG_INT64 mustSeekBefore(LOOG_INT64 inGranule) = 0;
+ virtual LOOG_INT64 __stdcall convertGranuleToTime(LOOG_INT64 inGranule) = 0;
+ virtual LOOG_INT64 __stdcall mustSeekBefore(LOOG_INT64 inGranule) = 0;
};
More information about the commits
mailing list