[xiph-commits] r8298 - in trunk/oggdsf: sln/oggdsf_all
src/lib/core/directshow/dsfAnxMux
src/lib/core/directshow/dsfOggDemux src/lib/core/ogg/libOOOgg
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Mon Nov 29 02:52:03 PST 2004
Author: illiminable
Date: 2004-11-29 02:52:03 -0800 (Mon, 29 Nov 2004)
New Revision: 8298
Added:
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/stdafx.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
Log:
* Anx mux building, not working.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1226,6 +1226,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxMux", "..\..\src\lib\core\directshow\dsfAnxMux\dsfAnxMux.vcproj", "{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+ {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Global
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp 2004-11-29 10:52:03 UTC (rev 8298)
@@ -23,7 +23,7 @@
CUnknown* WINAPI AnxMuxFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
{
- AnxDemuxSourceFilter *pNewObject = new AnxDMuxFilter();
+ AnxMuxFilter *pNewObject = new AnxMuxFilter();
if (pNewObject == NULL) {
*pHr = E_OUTOFMEMORY;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1,13 +1,15 @@
#pragma once
-
+#include "anxmuxdllstuff.h"
#include "OggMuxFilter.h"
class AnxMuxFilter
- : public OggMuxFitler
+ : public OggMuxFilter
{
public:
AnxMuxFilter(void);
~AnxMuxFilter(void);
+ static CUnknown* WINAPI AnxMuxFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
+
enum eAnxMuxState {
ANX_START_STATE = 0,
WRITTEN_ANNODEX_BOS = 1,
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1,7 +1,8 @@
#include "StdAfx.h"
#include ".\anxmuxinputpin.h"
-
-AnxMuxInputPin::AnxMuxInputPin(void)
+#include "AnxMuxFilter.h"
+AnxMuxInputPin::AnxMuxInputPin(AnxMuxFilter* inOwningFilter, CCritSec* inFilterLock, HRESULT* inHR, OggMuxStream* inMuxStream)
+: OggMuxInputPin(inOwningFilter, inFilterLock, inHR, inMuxStream)
{
}
@@ -16,7 +17,7 @@
if (locHR == S_OK) {
- mPaginator.addPacketToPage(AnxPacketMaker::makeAnxData(mMuxStream));
+ mPaginator.acceptStampedOggPacket(AnxPacketMaker::makeAnxData_2_0(mMuxStream, &mPaginator));
}
return locHR;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1,13 +1,16 @@
#pragma once
+#include "oggmuxdllstuff.h"
#include "OggMuxInputPin.h"
+#include "AnxMuxFilter.h"
+#include "AnxPacketMaker.h"
class AnxMuxInputPin
: public OggMuxInputPin
{
public:
- AnxMuxInputPin(void);
+ AnxMuxInputPin(AnxMuxFilter* inOwningFilter, CCritSec* inFilterLock, HRESULT* inHR, OggMuxStream* inMuxStream);
~AnxMuxInputPin(void);
- virtual HRESULT OggMuxInputPin::SetMediaType(const CMediaType* inMediaType);
+ virtual HRESULT SetMediaType(const CMediaType* inMediaType);
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp 2004-11-29 10:52:03 UTC (rev 8298)
@@ -14,7 +14,7 @@
, unsigned short inVersionMinor
, unsigned __int64 inTimebaseNum
, unsigned __int64 inTimebaseDenom
- , const char* inUTC
+ , const unsigned char* inUTC
)
{
@@ -147,10 +147,28 @@
, makeMessageHeaders(inMuxStream));
}
+StreamHeaders::eCodecType AnxPacketMaker::IdentifyCodec(OggPacket* inOggPacket) {
+ if (strncmp((char*)inOggPacket->packetData(), "\001vorbis", 7) == 0) {
+ return StreamHeaders::VORBIS;
+ } else if (strncmp((char*)inOggPacket->packetData(), "Speex ", 8) == 0) {
+ return StreamHeaders::SPEEX;
+ } else if ((strncmp((char*)inOggPacket->packetData(), "fLaC", 4)) == 0) {
+ return StreamHeaders::FLAC;
+ } else if ((strncmp((char*)inOggPacket->packetData(), "\177FLAC", 5)) == 0) {
+ return StreamHeaders::OGG_FLAC_1_0;
+ } else if ((strncmp((char*)inOggPacket->packetData(), "\200theora", 7)) == 0) {
+ return StreamHeaders::THEORA;
+ } else if ((strncmp((char*)inOggPacket->packetData(), "\001video\000\000\000", 9)) == 0) {
+ return StreamHeaders::FFDSHOW_VIDEO;
+ }
+
+ return StreamHeaders::NONE;
+
+}
vector<string> AnxPacketMaker::makeMessageHeaders(OggMuxStream* inMuxStream) {
string locTempString = "";
vector<string> retVector;
- switch(OggStreamFactory::IdentifyCodec(inMuxStream->peekFront()->getPacket(0))) {
+ switch(IdentifyCodec(inMuxStream->peekFront()->getPacket(0))) {
case StreamHeaders::VORBIS:
locTempString = "Content-type: audio/x-vorbis";
retVector.push_back(locTempString);
@@ -177,7 +195,7 @@
break;
case StreamHeaders::NONE:
default:
- return NULL;
+ break;
}
return retVector;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1,7 +1,7 @@
#pragma once
-#include "libOOOgg.h"
-#include "OggStreamFactory.h"
+#include "StreamHeaders.h"
+
class AnxPacketMaker
{
public:
@@ -15,7 +15,7 @@
, unsigned short inVersionMinor
, unsigned __int64 inTimebaseNum
, unsigned __int64 inTimebaseDenom
- , const char* inUTC
+ , const unsigned char* inUTC
);
static StampedOggPacket* makeAnxData ( unsigned short inVersionMajor
@@ -29,7 +29,7 @@
static StampedOggPacket* makeAnxData_2_0 (OggMuxStream* inMuxStream, OggPaginator* inPaginator);
static StampedOggPacket* makeAnxData (OggMuxStream* inMuxStream, OggPaginator* inPaginator);
-
+ static StreamHeaders::eCodecType AnxPacketMaker::IdentifyCodec(OggPacket* inOggPacket);
static vector<string> AnxPacketMaker::makeMessageHeaders(OggMuxStream* inMuxStream);
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp 2004-11-29 10:52:03 UTC (rev 8298)
@@ -58,9 +58,14 @@
mFileWriter->acceptOggPage(locEOSPage);
}
+
+bool AnxPageInterleaver::gotAllHeaders() {
+ //TODO::: Fill this in.
+ return false;
+}
void AnxPageInterleaver::processData()
{
- if ((mVersionMajor == 2) && (mVersionMinor == 0))) {
+ if ((mVersionMajor == 2) && (mVersionMinor == 0)) {
//IF seen all headers
// CREATE ANNODEX BOS
// CREATE ANXDATA BOS's
@@ -70,9 +75,9 @@
//ENDIF
//
- if (!isAnxSetup) {
+ if (!mIsAnxSetup) {
if (gotAllHeaders()) {
- isAnxSetup = true;
+ mIsAnxSetup = true;
addAnnodex_2_0_BOS();
addAllAnxData_2_0_BOS();
addAnnodexEOS();
@@ -81,5 +86,7 @@
} else {
OggPageInterleaver::processData();
}
-
+ } else {
+ throw 0;
+ }
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -16,6 +16,9 @@
protected:
void addAnnodex_2_0_BOS();
+ void addAllAnxData_2_0_BOS();
+ void addAnnodexEOS();
+ bool gotAllHeaders();
bool mIsAnxSetup;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -1,11 +1,11 @@
#pragma once
-#include "oggdllstuff.h"
+
// {6C5746D3-D309-4988-8694-D435AB86460D}
-DEFINE_GUID(CLASSID_AnxMuxFilter,
+DEFINE_GUID(CLSID_AnxMuxFilter,
0x6c5746d3, 0xd309, 0x4988, 0x86, 0x94, 0xd4, 0x35, 0xab, 0x86, 0x46, 0xd);
@@ -22,7 +22,7 @@
DEFINE_GUID(CLSID_CMMLDecodeFilter,
0xbf1121d1, 0x8739, 0x45e1, 0xbc, 0xd8, 0x90, 0xb8, 0x28, 0xf6, 0x43, 0xab);
-const REGFILTER2 AnxMuxSourceFilterReg = {
+const REGFILTER2 AnxMuxFilterReg = {
1,
MERIT_NORMAL,
0,
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj 2004-11-29 10:52:03 UTC (rev 8298)
@@ -19,21 +19,24 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFANXMUX_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfAnxMux.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/dsfAnxMux.pdb"
SubSystem="2"
@@ -68,19 +71,22 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFANXMUX_EXPORTS"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="Strmbase.lib Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfAnxMux.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Release""
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -10,5 +10,9 @@
// Windows Header Files:
#include <windows.h>
+#include <streams.h>
+#include <initguid.h>
+
// TODO: reference additional headers your program requires here
-#include "libOOOgg.h"
\ No newline at end of file
+#include "libOOOgg.h"
+#include "anxmuxdllstuff.h"
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -31,7 +31,7 @@
#pragma once
#include "oggdllstuff.h"
-
+#include "ds_guids.h"
#include "OggPacket.h"
#include "OggPage.h"
#include "OggStream.h"
Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -0,0 +1,105 @@
+#pragma once
+
+// {4BB64C4A-1674-436b-A49D-D6B3B64DBD60}
+DEFINE_GUID(CLSID_PropsAbout,
+0x4bb64c4a, 0x1674, 0x436b, 0xa4, 0x9d, 0xd6, 0xb3, 0xb6, 0x4d, 0xbd, 0x60);
+
+//New section
+// {31CA0186-1FF0-4181-AA38-3CA4040BD260}
+DEFINE_GUID(CLSID_OggDemuxSourceFilter,
+0x31ca0186, 0x1ff0, 0x4181, 0xaa, 0x38, 0x3c, 0xa4, 0x4, 0xb, 0xd2, 0x60);
+
+// {3913F0AB-E7ED-41c4-979B-1D1FDD983C07}
+DEFINE_GUID(MEDIASUBTYPE_FLAC,
+0x3913f0ab, 0xe7ed, 0x41c4, 0x97, 0x9b, 0x1d, 0x1f, 0xdd, 0x98, 0x3c, 0x7);
+
+
+// {8A0566AC-42B3-4ad9-ACA3-93B906DDF98A}
+DEFINE_GUID(MEDIASUBTYPE_Vorbis,
+0x8a0566ac, 0x42b3, 0x4ad9, 0xac, 0xa3, 0x93, 0xb9, 0x6, 0xdd, 0xf9, 0x8a);
+
+// {25A9729D-12F6-420e-BD53-1D631DC217DF}
+DEFINE_GUID(MEDIASUBTYPE_Speex,
+0x25a9729d, 0x12f6, 0x420e, 0xbd, 0x53, 0x1d, 0x63, 0x1d, 0xc2, 0x17, 0xdf);
+
+// {44E04F43-58B3-4de1-9BAA-8901F852DAE4}
+DEFINE_GUID(FORMAT_Vorbis,
+0x44e04f43, 0x58b3, 0x4de1, 0x9b, 0xaa, 0x89, 0x1, 0xf8, 0x52, 0xda, 0xe4);
+
+// {78701A27-EFB5-4157-9553-38A7854E3E81}
+DEFINE_GUID(FORMAT_Speex,
+0x78701a27, 0xefb5, 0x4157, 0x95, 0x53, 0x38, 0xa7, 0x85, 0x4e, 0x3e, 0x81);
+
+// {1CDC48AC-4C24-4b8b-982B-7007A29D83C4}
+DEFINE_GUID(FORMAT_FLAC,
+0x1cdc48ac, 0x4c24, 0x4b8b, 0x98, 0x2b, 0x70, 0x7, 0xa2, 0x9d, 0x83, 0xc4);
+
+
+// {05187161-5C36-4324-A734-22BF37509F2D}
+DEFINE_GUID(CLSID_TheoraDecodeFilter,
+0x5187161, 0x5c36, 0x4324, 0xa7, 0x34, 0x22, 0xbf, 0x37, 0x50, 0x9f, 0x2d);
+
+// {D124B2B1-8968-4ae8-B288-FE16EA34B0CE}
+DEFINE_GUID(MEDIASUBTYPE_Theora,
+0xd124b2b1, 0x8968, 0x4ae8, 0xb2, 0x88, 0xfe, 0x16, 0xea, 0x34, 0xb0, 0xce);
+
+// {A99F116C-DFFA-412c-95DE-725F99874826}
+DEFINE_GUID(FORMAT_Theora,
+0xa99f116c, 0xdffa, 0x412c, 0x95, 0xde, 0x72, 0x5f, 0x99, 0x87, 0x48, 0x26);
+
+//This structure defines the type of input we accept on the input pin... Stream/Annodex
+
+
+//Structure defining the registration details of the filter
+const REGFILTER2 OggDemuxSourceFilterReg = {
+ 1,
+ MERIT_NORMAL,
+ 0,
+ NULL
+
+};
+
+
+struct sVorbisFormatBlock {
+ unsigned long vorbisVersion;
+ unsigned long samplesPerSec;
+ unsigned long minBitsPerSec;
+ unsigned long avgBitsPerSec;
+ unsigned long maxBitsPerSec;
+ unsigned char numChannels;
+};
+
+struct sSpeexFormatBlock {
+ unsigned long speexVersion;
+ unsigned long samplesPerSec;
+ unsigned long minBitsPerSec;
+ unsigned long avgBitsPerSec;
+ unsigned long maxBitsPerSec;
+ unsigned long numChannels;
+
+};
+
+struct sFLACFormatBlock {
+ unsigned short numChannels;
+ unsigned long numBitsPerSample;
+ unsigned long samplesPerSec;
+
+};
+
+struct sTheoraFormatBlock {
+ unsigned long theoraVersion;
+ unsigned long width;
+ unsigned long height;
+ unsigned long frameWidth;
+ unsigned long frameHeight;
+ unsigned long frameRateNumerator;
+ unsigned long frameRateDenominator;
+ unsigned long aspectNumerator;
+ unsigned long aspectDenominator;
+ unsigned long maxKeyframeInterval;
+ unsigned long targetBitrate;
+ unsigned char targetQuality;
+ unsigned char xOffset;
+ unsigned char yOffset;
+ unsigned char colourSpace;
+};
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-11-29 10:52:03 UTC (rev 8298)
@@ -374,6 +374,9 @@
RelativePath="DataSourceFactory.h">
</File>
<File
+ RelativePath=".\ds_guids.h">
+ </File>
+ <File
RelativePath="FFDShowVideoStream.h">
</File>
<File
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -29,6 +29,9 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
+
+#ifndef INC_OGGDLLSTUFF
+#define INC_OGGDLLSTUFF
#include <streams.h>
#include <pullpin.h>
#include <initguid.h>
@@ -50,106 +53,4 @@
#endif
-// {4BB64C4A-1674-436b-A49D-D6B3B64DBD60}
-DEFINE_GUID(CLSID_PropsAbout,
-0x4bb64c4a, 0x1674, 0x436b, 0xa4, 0x9d, 0xd6, 0xb3, 0xb6, 0x4d, 0xbd, 0x60);
-
-//New section
-// {31CA0186-1FF0-4181-AA38-3CA4040BD260}
-DEFINE_GUID(CLSID_OggDemuxSourceFilter,
-0x31ca0186, 0x1ff0, 0x4181, 0xaa, 0x38, 0x3c, 0xa4, 0x4, 0xb, 0xd2, 0x60);
-
-// {3913F0AB-E7ED-41c4-979B-1D1FDD983C07}
-DEFINE_GUID(MEDIASUBTYPE_FLAC,
-0x3913f0ab, 0xe7ed, 0x41c4, 0x97, 0x9b, 0x1d, 0x1f, 0xdd, 0x98, 0x3c, 0x7);
-
-
-// {8A0566AC-42B3-4ad9-ACA3-93B906DDF98A}
-DEFINE_GUID(MEDIASUBTYPE_Vorbis,
-0x8a0566ac, 0x42b3, 0x4ad9, 0xac, 0xa3, 0x93, 0xb9, 0x6, 0xdd, 0xf9, 0x8a);
-
-// {25A9729D-12F6-420e-BD53-1D631DC217DF}
-DEFINE_GUID(MEDIASUBTYPE_Speex,
-0x25a9729d, 0x12f6, 0x420e, 0xbd, 0x53, 0x1d, 0x63, 0x1d, 0xc2, 0x17, 0xdf);
-
-// {44E04F43-58B3-4de1-9BAA-8901F852DAE4}
-DEFINE_GUID(FORMAT_Vorbis,
-0x44e04f43, 0x58b3, 0x4de1, 0x9b, 0xaa, 0x89, 0x1, 0xf8, 0x52, 0xda, 0xe4);
-
-// {78701A27-EFB5-4157-9553-38A7854E3E81}
-DEFINE_GUID(FORMAT_Speex,
-0x78701a27, 0xefb5, 0x4157, 0x95, 0x53, 0x38, 0xa7, 0x85, 0x4e, 0x3e, 0x81);
-
-// {1CDC48AC-4C24-4b8b-982B-7007A29D83C4}
-DEFINE_GUID(FORMAT_FLAC,
-0x1cdc48ac, 0x4c24, 0x4b8b, 0x98, 0x2b, 0x70, 0x7, 0xa2, 0x9d, 0x83, 0xc4);
-
-
-// {05187161-5C36-4324-A734-22BF37509F2D}
-DEFINE_GUID(CLSID_TheoraDecodeFilter,
-0x5187161, 0x5c36, 0x4324, 0xa7, 0x34, 0x22, 0xbf, 0x37, 0x50, 0x9f, 0x2d);
-
-// {D124B2B1-8968-4ae8-B288-FE16EA34B0CE}
-DEFINE_GUID(MEDIASUBTYPE_Theora,
-0xd124b2b1, 0x8968, 0x4ae8, 0xb2, 0x88, 0xfe, 0x16, 0xea, 0x34, 0xb0, 0xce);
-
-// {A99F116C-DFFA-412c-95DE-725F99874826}
-DEFINE_GUID(FORMAT_Theora,
-0xa99f116c, 0xdffa, 0x412c, 0x95, 0xde, 0x72, 0x5f, 0x99, 0x87, 0x48, 0x26);
-
-//This structure defines the type of input we accept on the input pin... Stream/Annodex
-
-
-//Structure defining the registration details of the filter
-const REGFILTER2 OggDemuxSourceFilterReg = {
- 1,
- MERIT_NORMAL,
- 0,
- NULL
-
-};
-
-
-struct sVorbisFormatBlock {
- unsigned long vorbisVersion;
- unsigned long samplesPerSec;
- unsigned long minBitsPerSec;
- unsigned long avgBitsPerSec;
- unsigned long maxBitsPerSec;
- unsigned char numChannels;
-};
-
-struct sSpeexFormatBlock {
- unsigned long speexVersion;
- unsigned long samplesPerSec;
- unsigned long minBitsPerSec;
- unsigned long avgBitsPerSec;
- unsigned long maxBitsPerSec;
- unsigned long numChannels;
-
-};
-
-struct sFLACFormatBlock {
- unsigned short numChannels;
- unsigned long numBitsPerSample;
- unsigned long samplesPerSec;
-
-};
-
-struct sTheoraFormatBlock {
- unsigned long theoraVersion;
- unsigned long width;
- unsigned long height;
- unsigned long frameWidth;
- unsigned long frameHeight;
- unsigned long frameRateNumerator;
- unsigned long frameRateDenominator;
- unsigned long aspectNumerator;
- unsigned long aspectDenominator;
- unsigned long maxKeyframeInterval;
- unsigned long targetBitrate;
- unsigned char targetQuality;
- unsigned char xOffset;
- unsigned char yOffset;
- unsigned char colourSpace;
-};
\ No newline at end of file
+#endif
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/stdafx.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/stdafx.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -52,8 +52,13 @@
#define LIBOOOGG_API __declspec(dllimport)
#endif
+#include "oggdemuxsourcefilter.h"
+#include "ds_guids.h"
+#include "OggDemuxSourcePin.h"
+
+
#include "OggStream.h"
#include "StreamHeaders.h"
-#include "oggdemuxsourcefilter.h"
-#include "OggDemuxSourcePin.h"
+
+
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-11-29 09:52:54 UTC (rev 8297)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-11-29 10:52:03 UTC (rev 8298)
@@ -29,6 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
+#pragma once
#include "dllstuff.h"
More information about the commits
mailing list