[xiph-commits] r16927 - in trunk/oggdsf: . build build/NSIS/Release build/oggcodecs_wm5 sln/oggdsf_vs2005 sln/oggdsf_vs2008 src/lib/codecs/flac/filters/dsfFLACDecoder src/lib/codecs/flac/filters/dsfFLACEncoder src/lib/codecs/flac/filters/dsfNativeFLACSource src/lib/codecs/ogm/filters/dsfOGMDecoder src/lib/codecs/speex/filters/dsfSpeexDecoder src/lib/codecs/speex/filters/dsfSpeexEncoder src/lib/codecs/vorbis/filters/dsfVorbisEncoder src/lib/core/directshow/dsfOggDemux2 src/lib/core/directshow/dsfOggMux src/lib/helper/common src/lib/plugin/AxPlayer src/lib/plugin/AxPlayer/Res
cristianadam at svn.xiph.org
cristianadam at svn.xiph.org
Sun Feb 21 13:56:14 PST 2010
Author: cristianadam
Date: 2010-02-21 13:56:14 -0800 (Sun, 21 Feb 2010)
New Revision: 16927
Added:
trunk/oggdsf/BUILD.OLD
trunk/oggdsf/BUILD.txt
trunk/oggdsf/README
trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln
Removed:
trunk/oggdsf/ABOUT.txt
trunk/oggdsf/README
trunk/oggdsf/VERSIONS
trunk/oggdsf/build/oggcodecs/
trunk/oggdsf/macosx/
trunk/oggdsf/unix/
Modified:
trunk/oggdsf/COPYRIGHTS
trunk/oggdsf/COPYRIGHTS.rtf
trunk/oggdsf/ChangeLog.txt
trunk/oggdsf/build/NSIS/Release/build.cmd
trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACdecoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp
trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/ogmdecoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.cpp
trunk/oggdsf/src/lib/helper/common/util.h
trunk/oggdsf/src/lib/plugin/AxPlayer/AxPlayer.cpp
trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp
trunk/oggdsf/src/lib/plugin/AxPlayer/Res/AxPlayer.rc
trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp
trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.h
Log:
Final changes before a new release. (Prefixed all filter names with Xiph.Org, AxPlayer can play relative files etc)
Deleted: trunk/oggdsf/ABOUT.txt
===================================================================
--- trunk/oggdsf/ABOUT.txt 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/ABOUT.txt 2010-02-21 21:56:14 UTC (rev 16927)
@@ -1,18 +0,0 @@
-http://xiph.org/dshow/
-
-
-This is pre-release software, if you didn't download this from the site above, please visit it to ensure you have the latest version and are aware of the known issues with this software. Please check back regularly as this software is still under development.
-
-You can see which version this is in the VERSIONS file.
-
-Report new bugs and suggestions to http://www.xiph.org/dshow/pmwiki.php/Main/ReportIssues
-
-More information about the various codecs can be found at http://www.xiph.org
-
-Q) WHAT IS THIS?
-
-This is a set of directshow filters for playing ogg vorbis, speex, theora and FLAC files in Windows Media Player and other players.
-
-Q) HOW DID THIS GET ON MY COMPUTER?
-
-If you didn't install it directly, it may have been installed by Yahoo Music Player, or a codec pack.
\ No newline at end of file
Copied: trunk/oggdsf/BUILD.OLD (from rev 16904, trunk/oggdsf/README)
===================================================================
--- trunk/oggdsf/BUILD.OLD (rev 0)
+++ trunk/oggdsf/BUILD.OLD 2010-02-21 21:56:14 UTC (rev 16927)
@@ -0,0 +1,308 @@
+Information for builds after 0.80
+=================================
+
+Support for Windows 9x (95, 98, Me) has been dropped.
+
+The project now has Visual Studio 2005 and Visual Studio 2008
+project files.
+
+The Netwide Assembler (NASM) is used to build the assembly
+files in the project. Get version 2.0.3 or later from http://www.nasm.us/
+The nasm.exe should be in the path, doesn't matter where you
+copy it.
+
+NSIS (Nullsoft Scriptable Install System) is used to make the
+setup files. Get version 2.41 or later from http://nsis.sourceforge.net/Download
+
+Visual Studio 2005 (Express, or Standard) requires the presence
+of the Windows SDK for Windows Server 2008 and .NET Framework 3.5
+http://www.microsoft.com/downloads/details.aspx?FamilyId=F26B1AA4-741A-433A-9BE5-FA919850BDBF&displaylang=en
+The solution file resides in: oggdsf\sln\oggdsf_vs2005\
+
+Visual Studio 2008 (tested only with Express) should compile the source
+code just fine (it comes with Windows SDK)
+The solution file resides in: oggdsf\sln\oggsdf\
+
+In order to build the 64 bit x64 platform you will need at least:
+Visual Studio 2005 Standard or Visual Studio 2008 Professional
+editions.
+
+
+Information for builds after 0.71
+=================================
+
+This project now uses VS2005. VS2003/2002/6.0 will *not*
+ be able to open or build this project.
+
+This also means it uses V8.0 of the run time libraries.
+Depending if i have suppressed the warnings, you may
+see lots of compiler warnings about things in the C
+library being deprecated. As of V8.0 most of the standard
+C library is marked deprecated and it is recommended to
+use new and semantically different functions from the new
+secure CRT. Since there are so many of these occurences,
+and some of the code needs to be portable, these warnings
+are mostly suppressed/ignored.
+
+In order to fix unicode problems on modern systems without
+ dropping support for 9X/ME machines, a custom built
+ C runtime needs to be used. These are in the repository
+ in the bin directory. You need to overwrite some of your
+ Visual Studio files to build the version that can run
+ on the old versions. At this stage i haven't checked
+ whether it is now unbuildable without doing this (i don't
+ think it will be, just you will get a binary that only
+ works on NT/2K/XP systems)
+
+(More info to come on this)
+
+You need to set up several things in your build environment
+ in order to build this project. It depends on several
+ Microsoft SDK's. Without these you cannot build this
+ project.
+
+The directshow SDK is now part of the core platforms SDK.
+ You will need this as well as the DirectX SDK.
+
+There are no longer hardcoded paths into the directx sdk,
+ all the projects now use the environment variables that
+ are created by installing the SDK's.
+
+The main solution is in \sln\oggdsf_all
+
+Some projects in the solution may not build. You should
+ build the distribution project called oggcodecs, to
+ ensure you are build all and only the projects that are
+ part of the core distribution. VS Express, may or may not
+ properly handle distribution project.
+
+If you are using the distribution project from the IDE
+ it is important that before you
+ install using that installer, that you uninstall any
+ version of the official distribution. Similarly, if
+ you are going to install the official distribution
+ after you have used this feature, you need to unistall
+ the official distribution.
+ They use two different installer technologies, and each
+ will install over the other without the other one
+ knowing.
+
+In order to build you need the following
+ * Visual Studio 2005 - I develop and test with the professional
+ edition. This is the recommended way to build.
+
+ It should/may also be possible to build with the
+ free Express edition. To build the directshow filters
+ core package, you'll need VC++ 2005 Express. Other
+ projects not part of the core distribution are in C#
+ so if you want to be able to open every project in the
+ solution you will also need this. I have not tested
+ using the express edition yet. If you try and it works
+ let me know, or tell me anything special you had to do.
+
+ You can download express edition for free from
+ http://msdn.microsoft.com/vstudio/express/visualc/default.aspx
+
+
+ * Windows Server 2003 SP1 Platform SDK - Yes, even if you
+ are using XP or whatever operating system.
+
+ You can download it from (~400MB, getting the disk image is easiest)
+ http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en
+
+ You will need to update the build paths in VS2005, whether
+ you use express or the full version. The following link explains
+ how to do that (see step 3). If using express, you will need
+ to follow all the steps on this link.
+
+ http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
+
+ See step 3.
+
+ eg. in the Executable files list *at the top* of the list
+ ad $(MSSdk)\Bin and in the include list $(MSSdk)\include
+ They must be at the top (or at least above the other
+ references to the built in platform sdk),
+ otherwise the compiler will
+ still use the old version it came with.
+
+ In the installer there is one item not checked at the top
+ This option adds the MSSdk environment variable. It
+ warns this could affect other programs that use older
+ versions of the platform sdk. It caused no problem for
+ me, but if you have development projects depending
+ on this variable and/or older versions of the platform
+ SDK, you'll have to work out what works for you. That
+ warning is pretty big and bold.
+
+ If you don't take this option, you'll need to hardcode in
+ the path you installed the platform sdk to as it does
+ suggest in step 3 of the link above, however this still
+ changes VS's global settings could also cause problems.
+
+ Alternatively, if you don't take this option, and later
+ realise that this issue will not affect you, you can
+ add the MSSdk user and system variable yourself if you
+ choose.
+
+ Hardcoding the path will force VS to always use this
+ version, and you'll have to update it if a new one
+ comes out. Using the environment variable will cause
+ it to always use the latest version (really whatever version
+ the variable points to). Each option has it's ups and
+ downs, depending on what other development work you do.
+
+ Also note: That big bold warning says you can register with
+ visual studio by using a link in the start menu. This
+ *does not* work for VS2005. The platform SDK was released
+ before VS2005, it's probably updating the build paths
+ in vs2003. This is the reason you have to manaully update
+ the paths in options. It's likely when a new platform
+ SDK is released it will work properly for VS2005.
+
+
+ You mileage mary vary if you have the express edition.
+
+ * DirectX SDK February 2006 (or probably later will work too)
+
+ You can download it from (~350MB, validation required)
+ http://www.microsoft.com/downloads/details.aspx?FamilyID=EDB98FFA-A59C-4C23-9B92-BA304F188314&displaylang=en
+
+ You will also need to add to your include paths in
+ Visual Studio the path to the DX include files.
+ This DX SDK creates the environment variable DXSDK_DIR
+
+ So you need to add to the include list (as you did above)
+ $(DXSDK_DIR)include
+
+ * WMP 10 SDK - Need after 0.72 release.
+
+ You can download from here
+ http://msdn.microsoft.com/windowsmedia/downloads/default.aspx
+
+ You need to add the include path to visual studio. In
+ tools->options->projects and solutions->vC++ dirs
+
+
+ Add the WMP include path to the include list (drop down at top)
+ default install path will be c:\WMSDK\WMPSDK10\include
+
+ * NASM 0.98.38/0.98.39 - This is required for flac. Best to
+ install it to it's default at C:\NASM. Where "best to"
+ means if you don't want to be screwing around.
+
+ You can download from here
+ http://sourceforge.net/projects/nasm
+
+ * Windows Mobile 5.0 Developer Resource Kit (~900MB)
+ http://www.microsoft.com/downloads/details.aspx?familyid=3BAA5B7D-04C1-4EC2-83DC-61B21EC5FE57&displaylang=en
+
+ The express edition can not do mobile development.
+ I have no idea whether it will let you open the project
+ and ignore the mobile configurations or whether
+ it will just refuse to let you. I'm not sure if
+ the professional edition will even let you open the
+ projects which have wm5 configs (most of them)
+ without installing this.
+
+ * Doxygen with DOT if you want to create the doc files
+ - Most recently used graphviz (DOT) V2.8 from
+ http://www.graphviz.org/Download_windows.php
+ - And doxygen version 1.4.7 from
+ http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc
+
+ * NSIS (currently using 2.17) to build the installers
+
+
+
+You need all these things if you want to build this project.
+ If you already do directx/multimedia development you may already
+ have some or all of these sdk's. You only need them once to setup
+ your build environment.
+
+It may seem excessive that you need to download 2 gigabytes of stuff
+ just to build. This project uses technologies from several sdk's,
+ and there is no way around that. Once you set up these things, the
+ project is very easy to build, with the professional edition and
+ above that is, possibly the standard edition.
+
+The baseclasses library is no longer used from the platform
+ SDK (but you still need it). There is a modified version
+ of the baseclasses libraries that is part of this source.
+ The version in the platform SDK won't build in VS2005 as it
+ is, the modifed version that is part of this source has
+ fixes so that it builds correctly with the new compiler.
+
+This project now uses V8 of the runtime libraries. As of
+ version 8, there are changes to the way the operating system
+ handles these libraries. The first release to use this is/will be
+ 0.72.xxxx
+
+The release distributions are built using NSIS. There is
+ an MSI installer project in the solution, this is only
+ for developer convenience. It is often not fully up to
+ date, and/or correct. It should *never* be used as a means
+ of distribution.
+
+
+==========================================================
+The below information is left for reference, where the
+ information above conflicts with this, the information
+ above should take precedence. Much of the information
+ below is no longer relevant.
+==========================================================
+Updated after 0.62 release.
+==========================
+
+These are probably not very build friendly at the moment.
+I will make them a bit more user friendly in the future.
+
+
+In order to build these...
+
+
+You need visual studio 2003. There are no VC6 files or VS2002 files.
+ In theory you should be able to create VC2002 files... and in fact
+ out of date VC2002 files are generally found with .vcproj.bak
+ extensions. However some of the libraries will not build in VS2002,
+ there is a bug in the 2002 compilers imlpementation of mixed mode
+ dlls, which stops some of the .NET bridging libraries linking.
+
+You need NASM for FLAC to build. (lifes easier if it's at C:\NASM)
+ you'll have to play around with that yourself... it's a real pain !
+ Also the vcproj files have hidden settings that don't show up
+ in visual studio... you'll have to figure it out (ie edit the vcproj)
+ I suggest once you get it to build, leave it built... don't clean
+ that project. The clean script it has for some reason tries to
+ delete some necessary header files. Don't ask me why !
+ Also ignore visual studio hassling you about sourcesafe for flac.
+
+I've been using NASM 0.98.38 which you can find here
+ http://sourceforge.net/projects/nasm You want the win32 binaries.
+
+If you do accidentally clean FLAC, you will get a message when you
+ try to build that says "ordinals.h" not found. You need to
+ go to the libFLAC directory and find the file called ordinals.h.bak
+ and *copy* it to the same directory without the .in extension.
+ Don't just rename it... you want to keep that file for next time
+ this happens !
+
+You need DirectX 9 SDK installed (lifes easier if it's at C:\DXSDK)
+ Otherwise all projects prefixed with dsf you'll need to change the
+ absolute references to that path. I'll try to do something to make
+ this easier in future.
+
+If the baseclasses project shows up as not found, you need to find
+ it in the DXSDK directory tree, and load it from there.
+ By default it tries to build against Multithreaded static runtimes
+ You *must* change these to Multi Threaded DLL or Multi Threaded
+ debug DLL. Otherwise all sorts of chaos will occur. This project
+ is not part of the package. It is part of the DirectX SDK.
+
+If you try to build the installer project, you need to change the paths
+ of the AUTHORS, COPYRIGHTS etc files... i can't make it accept a
+ relative path.
+
+Probably other stuff i can't think of. These aren't really ready for
+ easy use yet.
+
Added: trunk/oggdsf/BUILD.txt
===================================================================
--- trunk/oggdsf/BUILD.txt (rev 0)
+++ trunk/oggdsf/BUILD.txt 2010-02-21 21:56:14 UTC (rev 16927)
@@ -0,0 +1,77 @@
+Information for builds after 0.82
+=================================
+
+Visual Studio Standard (or better) version 2005 or 2008 is needed
+to build the project. The express editions do not suffice anymore.
+
+The Netwide Assembler (NASM) is used to build the FLAC assembly
+files. Get version 2.0.7 or later from http://www.nasm.us/
+nasm.exe is assumed to be in path.
+
+NSIS (Nullsoft Scriptable Install System) Unicode is used to make the
+setup files. Get version 2.45 or later from http://www.scratchpaper.com/
+
+Windows SDK
+===========
+Visual Studio 2005:
+Windows SDK for Windows Server 2008 and .NET Framework 3.5 -
+http://www.microsoft.com/downloads/details.aspx?FamilyId=F26B1AA4-741A-433A-9BE5-FA919850BDBF&displaylang=en
+
+Visual Studio 2008:
+Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1 -
+http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
+
+Note that Visual Studio 2005 doesn't work with "Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1",
+I've got linking errors regarding "Strmiids.lib".
+
+The following system environment variable BASECLASSES should point to the
+DirectShow BaseClasses path e.g.:
+c:\Program Files\Microsoft SDKs\Windows\v7.0\Samples\multimedia\directshow\baseclasses\
+
+DirectX SDK:
+DirectX Software Development Kit -
+http://www.microsoft.com/downloads/details.aspx?FamilyID=B66E14B8-8505-4B17-BF80-EDB2DF5ABAD4&displaylang=en
+
+Also make sure that in you have the Windows SDK include, library, and executable paths configured
+in Visual Studio.
+
+Windows Mobile
+==============
+
+Visual Studio 2005 Standard or Visual Studio 2008 Professional is required.
+
+* Microsoft® Windows® CE 5.0 Evaluation Edition
+http://www.microsoft.com/downloads/details.aspx?familyid=486e8250-d311-4f67-9fb3-23e8b8944f3e&displaylang=en
+
+Install only the ARMV4I operating system.
+
+- Microsoft .NET Framework 1.1
+http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3&displaylang=en
+
+- Windows CE 5.0 Cumulative Product Update Rollup Package (through 12/31/2009)
+http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=5ae5ff14-4d40-4e39-a245-0e94b9debcb7
+
+The above is required for DirectShow Baseclasses. The following system environment variable BASECLASSES_WINCE
+should point to the DirectShow BaseClasses path e.g.:
+c:\WINCE500\PUBLIC\DIRECTX\SDK\SAMPLES\DSHOW\BASECLASSES\
+
+The following are needed to add Windows Mobile platforms in Visual Studio
+
+- Windows Mobile 5.0 SDK for Pocket PC
+http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED&displaylang=en
+
+- Windows Mobile 5.0 SDK for Smartphone
+http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=dc6c00cb-738a-4b97-8910-5cd29ab5f8d9
+
+- Windows Mobile 6 Professional Software Development Kits Refresh
+http://www.microsoft.com/downloads/details.aspx?familyid=06111A3A-A651-4745-88EF-3D48091A390B&displaylang=en
+
+The order of installation is important, otherwise all the vcproj files would be
+changed upon load:
+
+1. Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - "Windows Mobile 5.0 SDK for Pocket PC.msi"
+2. Windows Mobile 5.0 Smartphone SDK (ARMV4I) - "Windows Mobile 5.0 SDK for Smartphone.msi"
+3. Windows Mobile 6 Professional SDK (ARMV4I) - "Windows Mobile 6 Professional SDK Refresh.msi"
+
+Or alternatively you can modify the "%VCINSTALLDIR%\vcpackages\WCE.VCPlatform.config" xml file and change
+the order of SDKs there.
Modified: trunk/oggdsf/COPYRIGHTS
===================================================================
--- trunk/oggdsf/COPYRIGHTS 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/COPYRIGHTS 2010-02-21 21:56:14 UTC (rev 16927)
@@ -243,7 +243,7 @@
*** iOCE
-Copyright (C) 2008 - 2009 Cristian Adam
+Copyright (C) 2008 - 2010 Cristian Adam
Copyright (C) 2003-2005 Zentaro Kavanagh
Modified: trunk/oggdsf/COPYRIGHTS.rtf
===================================================================
--- trunk/oggdsf/COPYRIGHTS.rtf 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/COPYRIGHTS.rtf 2010-02-21 21:56:14 UTC (rev 16927)
@@ -253,7 +253,7 @@
*** iOCE\par
\par
\par
-Copyright (C) 2008 - 2009 Cristian Adam\par
+Copyright (C) 2008 - 2010 Cristian Adam\par
\par
Copyright (C) 2003\lang1048\f1 -\lang1033\f0 200\lang1048\f1 5\lang1033\f0 Zentaro Kavanagh\par
\par
Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/ChangeLog.txt 2010-02-21 21:56:14 UTC (rev 16927)
@@ -1,3 +1,26 @@
+Version 0.82.16927
+
+ * Updated Theora to version 1.1.1
+ * Updated Vorbis to version 1.2.3
+ * Windows 7 suppport (note that contextual menu entries in Windows Explorer is not yet available - Ticket #1619)
+ * Added support for Theora 4:2:2 and 4:4:4 color sampling formats.
+ * Added HTML5 <video> tag support for Microsoft Internet Explorer. This component is not enabled by default in the
+ installer and it is only a technical preview - only basic playback (play/pause by left click button), no seeking, no
+ controls and no HTML5 <video> interfaces support.
+ To use it this functionality in Internet Explorer simply add xmlns="http://www.w3.org/1999/xhtml/video" to the
+ <video> tag.
+ * Added 7.1 channels support for FLAC and support for files bigger than 2GBytes.
+ * Prefixed all DirectShow filters with "Xiph.Org". This should simplify usage for GraphEdit/GraphStudio users.
+ * Fixed #1474: The installer for 64-bit Stable Version (0.81.15562) - 06.12.2008 it's NOT working properly
+ * Fixed #1475: Typo in README
+ * Fixed #1490: Theroa video resumes after starting to play in wmp 9 (win xp)
+ * Fixed #1491: oggcodecs doesn't work with 6-channel FLACs
+ * Fixed #1497: Ogg Theora Video is upside down/flipped in Windows Media Player (v6.4.09 and v7.10)
+ * Fixed #1500: directshow filters messes up windows media player file open dialogue
+ * Fixed #1546: OGV file(s) are crashing WMP (12)
+ * Fixed #1563: DirectShow filter installer does not add proper "PerceivedType" REG_SZ to HKCR\.ext key
+ * Fixed #1603: Theora Videos Encoded At Around 480x360 Crash Directshow Filter
+
Version 0.81.15562 - 06.12.2008
* Updated Theora to version 1.0
Deleted: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/README 2010-02-21 21:56:14 UTC (rev 16927)
@@ -1,308 +0,0 @@
-Information for builds after 0.80
-=================================
-
-Support for Windows 9x (95, 98, Me) has been dropped.
-
-The project now has Visual Studio 2005 and Visual Studio 2008
-project files.
-
-The Netwide Assembler (NASM) is used to build the assembly
-files in the project. Get version 2.0.3 or later from http://www.nasm.us/
-The nasm.exe should be in the path, doesn't matter where you
-copy it.
-
-NSIS (Nullsoft Scriptable Install System) is used to make the
-setup files. Get version 2.41 or later from http://nsis.sourceforge.net/Download
-
-Visual Studio 2005 (Express, or Standard) requires the presence
-of the Windows SDK for Windows Server 2008 and .NET Framework 3.5
-http://www.microsoft.com/downloads/details.aspx?FamilyId=F26B1AA4-741A-433A-9BE5-FA919850BDBF&displaylang=en
-The solution file resides in: oggdsf\sln\oggdsf_vs2005\
-
-Visual Studio 2008 (tested only with Express) should compile the source
-code just fine (it comes with Windows SDK)
-The solution file resides in: oggdsf\sln\oggsdf\
-
-In order to build the 64 bit x64 platform you will need at least:
-Visual Studio 2005 Standard or Visual Studio 2008 Professional
-editions.
-
-
-Information for builds after 0.71
-=================================
-
-This project now uses VS2005. VS2003/2002/6.0 will *not*
- be able to open or build this project.
-
-This also means it uses V8.0 of the run time libraries.
-Depending if i have suppressed the warnings, you may
-see lots of compiler warnings about things in the C
-library being deprecated. As of V8.0 most of the standard
-C library is marked deprecated and it is recommended to
-use new and semantically different functions from the new
-secure CRT. Since there are so many of these occurences,
-and some of the code needs to be portable, these warnings
-are mostly suppressed/ignored.
-
-In order to fix unicode problems on modern systems without
- dropping support for 9X/ME machines, a custom built
- C runtime needs to be used. These are in the repository
- in the bin directory. You need to overwrite some of your
- Visual Studio files to build the version that can run
- on the old versions. At this stage i haven't checked
- whether it is now unbuildable without doing this (i don't
- think it will be, just you will get a binary that only
- works on NT/2K/XP systems)
-
-(More info to come on this)
-
-You need to set up several things in your build environment
- in order to build this project. It depends on several
- Microsoft SDK's. Without these you cannot build this
- project.
-
-The directshow SDK is now part of the core platforms SDK.
- You will need this as well as the DirectX SDK.
-
-There are no longer hardcoded paths into the directx sdk,
- all the projects now use the environment variables that
- are created by installing the SDK's.
-
-The main solution is in \sln\oggdsf_all
-
-Some projects in the solution may not build. You should
- build the distribution project called oggcodecs, to
- ensure you are build all and only the projects that are
- part of the core distribution. VS Express, may or may not
- properly handle distribution project.
-
-If you are using the distribution project from the IDE
- it is important that before you
- install using that installer, that you uninstall any
- version of the official distribution. Similarly, if
- you are going to install the official distribution
- after you have used this feature, you need to unistall
- the official distribution.
- They use two different installer technologies, and each
- will install over the other without the other one
- knowing.
-
-In order to build you need the following
- * Visual Studio 2005 - I develop and test with the professional
- edition. This is the recommended way to build.
-
- It should/may also be possible to build with the
- free Express edition. To build the directshow filters
- core package, you'll need VC++ 2005 Express. Other
- projects not part of the core distribution are in C#
- so if you want to be able to open every project in the
- solution you will also need this. I have not tested
- using the express edition yet. If you try and it works
- let me know, or tell me anything special you had to do.
-
- You can download express edition for free from
- http://msdn.microsoft.com/vstudio/express/visualc/default.aspx
-
-
- * Windows Server 2003 SP1 Platform SDK - Yes, even if you
- are using XP or whatever operating system.
-
- You can download it from (~400MB, getting the disk image is easiest)
- http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en
-
- You will need to update the build paths in VS2005, whether
- you use express or the full version. The following link explains
- how to do that (see step 3). If using express, you will need
- to follow all the steps on this link.
-
- http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
-
- See step 3.
-
- eg. in the Executable files list *at the top* of the list
- ad $(MSSdk)\Bin and in the include list $(MSSdk)\include
- They must be at the top (or at least above the other
- references to the built in platform sdk),
- otherwise the compiler will
- still use the old version it came with.
-
- In the installer there is one item not checked at the top
- This option adds the MSSdk environment variable. It
- warns this could affect other programs that use older
- versions of the platform sdk. It caused no problem for
- me, but if you have development projects depending
- on this variable and/or older versions of the platform
- SDK, you'll have to work out what works for you. That
- warning is pretty big and bold.
-
- If you don't take this option, you'll need to hardcode in
- the path you installed the platform sdk to as it does
- suggest in step 3 of the link above, however this still
- changes VS's global settings could also cause problems.
-
- Alternatively, if you don't take this option, and later
- realise that this issue will not affect you, you can
- add the MSSdk user and system variable yourself if you
- choose.
-
- Hardcoding the path will force VS to always use this
- version, and you'll have to update it if a new one
- comes out. Using the environment variable will cause
- it to always use the latest version (really whatever version
- the variable points to). Each option has it's ups and
- downs, depending on what other development work you do.
-
- Also note: That big bold warning says you can register with
- visual studio by using a link in the start menu. This
- *does not* work for VS2005. The platform SDK was released
- before VS2005, it's probably updating the build paths
- in vs2003. This is the reason you have to manaully update
- the paths in options. It's likely when a new platform
- SDK is released it will work properly for VS2005.
-
-
- You mileage mary vary if you have the express edition.
-
- * DirectX SDK February 2006 (or probably later will work too)
-
- You can download it from (~350MB, validation required)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=EDB98FFA-A59C-4C23-9B92-BA304F188314&displaylang=en
-
- You will also need to add to your include paths in
- Visual Studio the path to the DX include files.
- This DX SDK creates the environment variable DXSDK_DIR
-
- So you need to add to the include list (as you did above)
- $(DXSDK_DIR)include
-
- * WMP 10 SDK - Need after 0.72 release.
-
- You can download from here
- http://msdn.microsoft.com/windowsmedia/downloads/default.aspx
-
- You need to add the include path to visual studio. In
- tools->options->projects and solutions->vC++ dirs
-
-
- Add the WMP include path to the include list (drop down at top)
- default install path will be c:\WMSDK\WMPSDK10\include
-
- * NASM 0.98.38/0.98.39 - This is required for flac. Best to
- install it to it's default at C:\NASM. Where "best to"
- means if you don't want to be screwing around.
-
- You can download from here
- http://sourceforge.net/projects/nasm
-
- * Windows Mobile 5.0 Developer Resource Kit (~900MB)
- http://www.microsoft.com/downloads/details.aspx?familyid=3BAA5B7D-04C1-4EC2-83DC-61B21EC5FE57&displaylang=en
-
- The express edition can not do mobile development.
- I have no idea whether it will let you open the project
- and ignore the mobile configurations or whether
- it will just refuse to let you. I'm not sure if
- the professional edition will even let you open the
- projects which have wm5 configs (most of them)
- without installing this.
-
- * Doxygen with DOT if you want to create the doc files
- - Most recently used graphviz (DOT) V2.8 from
- http://www.graphviz.org/Download_windows.php
- - And doxygen version 1.4.7 from
- http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc
-
- * NSIS (currently using 2.17) to build the installers
-
-
-
-You need all these things if you want to build this project.
- If you already do directx/multimedia development you may already
- have some or all of these sdk's. You only need them once to setup
- your build environment.
-
-It may seem excessive that you need to download 2 gigabytes of stuff
- just to build. This project uses technologies from several sdk's,
- and there is no way around that. Once you set up these things, the
- project is very easy to build, with the professional edition and
- above that is, possibly the standard edition.
-
-The baseclasses library is no longer used from the platform
- SDK (but you still need it). There is a modified version
- of the baseclasses libraries that is part of this source.
- The version in the platform SDK won't build in VS2005 as it
- is, the modifed version that is part of this source has
- fixes so that it builds correctly with the new compiler.
-
-This project now uses V8 of the runtime libraries. As of
- version 8, there are changes to the way the operating system
- handles these libraries. The first release to use this is/will be
- 0.72.xxxx
-
-The release distributions are built using NSIS. There is
- an MSI installer project in the solution, this is only
- for developer convenience. It is often not fully up to
- date, and/or correct. It should *never* be used as a means
- of distribution.
-
-
-==========================================================
-The below information is left for reference, where the
- information above conflicts with this, the information
- above should take precedence. Much of the information
- below is no longer relevant.
-==========================================================
-Updated after 0.62 release.
-==========================
-
-These are probably not very build friendly at the moment.
-I will make them a bit more user friendly in the future.
-
-
-In order to build these...
-
-
-You need visual studio 2003. There are no VC6 files or VS2002 files.
- In theory you should be able to create VC2002 files... and in fact
- out of date VC2002 files are generally found with .vcproj.bak
- extensions. However some of the libraries will not build in VS2002,
- there is a bug in the 2002 compilers imlpementation of mixed mode
- dlls, which stops some of the .NET bridging libraries linking.
-
-You need NASM for FLAC to build. (lifes easier if it's at C:\NASM)
- you'll have to play around with that yourself... it's a real pain !
- Also the vcproj files have hidden settings that don't show up
- in visual studio... you'll have to figure it out (ie edit the vcproj)
- I suggest once you get it to build, leave it built... don't clean
- that project. The clean script it has for some reason tries to
- delete some necessary header files. Don't ask me why !
- Also ignore visual studio hassling you about sourcesafe for flac.
-
-I've been using NASM 0.98.38 which you can find here
- http://sourceforge.net/projects/nasm You want the win32 binaries.
-
-If you do accidentally clean FLAC, you will get a message when you
- try to build that says "ordinals.h" not found. You need to
- go to the libFLAC directory and find the file called ordinals.h.bak
- and *copy* it to the same directory without the .in extension.
- Don't just rename it... you want to keep that file for next time
- this happens !
-
-You need DirectX 9 SDK installed (lifes easier if it's at C:\DXSDK)
- Otherwise all projects prefixed with dsf you'll need to change the
- absolute references to that path. I'll try to do something to make
- this easier in future.
-
-If the baseclasses project shows up as not found, you need to find
- it in the DXSDK directory tree, and load it from there.
- By default it tries to build against Multithreaded static runtimes
- You *must* change these to Multi Threaded DLL or Multi Threaded
- debug DLL. Otherwise all sorts of chaos will occur. This project
- is not part of the package. It is part of the DirectX SDK.
-
-If you try to build the installer project, you need to change the paths
- of the AUTHORS, COPYRIGHTS etc files... i can't make it accept a
- relative path.
-
-Probably other stuff i can't think of. These aren't really ready for
- easy use yet.
-
Copied: trunk/oggdsf/README (from rev 16904, trunk/oggdsf/ABOUT.txt)
===================================================================
--- trunk/oggdsf/README (rev 0)
+++ trunk/oggdsf/README 2010-02-21 21:56:14 UTC (rev 16927)
@@ -0,0 +1,8 @@
+Directshow Filters for Ogg Vorbis, Speex, Theora and FLAC
+
+The aim of this project is to provide the most complete implementation of the Xiph.org codecs
+for Windows and DirectShow. This includes decoders and encoders for all the Xiph.org formats as
+well as Annodex.
+
+It is released under a BSD license, so they can be used by both open-source and commercial
+applications.
Deleted: trunk/oggdsf/VERSIONS
===================================================================
--- trunk/oggdsf/VERSIONS 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/VERSIONS 2010-02-21 21:56:14 UTC (rev 16927)
@@ -1,12 +0,0 @@
-PACKAGE - 0.81.15562
-
-==================================
-libspeex - 1.2 beta 1
-libvorbis - 1.2.1 (20080501)
-libogg - 1.1.3
-libtheora - 1.0
-libtheora-exp - trunk r15030
-libFLAC - 1.2.1
-
-* Whilst under early development, filters and all other
- libraries have same version number as packages.
Modified: trunk/oggdsf/build/NSIS/Release/build.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/build.cmd 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/build/NSIS/Release/build.cmd 2010-02-21 21:56:14 UTC (rev 16927)
@@ -19,7 +19,7 @@
@set FILTERS=%FILTERS% dsfVorbisEncoder dsfVorbisDecoder
@set FILTERS=%FILTERS% dsfCMMLDecoder dsfCMMLRawSource
@set FILTERS=%FILTERS% dsfOggMux dsfAnxMux dsfOggDemux2
- at set FILTERS=%FILTERS% dsfOGMDecoder wmpinfo
+ at set FILTERS=%FILTERS% dsfOGMDecoder wmpinfo AxPlayer
:: First make the x86 installer
set X64=
@@ -37,6 +37,8 @@
:make_installer
+signtool sign /a /t http://time.certum.pl/ bin\AxPlayer.dll
+
"%ProgramFiles%\nsis\unicode\makensis.exe" oggcodecs_release.nsi
if [%X64%] == [] (
Modified: trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi 2010-02-21 21:56:14 UTC (rev 16927)
@@ -1,6 +1,6 @@
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
; Copyright (C) 2005 - 2006 Zentaro Kavanagh
-; Copyright (C) 2008 - 2009 Cristian Adam
+; Copyright (C) 2008 - 2010 Cristian Adam
;
; NSIS install script for oggcodecs
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -158,10 +158,10 @@
!insertmacro MUI_LANGUAGE "English"
!if "$%X64%" == "true"
- Name "${PRODUCT_NAME} ${PRODUCT_VERSION} 64-bit"
+ Name "${PRODUCT_PUBLISHER} ${PRODUCT_NAME} ${PRODUCT_VERSION} 64-bit"
InstallDir "$PROGRAMFILES64\${PRODUCT_PUBLISHER}\${PRODUCT_NAME}"
!else
- Name "${PRODUCT_NAME} ${PRODUCT_VERSION} 32-bit"
+ Name "${PRODUCT_PUBLISHER} ${PRODUCT_NAME} ${PRODUCT_VERSION} 32-bit"
InstallDir "$PROGRAMFILES\${PRODUCT_PUBLISHER}\${PRODUCT_NAME}"
!endif
@@ -381,9 +381,7 @@
File "${OGGCODECS_ROOT_DIR}\bin\xifish.ico"
- ; Text files - 9
- File "${OGGCODECS_ROOT_DIR}\ABOUT.txt"
- File "${OGGCODECS_ROOT_DIR}\VERSIONS"
+ ; Text files - 7
File "${OGGCODECS_ROOT_DIR}\README"
File "${OGGCODECS_ROOT_DIR}\COPYRIGHTS.rtf"
File "${OGGCODECS_ROOT_DIR}\COPYRIGHTS"
@@ -423,8 +421,11 @@
; File "bin\dsfAnxDemux.dll"
File "bin\dsfAnxMux.dll"
- File "bin\wmpinfo.dll"
+ File "bin\wmpinfo.dll"
+ ; HTML <video> Tag Implementation
+ File "bin\AxPlayer.dll"
+
SetDetailsPrint textonly
DetailPrint "Registering DirectShow Filters ..."
SetDetailsPrint listonly
@@ -453,11 +454,7 @@
;!insertmacro RegisterCOM "$INSTDIR\dsfAnxDemux.dll"
!insertmacro RegisterCOM "$INSTDIR\dsfAnxMux.dll"
-
- IfSilent +3
- Push $INSTDIR\Install.log
- Call DumpLog
-
+
SetDetailsPrint textonly
DetailPrint "Writing Registry Entries ..."
SetDetailsPrint listonly
@@ -668,13 +665,30 @@
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+${MementoUnselectedSection} "HTML5 <video> tag for Internet Explorer" SEC_VIDEO_TAG
+ SectionIn 1
+
+!if "$%X64%" == "true"
+ SetRegView 64
+!endif
+
+ !insertmacro RegisterCOM "$INSTDIR\AxPlayer.dll"
+
+ ; Add AxPlayer XMLNamespace registry value
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\XMLNamespace" "http://www.w3.org/1999/xhtml/video" "{7CC95AE6-C1FA-40CC-AB17-3E91DA2F77CA}"
+
+${MementoSectionEnd}
+
+;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
LangString DESC_OggCoreSection ${LANG_ENGLISH} "Core files for ${PRODUCT_NAME}"
-LangString DESC_OggExtensionAudioByDefault ${LANG_ENGLISH} "Makes files with .ogg extension default to the audio section in Windows Media Player Library."
LangString DESC_OggOpensInWMP ${LANG_ENGLISH} "Associates Ogg Files with Windows Media Player, so you can double click them in explorer."
+LangString DESC_OggVideoTag ${LANG_ENGLISH} "Technical Preview! Add support for HTML5 <video> tag in Internet Explorer."
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_CORE} $(DESC_OggCoreSection)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_USE_WMP_FOR_OGG} $(DESC_OggOpensInWMP)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_VIDEO_TAG} $(DESC_OggVideoTag)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -689,6 +703,11 @@
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
WriteIniStr "$SMPROGRAMS\$ICONS_GROUP\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
!insertmacro MUI_STARTMENU_WRITE_END
+
+ IfSilent +3
+ Push $INSTDIR\Install.log
+ Call DumpLog
+
SectionEnd
${MementoSectionDone}
@@ -804,6 +823,8 @@
!insertmacro UnRegisterCOM "$INSTDIR\dsfVorbisDecoder.dll"
!insertmacro UnRegisterCOM "$INSTDIR\dsfOGMDecoder.dll"
+
+ !insertmacro UnRegisterCOM "$INSTDIR\AxPlayer.dll"
SetDetailsPrint textonly
DetailPrint "Deleting Registry Entries ..."
@@ -889,6 +910,9 @@
DeleteRegValue HKCR "Applications\wmplayer.exe\supportedtypes" ".ogv"
DeleteRegValue HKCR "Applications\wmplayer.exe\supportedtypes" ".spx"
DeleteRegValue HKCR "Applications\wmplayer.exe\supportedtypes" ".flac"
+
+ ; Delete the AxPlayer XMLNamespace registry value
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\Internet Explorer\XMLNamespace" "http://www.w3.org/1999/xhtml/video"
!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
@@ -924,10 +948,10 @@
Delete "$INSTDIR\dsfAnxMux.dll"
; Delete "$INSTDIR\dsfAnxDemux.dll"
Delete "$INSTDIR\wmpinfo.dll"
+
+ Delete "$INSTDIR\AxPlayer.dll"
- ; Delete text files - 9
- Delete "$INSTDIR\ABOUT.txt"
- Delete "$INSTDIR\VERSIONS"
+ ; Delete text files - 7
Delete "$INSTDIR\README"
Delete "$INSTDIR\COPYRIGHTS.rtf"
Delete "$INSTDIR\COPYRIGHTS"
@@ -937,7 +961,7 @@
Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\Ogg Codecs.manifest"
- ; Delete runtimes - 2
+ ; Delete runtimes - 3
Delete "$INSTDIR\${VS_RUNTIME_PREFIX}r${VS_RUNTIME_SUFFIX}.dll"
Delete "$INSTDIR\${VS_RUNTIME_PREFIX}p${VS_RUNTIME_SUFFIX}.dll"
Delete "$INSTDIR\Microsoft.VC${VS_RUNTIME_SUFFIX}.CRT.manifest"
Added: trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln
===================================================================
--- trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln (rev 0)
+++ trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln 2010-02-21 21:56:14 UTC (rev 16927)
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{B900F1C2-3D47-4FEC-85B3-04AAF18C3634}") = "oggcodecs_wm5", "oggcodecs_wm5.vddproj", "{EC9174C6-27C1-4F10-A378-D04533F1E2BC}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_WM5_PPC_ARM|Default = Debug_WM5_PPC_ARM|Default
+ Debug|Default = Debug|Default
+ Release_WM5_PPC_ARM|Default = Release_WM5_PPC_ARM|Default
+ Release|Default = Release|Default
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug_WM5_PPC_ARM|Default.ActiveCfg = Debug_WM5_PPC_ARM
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug_WM5_PPC_ARM|Default.Build.0 = Debug_WM5_PPC_ARM
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.ActiveCfg = Debug
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.Build.0 = Debug_WM5_PPC_ARM
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release_WM5_PPC_ARM|Default.ActiveCfg = Release_WM5_PPC_ARM
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release_WM5_PPC_ARM|Default.Build.0 = Release_WM5_PPC_ARM
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release|Default.ActiveCfg = Release
+ {EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release|Default.Build.0 = Release_WM5_PPC_ARM
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln 2010-02-21 21:56:14 UTC (rev 16927)
@@ -277,6 +277,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpinfo", "..\..\src\lib\helper\wmpinfo\wmpinfo-2005.vcproj", "{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxPlayer", "..\..\src\lib\plugin\AxPlayer\AxPlayer-2005.vcproj", "{C2C1F096-2541-4B13-A57E-52F2368A0E36}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1357,6 +1359,20 @@
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|x64.ActiveCfg = Release|x64
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|x64.Build.0 = Release|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Win32.Build.0 = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|x64.ActiveCfg = Debug|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|x64.Build.0 = Debug|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Win32.ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Win32.Build.0 = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|x64.ActiveCfg = Release|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln 2010-02-21 21:56:14 UTC (rev 16927)
@@ -2,11 +2,11 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+ {899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
- {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -15,11 +15,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+ {899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+ {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
- {899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
- {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -38,13 +38,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxMux", "..\..\src\lib\core\directshow\dsfAnxMux\dsfAnxMux.vcproj", "{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
+ {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+ {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
- {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -74,10 +74,10 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
ProjectSection(ProjectDependencies) = postProject
{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDirectshowAbstracts", "..\..\src\lib\core\directshow\libDirectshowAbstracts\libDirectshowAbstracts.vcproj", "{EA7091BB-9906-41DF-9738-F4858A136086}"
@@ -88,30 +88,30 @@
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
ProjectSection(ProjectDependencies) = postProject
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
- {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
+ {7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
@@ -125,8 +125,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOgg", "..\..\src\lib\core\ogg\libOOOgg\libOOOgg.vcproj", "{223ACC19-608E-4E1B-A054-067F0CACB272}"
@@ -137,19 +137,19 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOGMDecoder", "..\..\src\lib\codecs\ogm\filters\dsfOGMDecoder\dsfOGMDecoder.vcproj", "{1C4F9412-B1DE-4E65-96C1-89522EF02997}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
ProjectSection(ProjectDependencies) = postProject
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
@@ -177,41 +177,40 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
ProjectSection(ProjectDependencies) = postProject
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
- {C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
ProjectSection(ProjectDependencies) = postProject
+ {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+ {C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
- {EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
- {C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
- {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAnxHelper", "..\..\src\lib\helper\libAnxHelper\libAnxHelper.vcproj", "{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParse", "..\..\src\lib\codecs\cmml\libCMMLParse\libCMMLParse.vcproj", "{899EB7AD-26BF-4495-9BE5-EADECCC288B2}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
- {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTags", "..\..\src\lib\codecs\cmml\libCMMLTags\libCMMLTags.vcproj", "{AD38DCC6-B431-4B32-8569-74F3376EF2DA}"
@@ -231,10 +230,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
ProjectSection(ProjectDependencies) = postProject
+ {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ {653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
- {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
@@ -256,8 +255,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisComment", "..\..\src\lib\core\ogg\libVorbisComment\libVorbisComment.vcproj", "{DC4D86E2-72C1-4995-8FB1-0F08655E620A}"
ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinCMMLParse", "..\..\src\lib\codecs\cmml\libWinCMMLParse\libWinCMMLParse.vcproj", "{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}"
@@ -278,6 +277,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpinfo", "..\..\src\lib\helper\wmpinfo\wmpinfo.vcproj", "{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxPlayer", "..\..\src\lib\plugin\AxPlayer\AxPlayer.vcproj", "{C2C1F096-2541-4B13-A57E-52F2368A0E36}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1358,6 +1359,20 @@
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|x64.ActiveCfg = Release|x64
{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Release|x64.Build.0 = Release|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Win32.Build.0 = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|x64.ActiveCfg = Debug|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Debug|x64.Build.0 = Debug|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Win32.ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Win32.Build.0 = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|x64.ActiveCfg = Release|x64
+ {C2C1F096-2541-4B13-A57E-52F2368A0E36}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -37,7 +37,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"FLAC Decode Filter", // Name
+ L"Xiph.Org FLAC Decoder", // Name
&CLSID_FLACDecodeFilter, // CLSID
FLACDecodeFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
@@ -50,7 +50,7 @@
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
FLACDecodeFilter::FLACDecodeFilter(void)
- : AbstractTransformFilter(NAME("FLAC Audio Decoder"), CLSID_FLACDecodeFilter)
+ : AbstractTransformFilter(NAME("Xiph.Org FLAC Decoder"), CLSID_FLACDecodeFilter)
, mFLACFormatBlock(NULL)
{
bool locWasConstructed = ConstructPins();
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACdecoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACdecoderdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACdecoderdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -54,7 +54,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_FLACDecodeFilter, // Filter CLSID.
- L"FLAC Decode Filter", // Filter name.
+ L"Xiph.Org FLAC Decoder", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -36,7 +36,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"FLAC Encode Filter", // Name
+ L"Xiph.Org FLAC Encoder", // Name
&CLSID_FLACEncodeFilter, // CLSID
FLACEncodeFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
@@ -99,7 +99,7 @@
}
FLACEncodeFilter::FLACEncodeFilter(void)
- : AbstractTransformFilter(NAME("FLAC Encoder"), CLSID_FLACEncodeFilter)
+ : AbstractTransformFilter(NAME("Xiph.Org FLAC Encoder"), CLSID_FLACEncodeFilter)
{
bool locWasConstructed = ConstructPins();
}
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -53,7 +53,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_FLACEncodeFilter, // Filter CLSID.
- L"FLAC Encode Filter", // Filter name.
+ L"Xiph.Org FLAC Encoder", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -50,7 +50,7 @@
// Generic way of determining the number of items in the template
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-const wchar_t* NativeFLACSourceFilter::NAME = L"Xiph.Org Native FLAC Source";
+const wchar_t* NativeFLACSourceFilter::NAME = L"Xiph.Org Native FLAC Decoder";
const AMOVIESETUP_MEDIATYPE NativeFLACSourceFilter::m_mediaTypes =
{
Modified: trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -38,7 +38,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"OGM Decode Filter", // Name
+ L"Xiph.Org OGM Decoder", // Name
&CLSID_OGMDecodeFilter, // CLSID
OGMDecodeFilter::CreateInstance, // Method to create an instance of Speex Decoder
NULL, // Initialization function
@@ -51,7 +51,7 @@
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
OGMDecodeFilter::OGMDecodeFilter()
- : CTransformFilter(NAME("OGM Video Decoder"), NULL, CLSID_OGMDecodeFilter)
+ : CTransformFilter(NAME("Xiph.Org OGM Decoder"), NULL, CLSID_OGMDecodeFilter)
, mInputPin(NULL)
, mOutputPin(NULL)
, mOGMGranulesBuffered(0)
Modified: trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/ogmdecoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/ogmdecoderdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/ogmdecoderdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -57,7 +57,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_OGMDecodeFilter, // Filter CLSID.
- L"OGM Decode Filter", // Filter name.
+ L"Xiph.Org OGM Decoder", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -52,7 +52,7 @@
// Generic way of determining the number of items in the template
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-const wchar_t* SpeexDecodeFilter::NAME = L"Xiph.Org Speex Audio Decoder";
+const wchar_t* SpeexDecodeFilter::NAME = L"Xiph.Org Speex Decoder";
const AMOVIESETUP_MEDIATYPE SpeexDecodeFilter::m_outputMediaTypes =
{
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -39,7 +39,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"Speex Encode Filter", // Name
+ L"Xiph.Org Speex Encoder", // Name
&CLSID_SpeexEncodeFilter, // CLSID
SpeexEncodeFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
@@ -102,7 +102,7 @@
}
SpeexEncodeFilter::SpeexEncodeFilter(void)
- : AbstractTransformFilter(NAME("Speex Encoder"), CLSID_SpeexEncodeFilter)
+ : AbstractTransformFilter(NAME("Xiph.Org Speex Encoder"), CLSID_SpeexEncodeFilter)
{
bool locWasConstructed = ConstructPins();
}
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -56,7 +56,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_SpeexEncodeFilter, // Filter CLSID.
- L"Speex Encode Filter", // Filter name.
+ L"Xiph.Org Speex Encoder", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -37,7 +37,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"Vorbis Encode Filter", // Name
+ L"Xiph.Org Vorbis Encoder", // Name
&CLSID_VorbisEncodeFilter, // CLSID
VorbisEncodeFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
@@ -67,7 +67,7 @@
}
VorbisEncodeFilter::VorbisEncodeFilter(void)
- : AbstractTransformFilter(NAME("Vorbis Encoder"), CLSID_VorbisEncodeFilter)
+ : AbstractTransformFilter(NAME("Xiph.Org Vorbis Encoder"), CLSID_VorbisEncodeFilter)
{
bool locWasConstructed = ConstructPins();
//Error checks ??
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -57,7 +57,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_VorbisEncodeFilter, // Filter CLSID.
- L"Vorbis Encode Filter", // Filter name.
+ L"Xiph.Org Vorbis Encoder", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -51,7 +51,7 @@
// Generic way of determining the number of items in the template
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-const wchar_t* OggDemuxPacketSourceFilter::NAME = L"Xiph.Org Ogg Demux Source";
+const wchar_t* OggDemuxPacketSourceFilter::NAME = L"Xiph.Org Ogg Demuxer";
const AMOVIESETUP_PIN OggDemuxPacketSourceFilter::m_pinReg =
{
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -38,7 +38,7 @@
CFactoryTemplate g_Templates[] =
{
{
- L"OggMuxFilter", // Name
+ L"Xiph.Org Ogg Muxer", // Name
&CLSID_OggMuxFilter, // CLSID
OggMuxFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
@@ -137,7 +137,7 @@
//------------------
OggMuxFilter::OggMuxFilter()
- : CBaseFilter(NAME("OggMuxFilter"), NULL, m_pLock, CLSID_OggMuxFilter)
+ : CBaseFilter(NAME("Xiph.Org Ogg Muxer"), NULL, m_pLock, CLSID_OggMuxFilter)
, mInterleaver(NULL)
{
mInterleaver = new OggPageInterleaver(this, this);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -62,7 +62,7 @@
hr = locFilterMapper->RegisterFilter(
CLSID_OggMuxFilter, // Filter CLSID.
- L"Ogg Mux Filter", // Filter name.
+ L"Xiph.Org Ogg Muxer", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
NULL, // Instance data. ???????
Modified: trunk/oggdsf/src/lib/helper/common/util.h
===================================================================
--- trunk/oggdsf/src/lib/helper/common/util.h 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/helper/common/util.h 2010-02-21 21:56:14 UTC (rev 16927)
@@ -41,7 +41,7 @@
{ \
LOG(logERROR) << "Expression " << #expr << " in function " << func \
<< " has failed, error code: 0x" << std::hex << hr; \
- AtlThrow(hr); \
+ throw CAtlException(hr); \
} \
} while (false);
Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/AxPlayer.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/AxPlayer.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/AxPlayer.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -76,6 +76,9 @@
hr = PrxDllRegisterServer();
#endif
+ // IEREGISTERXMLNSFN is available in Microsoft SDK for Windows 7,
+ // which doesn't work with Visual Studio 2005
+#if _MSC_VER >= 1500
// Microsoft has IERegisterXMLNS function in <MsHtmHst.h> but
// didn't bother to give also a library
HMODULE mshtml = (HMODULE)::LoadLibrary(L"mshtml.dll");
@@ -86,6 +89,7 @@
{
(*ieRegisterXmlsNs)(HTML5NS, CLSID_VideoTagBehavior, TRUE);
}
+#endif
return hr;
}
@@ -117,7 +121,10 @@
{
if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
{
+ // AtlSetPerUserRegistration is available only in Visual Studio 2008
+#if _MSC_VER >= 1500
AtlSetPerUserRegistration(true);
+#endif
}
}
Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -270,22 +270,29 @@
unsigned DShowVideoPlayer::PlaybackThreadFunc(void* arg)
{
+ const int WAITTIME = 20;
+
util::ComInitializer comInit;
DShowVideoPlayer* self = reinterpret_cast<DShowVideoPlayer*>(arg);
self->Thread_PrepareGraph();
- HANDLE events[3];
- events[0] = self->m_stopPlaybackEvent;
- events[1] = self->m_executeFunctionEvent;
- events[2] = self->m_filterGraph.GetMovieEventHandle();
+ std::vector<HANDLE> events;
+ events.push_back(self->m_stopPlaybackEvent);
+ events.push_back(self->m_executeFunctionEvent);
+ HANDLE movieEventHandle = self->m_filterGraph.GetMovieEventHandle();
+ if (movieEventHandle != INVALID_HANDLE_VALUE)
+ {
+ events.push_back(movieEventHandle);
+ }
+
bool exit;
do
{
exit = false;
- DWORD result = ::WaitForMultipleObjects(sizeof(events) / sizeof HANDLE, events, FALSE, 10);
+ DWORD result = ::WaitForMultipleObjects(events.size(), &*events.begin(), FALSE, WAITTIME);
if (result == WAIT_OBJECT_0)
{
@@ -311,6 +318,12 @@
break;
}
}
+ else if (result == WAIT_FAILED)
+ {
+ LOG(logERROR) << __FUNCTIONW__ << " WaitFailed, GetLastError: 0x" << std::hex << ::GetLastError();
+ ::Sleep(WAITTIME);
+ }
+
} while (!exit);
return 0;
Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/Res/AxPlayer.rc
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/Res/AxPlayer.rc 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/Res/AxPlayer.rc 2010-02-21 21:56:14 UTC (rev 16927)
@@ -59,8 +59,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 0,0,0,1
+ PRODUCTVERSION 0,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -77,12 +77,12 @@
BEGIN
VALUE "CompanyName", "Xiph.Org"
VALUE "FileDescription", "HTML5 <video> implementation"
- VALUE "FileVersion", "1.0.0.1"
+ VALUE "FileVersion", "0.0.0.1"
VALUE "InternalName", "AxPlayer.dll"
VALUE "LegalCopyright", "(c) 2010 Xiph.Org. All rights reserved."
VALUE "OriginalFilename", "AxPlayer.dll"
VALUE "ProductName", "AxPlayer"
- VALUE "ProductVersion", "1.0.0.1"
+ VALUE "ProductVersion", "0.0.0.1"
END
END
BLOCK "VarFileInfo"
Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp 2010-02-21 21:56:14 UTC (rev 16927)
@@ -140,6 +140,7 @@
CHECK_HR(CComObject<VideoTagBehavior>::CreateInstance(&behavior));
CHECK_HR(behavior->QueryInterface(IID_IElementBehavior, (void**)ppBehavior));
+ CHECK_HR(behavior->SetSite(m_oleClientSite));
}
}
catch (const CAtlException& except)
@@ -314,7 +315,17 @@
LOG(logINFO) << SRC_ATTRIBUTE << " = \"" << attributeValue << "\"";
- m_videoPlayer.SetSrc(attributeValue);
+ CString src(attributeValue);
+
+ if (IsRelativeURL(src))
+ {
+ CString siteUrl = GetSiteURL();
+ siteUrl.Append(src);
+
+ src = siteUrl;
+ }
+
+ m_videoPlayer.SetSrc(src);
}
}
}
@@ -347,3 +358,61 @@
{
}
}
+
+HRESULT __stdcall VideoTagBehavior::SetSite( IUnknown *pUnkSite )
+{
+ try
+ {
+ if (pUnkSite)
+ {
+ CHECK_HR(pUnkSite->QueryInterface(IID_IOleClientSite, (void**)&m_oleClientSite));
+ }
+ }
+ catch (const CAtlException /*except*/)
+ {
+ }
+
+ return IObjectWithSiteImpl<VideoTagBehavior>::SetSite(pUnkSite);
+}
+
+CString VideoTagBehavior::GetSiteURL()
+{
+ CString siteUrl;
+
+ try
+ {
+ CComPtr<IMoniker> objectWithSiteMoniker;
+ LPOLESTR displayNameOleStr;
+
+ ATLASSERT(m_oleClientSite);
+ CHECK_HR(m_oleClientSite->GetMoniker(OLEGETMONIKER_TEMPFORUSER, OLEWHICHMK_CONTAINER, &objectWithSiteMoniker));
+ CHECK_HR(objectWithSiteMoniker->GetDisplayName(NULL, NULL, &displayNameOleStr));
+
+ siteUrl = displayNameOleStr;
+ ::CoTaskMemFree((LPVOID)displayNameOleStr);
+ }
+ catch (const CAtlException& /*except*/)
+ {
+ }
+
+ return siteUrl;
+}
+
+bool VideoTagBehavior::IsRelativeURL(const CString& url)
+{
+ // This is a very simple implementation
+ CString lowerCaseUrl(url);
+ lowerCaseUrl.MakeLower();
+
+ bool isRelative = true;
+ if (lowerCaseUrl.Find(L"http://") != -1)
+ {
+ isRelative = false;
+ }
+ else if (lowerCaseUrl.Find(L"ftp://") != -1)
+ {
+ isRelative = false;
+ }
+
+ return isRelative;
+}
Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.h 2010-02-21 00:01:02 UTC (rev 16926)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.h 2010-02-21 21:56:14 UTC (rev 16927)
@@ -139,14 +139,21 @@
virtual void Refresh();
virtual void MovieSize(const CSize& movieSize);
+ // IObjectWithSite
+ virtual HRESULT __stdcall SetSite(IUnknown *pUnkSite);
+
private:
void ParseElementAttributes();
+
+ CString GetSiteURL();
+ bool IsRelativeURL(const CString& url);
private:
CComPtr<IElementBehaviorSite> m_site;
CComPtr<IElementBehaviorSiteOM2> m_omSite;
CComPtr<IHTMLPaintSite> m_paintSite;
CComPtr<IHTMLElement> m_element;
+ CComPtr<IOleClientSite> m_oleClientSite;
int m_width;
int m_height;
More information about the commits
mailing list