[xiph-commits] r7919 - in trunk/oggdsf: sln/oggdsf_all src/tests
src/tests/testlibOOOggSpeed1 src/tests/testliboggSpeed1
src/tests/testliboggzSpeed1
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Wed Oct 6 23:18:44 PDT 2004
Author: illiminable
Date: 2004-10-06 23:18:43 -0700 (Wed, 06 Oct 2004)
New Revision: 7919
Added:
trunk/oggdsf/src/tests/testlibOOOggSpeed1/
trunk/oggdsf/src/tests/testlibOOOggSpeed1/ReadMe.txt
trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.cpp
trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.h
trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.cpp
trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj
trunk/oggdsf/src/tests/testliboggSpeed1/
trunk/oggdsf/src/tests/testliboggSpeed1/ReadMe.txt
trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.cpp
trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.h
trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp
trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.vcproj
trunk/oggdsf/src/tests/testliboggzSpeed1/
trunk/oggdsf/src/tests/testliboggzSpeed1/ReadMe.txt
trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.cpp
trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.h
trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.cpp
trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.vcproj
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
Log:
* Added a couple of test apps as baselines for optimiasations.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-07 06:18:43 UTC (rev 7919)
@@ -1134,6 +1134,20 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlibOOOggSpeed1", "..\..\src\tests\testlibOOOggSpeed1\testlibOOOggSpeed1.vcproj", "{BD43F518-8ACE-4FFD-BF75-35596469A28E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testliboggSpeed1", "..\..\src\tests\testliboggSpeed1\testliboggSpeed1.vcproj", "{B6174F02-E9F8-4C7C-97E1-E29782960D0D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testliboggzSpeed1", "..\..\src\tests\testliboggzSpeed1\testliboggzSpeed1.vcproj", "{32228390-D24D-40CD-A31E-E4E1CF94C308}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -2085,6 +2099,54 @@
{C2DBE955-C193-4BEC-A2E8-AB67153CD3EF}.Release_SSE.Build.0 = Release|Win32
{C2DBE955-C193-4BEC-A2E8-AB67153CD3EF}.Release_SSE2.ActiveCfg = Release|Win32
{C2DBE955-C193-4BEC-A2E8-AB67153CD3EF}.Release_SSE2.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Debug.ActiveCfg = Debug|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Debug.Build.0 = Debug|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Debug Unicode.ActiveCfg = Debug|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Debug Unicode.Build.0 = Debug|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.MakeFile.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.MakeFile.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release Unicode.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release Unicode.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_NoDotNET.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_NoDotNET.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_SSE.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_SSE.Build.0 = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_SSE2.ActiveCfg = Release|Win32
+ {BD43F518-8ACE-4FFD-BF75-35596469A28E}.Release_SSE2.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Debug.ActiveCfg = Debug|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Debug.Build.0 = Debug|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Debug Unicode.ActiveCfg = Debug|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Debug Unicode.Build.0 = Debug|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.MakeFile.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.MakeFile.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release Unicode.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release Unicode.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_NoDotNET.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_NoDotNET.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_SSE.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_SSE.Build.0 = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_SSE2.ActiveCfg = Release|Win32
+ {B6174F02-E9F8-4C7C-97E1-E29782960D0D}.Release_SSE2.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Debug.ActiveCfg = Debug|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Debug.Build.0 = Debug|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Debug Unicode.ActiveCfg = Debug|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Debug Unicode.Build.0 = Debug|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.MakeFile.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.MakeFile.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release Unicode.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release Unicode.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_NoDotNET.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_NoDotNET.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_SSE.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_SSE.Build.0 = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_SSE2.ActiveCfg = Release|Win32
+ {32228390-D24D-40CD-A31E-E4E1CF94C308}.Release_SSE2.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Added: trunk/oggdsf/src/tests/testlibOOOggSpeed1/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/ReadMe.txt 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/ReadMe.txt 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,32 @@
+========================================================================
+ CONSOLE APPLICATION : testlibOOOggSpeed1 Project Overview
+========================================================================
+
+AppWizard has created this testlibOOOggSpeed1 application for you.
+This file contains a summary of what you will find in each of the files that
+make up your testlibOOOggSpeed1 application.
+
+
+testlibOOOggSpeed1.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+testlibOOOggSpeed1.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named testlibOOOggSpeed1.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// testlibOOOggSpeed1.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Added: trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.h
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.h 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/stdafx.h 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,12 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#include <windows.h>
+#include <iostream>
+#include <tchar.h>
+
+// TODO: reference additional headers your program requires here
Added: trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.cpp
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,94 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+// OggDump.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include <libOOOgg.h>
+#include <dllstuff.h>
+
+#include <iostream>
+#include <fstream>
+
+unsigned long bytePos;
+unsigned long sumPageSize;
+unsigned long pageCount;
+unsigned long packetCount;
+//This will be called by the callback
+bool pageCB(OggPage* inOggPage) {
+ pageCount++;
+ packetCount += inOggPage->numPackets();
+ return true;
+}
+
+
+int __cdecl _tmain(int argc, _TCHAR* argv[])
+{
+ //This program just dumps the pages out of a file in ogg format.
+ // Currently does not error checking. Check your command line carefully !
+ // USAGE :: OggDump <OggFile>
+ //
+
+ pageCount = 0;
+ packetCount = 0;
+ LARGE_INTEGER perfStart;
+ LARGE_INTEGER perfEnd;
+ if (argc < 2) {
+ cout<<"Usage : testlibOOOggSpeed1 <filename>"<<endl;
+ } else {
+
+ QueryPerformanceCounter(&perfStart);
+ OggDataBuffer testOggBuff;
+
+ testOggBuff.registerStaticCallback(&pageCB);
+
+ fstream testFile;
+ testFile.open(argv[1], ios_base::in | ios_base::binary);
+
+ const unsigned short BUFF_SIZE = 8092;
+ char* locBuff = new char[BUFF_SIZE];
+ while (!testFile.eof()) {
+ testFile.read(locBuff, BUFF_SIZE);
+ unsigned long locBytesRead = testFile.gcount();
+ testOggBuff.feed((const unsigned char*)locBuff, locBytesRead);
+ }
+
+ delete locBuff;
+ }
+ QueryPerformanceCounter(&perfEnd);
+ cout<<"Packet count = "<<packetCount<<endl;
+ cout<<"Page count = "<<pageCount<<endl;
+ cout<<perfStart.QuadPart<<" - "<<perfEnd.QuadPart<<endl;
+ cout<<"Time = "<<perfEnd.QuadPart - perfStart.QuadPart<<endl;
+
+ return 0;
+}
Added: trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="testlibOOOggSpeed1"
+ ProjectGUID="{BD43F518-8ACE-4FFD-BF75-35596469A28E}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testlibOOOggSpeed1.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/testlibOOOggSpeed1.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"
+ CallingConvention="2"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testlibOOOggSpeed1.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\stdafx.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\testlibOOOggSpeed1.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\stdafx.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/oggdsf/src/tests/testliboggSpeed1/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/ReadMe.txt 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/ReadMe.txt 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,32 @@
+========================================================================
+ CONSOLE APPLICATION : testliboggSpeed1 Project Overview
+========================================================================
+
+AppWizard has created this testliboggSpeed1 application for you.
+This file contains a summary of what you will find in each of the files that
+make up your testliboggSpeed1 application.
+
+
+testliboggSpeed1.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+testliboggSpeed1.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named testliboggSpeed1.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// testliboggSpeed1.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Added: trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.h
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.h 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/stdafx.h 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,12 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#include <windows.h>
+#include <iostream>
+#include <tchar.h>
+
+// TODO: reference additional headers your program requires here
Added: trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,66 @@
+// testliboggSpeed1.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+
+#include "ogg\ogg.h"
+#include <fstream>
+#include <iostream>
+
+using namespace std;
+int __cdecl _tmain(int argc, _TCHAR* argv[])
+{
+ LARGE_INTEGER perfStart;
+ LARGE_INTEGER perfEnd;
+ QueryPerformanceCounter(&perfStart);
+ int pageCount = 0;
+ int packetCount = 0;
+ const unsigned short BUFF_SIZE = 4096;
+ ogg_sync_state syncState; /* sync and verify incoming physical bitstream */
+
+ ogg_page oggPage; /* one Ogg bitstream page. Vorbis packets are inside */
+ ogg_packet oggPacket; /* one raw packet of data for decode */
+ ogg_stream_state streamState;
+ char* buffer;
+ int bytes;
+
+
+
+ ogg_sync_init( &syncState );
+
+
+
+ fstream testFile;
+ testFile.open(argv[1], ios_base::in | ios_base::binary);
+
+ buffer = ogg_sync_buffer(&syncState, BUFF_SIZE);
+ testFile.read(buffer, BUFF_SIZE);
+
+ ogg_sync_wrote(&syncState, testFile.gcount());
+ ogg_sync_pageout(&syncState, &oggPage);
+ ogg_stream_init(&streamState,ogg_page_serialno(&oggPage));
+
+ while (!testFile.eof()) {
+ buffer = ogg_sync_buffer(&syncState, BUFF_SIZE);
+ testFile.read(buffer, BUFF_SIZE);
+
+ ogg_sync_wrote(&syncState, testFile.gcount());
+ while ( ogg_sync_pageout(&syncState, &oggPage) > 0) {
+ ogg_stream_pagein(&streamState, &oggPage);
+ while (ogg_stream_packetout(&streamState, &oggPacket) > 0) {
+ packetCount++;
+ }
+ pageCount++;
+
+ }
+ }
+ QueryPerformanceCounter(&perfEnd);
+ cout<<"Packet Count = "<<packetCount<<endl;
+ cout<<"Page count = "<<pageCount<<endl;
+ cout<<perfStart.QuadPart<<" - "<<perfEnd.QuadPart<<endl;
+ cout<<"Time = "<<perfEnd.QuadPart - perfStart.QuadPart<<endl;
+
+ cout<<"PageCount = "<<pageCount<<endl;
+ return 0;
+}
+
Added: trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.vcproj 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.vcproj 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="testliboggSpeed1"
+ ProjectGUID="{B6174F02-E9F8-4C7C-97E1-E29782960D0D}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg\libogg\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"
+ CallingConvention="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testliboggSpeed1.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/testliboggSpeed1.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg\libogg\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"
+ CallingConvention="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testliboggSpeed1.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\stdafx.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\testliboggSpeed1.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\stdafx.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/oggdsf/src/tests/testliboggzSpeed1/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/tests/testliboggzSpeed1/ReadMe.txt 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggzSpeed1/ReadMe.txt 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,32 @@
+========================================================================
+ CONSOLE APPLICATION : testliboggzSpeed1 Project Overview
+========================================================================
+
+AppWizard has created this testliboggzSpeed1 application for you.
+This file contains a summary of what you will find in each of the files that
+make up your testliboggzSpeed1 application.
+
+
+testliboggzSpeed1.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+testliboggzSpeed1.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named testliboggzSpeed1.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// testliboggzSpeed1.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Added: trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.h
===================================================================
--- trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.h 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggzSpeed1/stdafx.h 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,12 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+
+#include <iostream>
+#include <tchar.h>
+
+// TODO: reference additional headers your program requires here
Added: trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.cpp
===================================================================
--- trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.cpp 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.cpp 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,10 @@
+// testliboggzSpeed1.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+ return 0;
+}
+
Added: trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.vcproj 2004-10-06 21:42:03 UTC (rev 7918)
+++ trunk/oggdsf/src/tests/testliboggzSpeed1/testliboggzSpeed1.vcproj 2004-10-07 06:18:43 UTC (rev 7919)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="testliboggzSpeed1"
+ ProjectGUID="{32228390-D24D-40CD-A31E-E4E1CF94C308}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testliboggzSpeed1.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/testliboggzSpeed1.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/testliboggzSpeed1.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\stdafx.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\testliboggzSpeed1.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\stdafx.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
More information about the commits
mailing list