[xiph-commits] r8569 - in trunk/oggdsf: build/DotNETOggTools
sln/oggdsf_all src/lib/player/libDSPlayDotNET src/tests
src/tests/testVideoImageGrab
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sat Jan 1 00:00:00 PST 2005
Author: illiminable
Date: 2005-01-01 00:00:00 -0800 (Sat, 01 Jan 2005)
New Revision: 8569
Added:
trunk/oggdsf/src/tests/testVideoImageGrab/
trunk/oggdsf/src/tests/testVideoImageGrab/App.ico
trunk/oggdsf/src/tests/testVideoImageGrab/AssemblyInfo.cs
trunk/oggdsf/src/tests/testVideoImageGrab/Form1.cs
trunk/oggdsf/src/tests/testVideoImageGrab/Form1.resx
trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj
trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user
Modified:
trunk/oggdsf/build/DotNETOggTools/DotNETOggTools.vdproj
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
Log:
* Add video frame capture functionality to libDSPlayDotNEt
* Test .NET app for image capture (hardcoded video)
Modified: trunk/oggdsf/build/DotNETOggTools/DotNETOggTools.vdproj
===================================================================
--- trunk/oggdsf/build/DotNETOggTools/DotNETOggTools.vdproj 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/build/DotNETOggTools/DotNETOggTools.vdproj 2005-01-01 08:00:00 UTC (rev 8569)
@@ -15,80 +15,104 @@
{
"Entry"
{
- "MsmKey" = "8:_1046E26D969343E9B463BBE038AD6115"
+ "MsmKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
+ "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
+ "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
+ "OwnerKey" = "8:_577DBB291F8FCFDCC98327EDD79060E8"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2F42AF3DAF7913CCEA253ECE25E66DD4"
"OwnerKey" = "8:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1046E26D969343E9B463BBE038AD6115"
- "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
+ "MsmKey" = "8:_2F42AF3DAF7913CCEA253ECE25E66DD4"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1046E26D969343E9B463BBE038AD6115"
+ "MsmKey" = "8:_2F42AF3DAF7913CCEA253ECE25E66DD4"
"OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1046E26D969343E9B463BBE038AD6115"
- "OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
+ "MsmKey" = "8:_2F42AF3DAF7913CCEA253ECE25E66DD4"
+ "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
+ "MsmKey" = "8:_2F42AF3DAF7913CCEA253ECE25E66DD4"
"OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
- "OwnerKey" = "8:_81982D85841DAC6427A73B1173B6BE43"
+ "MsmKey" = "8:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
+ "MsmKey" = "8:_577DBB291F8FCFDCC98327EDD79060E8"
"OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
- "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
+ "MsmKey" = "8:_577DBB291F8FCFDCC98327EDD79060E8"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
- "OwnerKey" = "8:_5B9789E0858E113CD7C8015405E55B7F"
+ "MsmKey" = "8:_5986E0074E8F82A04F44677CA51F5AFE"
+ "OwnerKey" = "8:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_5986E0074E8F82A04F44677CA51F5AFE"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5B9789E0858E113CD7C8015405E55B7F"
+ "MsmKey" = "8:_5986E0074E8F82A04F44677CA51F5AFE"
"OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5B9789E0858E113CD7C8015405E55B7F"
- "OwnerKey" = "8:_81982D85841DAC6427A73B1173B6BE43"
+ "MsmKey" = "8:_5986E0074E8F82A04F44677CA51F5AFE"
+ "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5B9789E0858E113CD7C8015405E55B7F"
- "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
+ "MsmKey" = "8:_5986E0074E8F82A04F44677CA51F5AFE"
+ "OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -105,76 +129,94 @@
}
"Entry"
{
- "MsmKey" = "8:_81982D85841DAC6427A73B1173B6BE43"
- "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D520B6EBCFB74EAFB7565009BE55FAB6"
- "OwnerKey" = "8:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D520B6EBCFB74EAFB7565009BE55FAB6"
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_577DBB291F8FCFDCC98327EDD79060E8"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
"OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D520B6EBCFB74EAFB7565009BE55FAB6"
- "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
+ "MsmKey" = "8:_A32E9DF3AFC840CD8DDB98829C8067AB"
+ "OwnerKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D520B6EBCFB74EAFB7565009BE55FAB6"
- "OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
+ "MsmKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
"OwnerKey" = "8:_7D2E9EEB21B7428FB75771288064C10B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
- "OwnerKey" = "8:_81982D85841DAC6427A73B1173B6BE43"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
+ "OwnerKey" = "8:_B592DC6B9EAB4AA287DBA62B1EA8A758"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
- "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
+ "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
- "OwnerKey" = "8:_5B9789E0858E113CD7C8015405E55B7F"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
+ "OwnerKey" = "8:_577DBB291F8FCFDCC98327EDD79060E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
- "OwnerKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
+ "OwnerKey" = "8:_7D5C9B365F304AB0A7D754E7EB741122"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F164E497EE524594909C98D887AABAE4"
- "OwnerKey" = "8:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
+ "MsmKey" = "8:_BAA5898CABF146974F8D877DC1526F53"
+ "OwnerKey" = "8:_2200777AD21D16EDC23BB455DAABBD0D"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_BBDF372A1BE44FF8AA407085BEDCC524"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -240,20 +282,20 @@
}
"File"
{
- "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_1F38EE296D1DD02D3AFBD82E2EB01CB7"
+ "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_2200777AD21D16EDC23BB455DAABBD0D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1745.28577, Culture=neutral"
+ "AssemblyAsmDisplayName" = "8:libCMMLTagsDotNET, Version=1.0.1826.29794, Culture=neutral"
"ScatterAssemblies"
{
- "_1F38EE296D1DD02D3AFBD82E2EB01CB7"
+ "_2200777AD21D16EDC23BB455DAABBD0D"
{
- "Name" = "8:libiwrapper.dll"
+ "Name" = "8:libCMMLTagsDotNET.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:libiwrapper.dll"
+ "SourcePath" = "8:libCMMLTagsDotNET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -267,24 +309,44 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_2F42AF3DAF7913CCEA253ECE25E66DD4"
+ {
+ "SourcePath" = "8:MSVCP71D.dll"
+ "TargetName" = "8:MSVCP71D.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_5B9789E0858E113CD7C8015405E55B7F"
+ "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_577DBB291F8FCFDCC98327EDD79060E8"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:libCMMLTagsDotNET, Version=1.0.1745.28607, Culture=neutral"
+ "AssemblyAsmDisplayName" = "8:libDSPlayDotNET, Version=1.0.1827.25870, Culture=neutral"
"ScatterAssemblies"
{
- "_5B9789E0858E113CD7C8015405E55B7F"
+ "_577DBB291F8FCFDCC98327EDD79060E8"
{
- "Name" = "8:libcmmltagsdotnet.dll"
+ "Name" = "8:libDSPlayDotNET.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:libcmmltagsdotnet.dll"
+ "SourcePath" = "8:libDSPlayDotNET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -302,20 +364,40 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_81982D85841DAC6427A73B1173B6BE43"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_5986E0074E8F82A04F44677CA51F5AFE"
{
+ "SourcePath" = "8:MSVCR71D.dll"
+ "TargetName" = "8:MSVCR71D.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_BAA5898CABF146974F8D877DC1526F53"
+ {
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:libDSPlayDotNET, Version=1.0.1745.28610, Culture=neutral"
+ "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1826.29782, Culture=neutral"
"ScatterAssemblies"
{
- "_81982D85841DAC6427A73B1173B6BE43"
+ "_BAA5898CABF146974F8D877DC1526F53"
{
- "Name" = "8:libDSPlayDotNET.dll"
+ "Name" = "8:libiwrapper.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:libDSPlayDotNET.dll"
+ "SourcePath" = "8:libiwrapper.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -329,7 +411,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:TRUE"
+ "Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -886,38 +968,10 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_1046E26D969343E9B463BBE038AD6115"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_A32E9DF3AFC840CD8DDB98829C8067AB"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D520B6EBCFB74EAFB7565009BE55FAB6"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_F164E497EE524594909C98D887AABAE4"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
"SourcePath" = "8:dotnetfxredist_x86.msm"
"Properties"
{
@@ -933,7 +987,7 @@
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4B3860CBBAAE41CE952C9DB17B1BDFF5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -961,7 +1015,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_7D2E9EEB21B7428FB75771288064C10B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTagsDotNET\\Release\\libCMMLTagsDotNET.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTagsDotNET\\Debug\\libCMMLTagsDotNET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -989,7 +1043,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_7D5C9B365F304AB0A7D754E7EB741122"
{
- "SourcePath" = "8:..\\..\\src\\tools\\DNPlay\\obj\\Release\\DNPlay.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\DNPlay\\obj\\Debug\\DNPlay.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
@@ -1015,9 +1069,37 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B592DC6B9EAB4AA287DBA62B1EA8A758"
+ {
+ "SourcePath" = "8:..\\..\\src\\tests\\testVideoImageGrab\\obj\\Debug\\testVideoImageGrab.exe"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_BBDF372A1BE44FF8AA407085BEDCC524"
{
- "SourcePath" = "8:..\\..\\src\\lib\\player\\libDSPlayDotNET\\Release\\libDSPlayDotNET.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\player\\libDSPlayDotNET\\Debug\\libDSPlayDotNET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5C993B2E70A34EF8995AE3282D9A7CAA"
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-01 08:00:00 UTC (rev 8569)
@@ -1117,6 +1117,10 @@
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testVideoImageGrab", "..\..\src\tests\testVideoImageGrab\testVideoImageGrab.csproj", "{A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -2426,6 +2430,26 @@
{F8FDD992-E21A-483F-BBE7-305D10163DE4}.Release_SSE.Build.0 = Release|Win32
{F8FDD992-E21A-483F-BBE7-305D10163DE4}.Release_SSE2.ActiveCfg = Release|Win32
{F8FDD992-E21A-483F-BBE7-305D10163DE4}.Release_SSE2.Build.0 = Release|Win32
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug.ActiveCfg = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug.Build.0 = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug Unicode.ActiveCfg = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug Unicode.Build.0 = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug__cdecl.ActiveCfg = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Debug__cdecl.Build.0 = Debug|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.MakeFile.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.MakeFile.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release Unicode.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release Unicode.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release__cdecl.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release__cdecl.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_NoDotNET.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_NoDotNET.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_SSE.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_SSE.Build.0 = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_SSE2.ActiveCfg = Release|.NET
+ {A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}.Release_SSE2.Build.0 = Release|.NET
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp 2005-01-01 08:00:00 UTC (rev 8569)
@@ -60,12 +60,16 @@
, mCMMLAppControl(NULL)
, mWindowHandle(NULL)
, mVideoWindow(NULL)
+ , mVMR7Window(NULL)
+ , mVMR9Window(NULL)
, mLeft(0)
, mTop(0)
, mWidth(0)
, mHeight(0)
, mFileSize(0)
+ , mVideoRenderType(VR_NONE)
+
{
CoInitialize(NULL);
mCMMLProxy = new CMMLCallbackProxy; //Need to delete this !
@@ -84,11 +88,14 @@
, mCMMLAppControl(NULL)
, mWindowHandle(inWindowHandle)
, mVideoWindow(NULL)
+ , mVMR7Window(NULL)
+ , mVMR9Window(NULL)
, mLeft(inLeft)
, mTop(inTop)
, mWidth(inWidth)
, mHeight(inHeight)
, mFileSize(0)
+ , mVideoRenderType(VR_NONE)
{
CoInitialize(NULL);
mCMMLProxy = new CMMLCallbackProxy; //Need to delete this !
@@ -180,7 +187,23 @@
mVideoWindow = NULL;
}
+ if (mVMR9Window != NULL) {
+ numRef =
+ mVMR9Window->Release();
+ *debugLog<<"Video Window VMR9 count = "<<numRef<<endl;
+ mVMR9Window = NULL;
+ }
+
+ if (mVMR7Window != NULL) {
+ numRef =
+ mVMR7Window->Release();
+
+ *debugLog<<"Video Window VMR7 count = "<<numRef<<endl;
+ mVMR7Window = NULL;
+ }
+
+
*debugLog<<"After graph release>.."<<endl;
//TODO::: Release everything !
}
@@ -218,35 +241,165 @@
}
- //If it's an annodex file, then put the VMR 9 in the graph.
- if (isFileAnnodex(inFileName)) {
- *debugLog<<"Is annodex"<<endl;
- IBaseFilter* locVMR9 = NULL;
+ ////If it's an annodex file, then put the VMR 9 in the graph.
+ //if (isFileAnnodex(inFileName)) {
+ // *debugLog<<"Is annodex"<<endl;
+ // IBaseFilter* locVMR9 = NULL;
- HRESULT locHR2 = S_OK;
- locHR2 = mGraphBuilder->FindFilterByName(L"Video Mixing Renderer 9", &locVMR9);
- if (locVMR9 == NULL) {
- *debugLog<<"Not in graph... making it !"<<endl;
- locHR2= CoCreateInstance(CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC, IID_IBaseFilter, (void **)&locVMR9);
- if (locHR2 == S_OK) {
- locHR2 = mGraphBuilder->AddFilter(locVMR9, L"Video Mixing Renderer 9");
- numRef =
- locVMR9->Release();
- *debugLog<<"VMR9 ref count = "<<numRef<<endl;
-
+ // HRESULT locHR2 = S_OK;
+ // locHR2 = mGraphBuilder->FindFilterByName(L"Video Mixing Renderer 9", &locVMR9);
+ // if (locVMR9 == NULL) {
+ // *debugLog<<"Not in graph... making it !"<<endl;
+ // locHR2= CoCreateInstance(CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC, IID_IBaseFilter, (void **)&locVMR9);
+ // if (locHR2 == S_OK) {
+ // locHR2 = mGraphBuilder->AddFilter(locVMR9, L"Video Mixing Renderer 9");
+ // numRef =
+ // locVMR9->Release();
+ // *debugLog<<"VMR9 ref count = "<<numRef<<endl;
+ //
+ // }
+ // } else {
+ // numRef =
+ // locVMR9->Release();
+
+ // *debugLog<<"VMR9 ref count = "<<numRef<<endl;
+ // }
+
+
+ //
+
+ //}
+
+ mVideoRenderType = VR_NONE;
+ //Attempt to use VMR9
+ IBaseFilter* locVMR9 = NULL;
+
+ *debugLog<<"Attempting VMR9 creation... making it !"<<endl;
+ locHR= CoCreateInstance(CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC, IID_IBaseFilter, (void **)&locVMR9);
+ if (locHR == S_OK) {
+ locHR = mGraphBuilder->AddFilter(locVMR9, L"Video Mixing Renderer 9");
+
+ //TODO::: Need an error check ?
+
+ IVMRFilterConfig9* locVMR9Config = NULL;
+ locHR = locVMR9->QueryInterface(IID_IVMRFilterConfig9, (void**)&locVMR9Config);
+
+ if (locHR == S_OK) {
+ locVMR9Config->SetRenderingMode(VMRMode_Windowless);
+ locVMR9Config->Release();
+
+ //Get the windowless control
+ IVMRWindowlessControl9* locVMR9Windowless = NULL;
+ locHR = locVMR9->QueryInterface(IID_IVMRWindowlessControl9, (void**)&locVMR9Windowless);
+
+ if (locHR == S_OK) {
+ mVMR9Window = locVMR9Windowless;
+ mVideoRenderType = VR_VMR9;
+ *debugLog<<"We got our VMR9 window"<<endl;
}
- } else {
- numRef =
- locVMR9->Release();
- *debugLog<<"VMR9 ref count = "<<numRef<<endl;
}
+
+ numRef =
+ locVMR9->Release();
+ *debugLog<<"VMR9 ref count = "<<numRef<<endl;
+ }
+ if (mVideoRenderType == VR_NONE) {
+ //Attempt to use VMR7
+ IBaseFilter* locVMR7 = NULL;
-
+ *debugLog<<"Attempting VMR7 creation... making it !"<<endl;
+ locHR= CoCreateInstance(CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC, IID_IBaseFilter, (void **)&locVMR7);
+ if (locHR == S_OK) {
+ locHR = mGraphBuilder->AddFilter(locVMR7, L"Video Mixing Renderer 7");
+
+ //TODO::: Need an error check ?
+ IVMRFilterConfig* locVMR7Config = NULL;
+ locHR = locVMR7->QueryInterface(IID_IVMRFilterConfig, (void**)&locVMR7Config);
+
+ if (locHR == S_OK) {
+ locVMR7Config->SetRenderingMode(VMRMode_Windowless);
+ locVMR7Config->Release();
+
+ //Get the windowless control
+ IVMRWindowlessControl* locVMR7Windowless = NULL;
+ locHR = locVMR7->QueryInterface(IID_IVMRWindowlessControl, (void**)&locVMR7Windowless);
+
+ if (locHR == S_OK) {
+ mVMR7Window = locVMR7Windowless;
+ mVideoRenderType = VR_VMR7;
+ }
+
+ }
+
+ numRef =
+ locVMR7->Release();
+ *debugLog<<"VMR7 ref count = "<<numRef<<endl;
+ }
}
+ if (mWindowHandle != NULL) {
+ *debugLog<<"Setting up video window pointer..."<<endl;
+
+ IVMRWindowlessControl9* locVMR9Window = NULL;
+ IVMRWindowlessControl* locVMR7Window = NULL;
+ IVideoWindow* locVideoWindow = NULL;
+
+ switch ((int)mVideoRenderType) {
+ case VR_VMR9:
+ *debugLog<<"Attemping to use VMR9 windowless"<<endl;
+ //Get the IVMRWindowlessControl9 interface.
+
+ locHR = locVMR9->QueryInterface(IID_IVMRWindowlessControl9, (void**)&locVMR9Window);
+
+ if (locHR == S_OK) {
+ *debugLog<<"Got VMR9 windowless interface"<<endl;
+ mVMR9Window = locVMR9Window;
+
+ locHR = mVMR9Window->SetVideoClippingWindow( ((HWND)((int)mWindowHandle)));
+ if (locHR == S_OK) {
+ *debugLog<<"Clipping window set"<<endl;
+ RECT locRect;
+ locRect.left = mLeft;
+ locRect.top = mTop;
+ locRect.right = mLeft + mWidth;
+ locRect.bottom = mTop + mHeight;
+
+ locHR = mVMR9Window->SetVideoPosition(NULL, &locRect);
+ if (locHR == S_OK) {
+ *debugLog<<"video pos set"<<endl;
+ } else {
+ *debugLog<<"video pos set FAILED"<<endl;
+ }
+ } else {
+ *debugLog<<"Clipping window set FAILED"<<endl;
+ }
+ }
+
+
+ break;
+ case VR_VMR7:
+ break;
+ default:
+ //Get the IVideoWindow interface.
+
+ locHR = mGraphBuilder->QueryInterface(IID_IVideoWindow, (void**)&locVideoWindow);
+
+ if (locHR == S_OK) {
+ mVideoWindow = locVideoWindow;
+ mVideoWindow->put_Owner((int)mWindowHandle);
+ mVideoWindow->SetWindowPosition(mLeft, mTop, mWidth, mHeight);
+ mVideoWindow->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN);
+ }
+ break;
+ }
+ }
+
+
+
+
*debugLog<<"About to call render on "<<endl;
//Build the graph
locHR = mGraphBuilder->RenderFile(locWFileName.c_str(), NULL);
@@ -310,20 +463,8 @@
mEventHandle = locEventHandle;
}
- if (mWindowHandle != NULL) {
- //Get the IVideoWindow interface.
- IVideoWindow* locVideoWindow = NULL;
- locHR = mGraphBuilder->QueryInterface(IID_IVideoWindow, (void**)&locVideoWindow);
- if (locHR == S_OK) {
- mVideoWindow = locVideoWindow;
- mVideoWindow->put_Owner((int)mWindowHandle);
- mVideoWindow->SetWindowPosition(mLeft, mTop, mWidth, mHeight);
- mVideoWindow->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN);
- }
- }
-
// if (FAILED(hr))
return true;
@@ -331,6 +472,56 @@
}
+System::Drawing::Bitmap* DSPlay::GetImage() {
+ HRESULT locHR = S_OK;
+ System::Drawing::Bitmap* locBitmap = NULL;
+ BYTE* locBytes = NULL;
+
+ switch (mVideoRenderType) {
+ case VR_VMR9:
+ if (mVMR9Window != NULL) {
+ locHR = mVMR9Window->GetCurrentImage(&locBytes);
+ if (locHR == S_OK) {
+ BITMAPINFOHEADER* locBMIH = (BITMAPINFOHEADER*) locBytes;
+ *debugLog<<"BHIM : Bit count = "<<locBMIH->biBitCount<<endl;
+ *debugLog<<"BHIM : Compresio = "<<locBMIH->biCompression<<endl;
+ *debugLog<<"BHIM : Colours = "<<locBMIH->biClrUsed<<endl;
+ *debugLog<<"BHIM : Width = "<<locBMIH->biWidth<<endl;
+ *debugLog<<"BHIM : Height = "<<locBMIH->biHeight<<endl;
+ *debugLog<<"BHIM : Size Img = "<<locBMIH->biSizeImage<<endl;
+ *debugLog<<"BHIM : Size = "<<locBMIH->biSize<<endl;
+ *debugLog<<"BHIM : Size BMIH = "<<sizeof(BITMAPINFOHEADER)<<endl;
+ *debugLog<<"BHIM : Size BMI = "<<sizeof(BITMAPINFO)<<endl;
+
+
+
+
+
+
+ if (locBMIH->biBitCount == 32) {
+ unsigned char* locBuffer = new unsigned char[locBMIH->biSizeImage];
+ memcpy((void*)locBuffer, (const void*)(locBytes + 44), locBMIH->biSizeImage);
+ locBitmap = new System::Drawing::Bitmap(locBMIH->biWidth, locBMIH->biHeight, locBMIH->biWidth * 4, System::Drawing::Imaging::PixelFormat::Format32bppRgb, (System::IntPtr)(locBuffer));
+ locBitmap->RotateFlip(System::Drawing::RotateFlipType::RotateNoneFlipY);
+ }
+
+ /* .... */
+
+
+ CoTaskMemFree(locBytes);
+
+
+ }
+
+ }
+
+ default:
+ break;
+ };
+
+ return locBitmap;;
+}
+
bool DSPlay::setCMMLCallbacks(IDNCMMLCallbacks* inCMMLCallbacks) {
return mCMMLProxy->setManagedDelegate(inCMMLCallbacks);
}
Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.h 2005-01-01 08:00:00 UTC (rev 8569)
@@ -52,6 +52,8 @@
#pragma managed
using namespace System::IO;
+#using "System.Drawing.dll"
+
#using "libCMMLTagsDotNET.dll"
using namespace illiminable::libCMMLTagsDotNET;
#include "libDSPlayDotNet.h"
@@ -83,6 +85,8 @@
bool isLoaded();
Int64 fileSize();
Int64 fileDuration();
+
+ System::Drawing::Bitmap* GetImage();
bool setMediaEventCallback(IDNMediaEvent* inMediaEventCallback);
@@ -101,6 +105,9 @@
ICMMLAppControl* mCMMLAppControl;
IVideoWindow* mVideoWindow;
+ IVMRWindowlessControl* mVMR7Window;
+ IVMRWindowlessControl9* mVMR9Window;
+
Int32 mLeft;
Int32 mTop;
Int32 mWidth;
@@ -117,7 +124,17 @@
__int64 mFileSize;
bool isFileAnnodex(String* inFilename);
+
+ __value enum eVideoRenderer {
+ VR_VIDEO_WINDOW,
+ VR_VMR7,
+ VR_VMR9,
+ VR_NONE = 100
+
+ };
+ eVideoRenderer mVideoRenderType;
+
fstream* debugLog;
Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj 2005-01-01 08:00:00 UTC (rev 8569)
@@ -241,6 +241,8 @@
Name="libCMMLTagsDotNET"/>
<AssemblyReference
RelativePath="{ReferencesPath}\System.dll"/>
+ <AssemblyReference
+ RelativePath="{ReferencesPath}\System.Drawing.dll"/>
</References>
<Files>
<Filter
Added: trunk/oggdsf/src/tests/testVideoImageGrab/App.ico
===================================================================
(Binary files differ)
Property changes on: trunk/oggdsf/src/tests/testVideoImageGrab/App.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/oggdsf/src/tests/testVideoImageGrab/AssemblyInfo.cs
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/AssemblyInfo.cs 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/AssemblyInfo.cs 2005-01-01 08:00:00 UTC (rev 8569)
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+// (*) If no key is specified, the assembly is not signed.
+// (*) KeyName refers to a key that has been installed in the Crypto Service
+// Provider (CSP) on your machine. KeyFile refers to a file which contains
+// a key.
+// (*) If the KeyFile and the KeyName values are both specified, the
+// following processing occurs:
+// (1) If the KeyName can be found in the CSP, that key is used.
+// (2) If the KeyName does not exist and the KeyFile does exist, the key
+// in the KeyFile is installed into the CSP and used.
+// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+// When specifying the KeyFile, the location of the KeyFile should be
+// relative to the project output directory which is
+// %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+// located in the project directory, you would specify the AssemblyKeyFile
+// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+// documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
Added: trunk/oggdsf/src/tests/testVideoImageGrab/Form1.cs
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/Form1.cs 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/Form1.cs 2005-01-01 08:00:00 UTC (rev 8569)
@@ -0,0 +1,147 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+using illiminable.libDSPlayDotNET;
+namespace testVideoImageGrab
+{
+ /// <summary>
+ /// Summary description for Form1.
+ /// </summary>
+ public class frmTestGrab : System.Windows.Forms.Form
+ {
+ private System.Windows.Forms.Button cmdPlay;
+ private System.Windows.Forms.PictureBox picGrabbed;
+ private System.Windows.Forms.Button cmdGrabImage;
+
+
+ private DSPlay mPlayer;
+ private System.Windows.Forms.Panel pnlVideoWindow;
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.Container components = null;
+
+ public frmTestGrab()
+ {
+ //
+ // Required for Windows Form Designer support
+ //
+ InitializeComponent();
+
+ //
+ // TODO: Add any constructor code after InitializeComponent call
+ //
+ }
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ protected override void Dispose( bool disposing )
+ {
+ if( disposing )
+ {
+ if (components != null)
+ {
+ components.Dispose();
+ }
+ }
+ base.Dispose( disposing );
+ }
+
+ #region Windows Form Designer generated code
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.pnlVideoWindow = new System.Windows.Forms.Panel();
+ this.cmdPlay = new System.Windows.Forms.Button();
+ this.picGrabbed = new System.Windows.Forms.PictureBox();
+ this.cmdGrabImage = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // pnlVideoWindow
+ //
+ this.pnlVideoWindow.Location = new System.Drawing.Point(32, 48);
+ this.pnlVideoWindow.Name = "pnlVideoWindow";
+ this.pnlVideoWindow.Size = new System.Drawing.Size(312, 280);
+ this.pnlVideoWindow.TabIndex = 0;
+ //
+ // cmdPlay
+ //
+ this.cmdPlay.Location = new System.Drawing.Point(216, 344);
+ this.cmdPlay.Name = "cmdPlay";
+ this.cmdPlay.Size = new System.Drawing.Size(112, 32);
+ this.cmdPlay.TabIndex = 1;
+ this.cmdPlay.Text = "Play";
+ this.cmdPlay.Click += new System.EventHandler(this.cmdPlay_Click);
+ //
+ // picGrabbed
+ //
+ this.picGrabbed.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.picGrabbed.Location = new System.Drawing.Point(504, 48);
+ this.picGrabbed.Name = "picGrabbed";
+ this.picGrabbed.Size = new System.Drawing.Size(328, 288);
+ this.picGrabbed.TabIndex = 2;
+ this.picGrabbed.TabStop = false;
+ //
+ // cmdGrabImage
+ //
+ this.cmdGrabImage.Location = new System.Drawing.Point(624, 360);
+ this.cmdGrabImage.Name = "cmdGrabImage";
+ this.cmdGrabImage.Size = new System.Drawing.Size(136, 32);
+ this.cmdGrabImage.TabIndex = 3;
+ this.cmdGrabImage.Text = "Grab Image";
+ this.cmdGrabImage.Click += new System.EventHandler(this.cmdGrabImage_Click);
+ //
+ // frmTestGrab
+ //
+ this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+ this.ClientSize = new System.Drawing.Size(872, 422);
+ this.Controls.Add(this.cmdGrabImage);
+ this.Controls.Add(this.picGrabbed);
+ this.Controls.Add(this.cmdPlay);
+ this.Controls.Add(this.pnlVideoWindow);
+ this.Name = "frmTestGrab";
+ this.Text = "Test Grabber";
+ this.Load += new System.EventHandler(this.frmTestGrab_Load);
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ Application.Run(new frmTestGrab());
+ }
+
+ private void frmTestGrab_Load(object sender, System.EventArgs e)
+ {
+ mPlayer = new DSPlay(pnlVideoWindow.Handle, pnlVideoWindow.ClientRectangle.Left, pnlVideoWindow.ClientRectangle.Top, pnlVideoWindow.ClientRectangle.Width, pnlVideoWindow.ClientRectangle.Height);
+ mPlayer.loadFile("G:\\320x240.ogg");
+ }
+
+ private void cmdPlay_Click(object sender, System.EventArgs e)
+ {
+ mPlayer.play();
+ }
+
+ private void cmdGrabImage_Click(object sender, System.EventArgs e)
+ {
+ System.Drawing.Bitmap locBM = mPlayer.GetImage();
+ picGrabbed.Image = locBM;
+
+ }
+
+
+
+ }
+}
Added: trunk/oggdsf/src/tests/testVideoImageGrab/Form1.resx
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/Form1.resx 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/Form1.resx 2005-01-01 08:00:00 UTC (rev 8569)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 1.3
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">1.3</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1">this is my long string</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ [base64 mime encoded serialized .NET Framework object]
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ [base64 mime encoded string representing a byte array form of the .NET Framework object]
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used forserialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>1.3</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="pnlVideoWindow.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="pnlVideoWindow.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="pnlVideoWindow.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="pnlVideoWindow.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>8, 8</value>
+ </data>
+ <data name="pnlVideoWindow.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="pnlVideoWindow.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="cmdPlay.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="cmdPlay.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="cmdPlay.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="picGrabbed.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="picGrabbed.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="picGrabbed.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="cmdGrabImage.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="cmdGrabImage.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="cmdGrabImage.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>(Default)</value>
+ </data>
+ <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>8, 8</value>
+ </data>
+ <data name="$this.Name">
+ <value>frmTestGrab</value>
+ </data>
+ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>80</value>
+ </data>
+ <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+</root>
\ No newline at end of file
Added: trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj 2005-01-01 08:00:00 UTC (rev 8569)
@@ -0,0 +1,123 @@
+<VisualStudioProject>
+ <CSHARP
+ ProjectType = "Local"
+ ProductVersion = "7.10.3077"
+ SchemaVersion = "2.0"
+ ProjectGuid = "{A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}"
+ >
+ <Build>
+ <Settings
+ ApplicationIcon = "App.ico"
+ AssemblyKeyContainerName = ""
+ AssemblyName = "testVideoImageGrab"
+ AssemblyOriginatorKeyFile = ""
+ DefaultClientScript = "JScript"
+ DefaultHTMLPageLayout = "Grid"
+ DefaultTargetSchema = "IE50"
+ DelaySign = "false"
+ OutputType = "WinExe"
+ PreBuildEvent = ""
+ PostBuildEvent = ""
+ RootNamespace = "testVideoImageGrab"
+ RunPostBuildEvent = "OnBuildSuccess"
+ StartupObject = ""
+ >
+ <Config
+ Name = "Debug"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "DEBUG;TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "true"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "false"
+ OutputPath = "bin\Debug\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ <Config
+ Name = "Release"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "false"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "true"
+ OutputPath = "bin\Release\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ </Settings>
+ <References>
+ <Reference
+ Name = "System"
+ AssemblyName = "System"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ />
+ <Reference
+ Name = "System.Data"
+ AssemblyName = "System.Data"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+ />
+ <Reference
+ Name = "System.Drawing"
+ AssemblyName = "System.Drawing"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+ />
+ <Reference
+ Name = "System.Windows.Forms"
+ AssemblyName = "System.Windows.Forms"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+ />
+ <Reference
+ Name = "System.XML"
+ AssemblyName = "System.XML"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+ />
+ <Reference
+ Name = "libDSPlayDotNET"
+ Project = "{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
+ Package = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+ />
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File
+ RelPath = "App.ico"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "AssemblyInfo.cs"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Form1.cs"
+ SubType = "Form"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Form1.resx"
+ DependentUpon = "Form1.cs"
+ BuildAction = "EmbeddedResource"
+ />
+ </Include>
+ </Files>
+ </CSHARP>
+</VisualStudioProject>
+
Added: trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user 2005-01-01 06:51:00 UTC (rev 8568)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user 2005-01-01 08:00:00 UTC (rev 8569)
@@ -0,0 +1,48 @@
+<VisualStudioProject>
+ <CSHARP LastOpenVersion = "7.10.3077" >
+ <Build>
+ <Settings ReferencePath = "" >
+ <Config
+ Name = "Debug"
+ EnableASPDebugging = "false"
+ EnableASPXDebugging = "false"
+ EnableUnmanagedDebugging = "false"
+ EnableSQLServerDebugging = "false"
+ RemoteDebugEnabled = "false"
+ RemoteDebugMachine = ""
+ StartAction = "Project"
+ StartArguments = ""
+ StartPage = ""
+ StartProgram = ""
+ StartURL = ""
+ StartWorkingDirectory = ""
+ StartWithIE = "true"
+ />
+ <Config
+ Name = "Release"
+ EnableASPDebugging = "false"
+ EnableASPXDebugging = "false"
+ EnableUnmanagedDebugging = "false"
+ EnableSQLServerDebugging = "false"
+ RemoteDebugEnabled = "false"
+ RemoteDebugMachine = ""
+ StartAction = "Project"
+ StartArguments = ""
+ StartPage = ""
+ StartProgram = ""
+ StartURL = ""
+ StartWorkingDirectory = ""
+ StartWithIE = "true"
+ />
+ </Settings>
+ </Build>
+ <OtherProjectSettings
+ CopyProjectDestinationFolder = ""
+ CopyProjectUncPath = ""
+ CopyProjectOption = "0"
+ ProjectView = "ProjectFiles"
+ ProjectTrust = "0"
+ />
+ </CSHARP>
+</VisualStudioProject>
+
More information about the commits
mailing list