[xiph-commits] r6922 - in trunk/oggdsf: build/oggcodecs
illiminable at dactyl.lonelymoon.com
illiminable
Tue Jun 29 10:57:02 PDT 2004
src/lib/codecs/theora/filters/dsfTheoraEncoder
Message-ID: <20040629175702.3C0079AAAD at dactyl.lonelymoon.com>
Author: illiminable
Date: Tue Jun 29 10:57:02 2004
New Revision: 6922
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
Log:
* Fixed a few bugs putting the yuv into the buffer... still doesn't work !
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-06-29 16:36:50 UTC (rev 6921)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-06-29 17:56:59 UTC (rev 6922)
@@ -27,6 +27,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CORE\\DIRECTSHOW\\DSFABSTRACTVIDEOENCODER\\DEBUG\\DSFABSTRACTVIDEOENCODER.DLL"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\CMML\\LIBWINCMMLPARSE\\DEBUG\\LIBWINCMMLPARSE.DLL"
@@ -88,31 +94,31 @@
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
@@ -262,13 +268,13 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
@@ -310,6 +316,12 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
@@ -334,6 +346,12 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
@@ -441,6 +459,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\THEORA\\FILTERS\\DSFTHEORAENCODER\\DEBUG\\DSFTHEORAENCODER.DLL"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_AFF84F5FBA224F8A8D4BB3ACA539DC8B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\LIBVORBIS\\WIN32\\VORBIS_DYNAMIC_DEBUG\\VORBIS_D.DLL"
@@ -605,7 +629,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
- "Signature" = "8:2000000000207c22cb2bc101ead961c11e5cc40100207c22cb2bc10100000000005400000000000000000000770073006f0063006b00330032002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:2000000000207c22cb2bc1010ee9fdbbf85dc40100207c22cb2bc10100000000005400000000000000000000770073006f0063006b00330032002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:WSOCK32.dll"
"TargetName" = "8:WSOCK32.dll"
"Tag" = "8:"
@@ -626,7 +650,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_57E27F72FF7790C3FF18D6AB1F49D444"
{
- "Signature" = "8:2000000080dd2a10d295c10110a1b6cc265cc40180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:2000000080dd2a10d295c1011ec581a4f05dc40180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCP70D.dll"
"TargetName" = "8:MSVCP70D.dll"
"Tag" = "8:"
@@ -667,7 +691,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_9A2ADE669A100D71F9E0B3753CDA677A"
{
- "Signature" = "8:20000000803a49fed195c1016a03b9cc265cc401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:20000000803a49fed195c101f8bd1ca5f05dc401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCR70D.dll"
"TargetName" = "8:MSVCR70D.dll"
"Tag" = "8:"
@@ -688,7 +712,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_B2784574F1B848EABBE013669B46808C"
{
- "Signature" = "8:2000000010047b48bb5bc401501934ce265cc401726969bd265cc401000000000080030000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:2000000010047b48bb5bc4013c29e2aaf85dc4019c6b45b4f85dc401000000000080030000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
"Tag" = "8:"
@@ -1023,6 +1047,35 @@
{
}
}
+ "{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ {
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "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"
+ "OutputProjectCanonicalName" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\dsfAbstractVideoEncoder.vcproj"
+ "OutputProjectGuid" = "8:{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_14E3067B71584FB5A245A2DA9D65D139"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
@@ -1545,6 +1598,35 @@
{
}
}
+ "{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_AC8962A7F212481095173AB7C8C89025"
+ {
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "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:4"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectCanonicalName" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\dsfTheoraEncoder.vcproj"
+ "OutputProjectGuid" = "8:{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_AFF84F5FBA224F8A8D4BB3ACA539DC8B"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
@@ -1841,7 +1923,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{778DA93A-8AE4-4AD8-BF3E-43DA8AC06994}"
- "PackageCode" = "8:{6C6D0FCA-F606-4062-A79E-C544384B2D47}"
+ "PackageCode" = "8:{C478329C-0234-45A3-B976-1F0021382555}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-06-29 16:36:50 UTC (rev 6921)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2004-06-29 17:56:59 UTC (rev 6922)
@@ -35,6 +35,7 @@
TheoraEncodeInputPin::TheoraEncodeInputPin(AbstractVideoEncodeFilter* inParentFilter, CCritSec* inFilterLock, AbstractVideoEncodeOutputPin* inOutputPin)
: AbstractVideoEncodeInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("TheoraEncodeInputPin"), L"YV12 In")
, mBegun(false)
+
{
mYUV.y = NULL;
@@ -304,7 +305,6 @@
mTheoraInfo.height = mHeight
= mYUV.y_height
- = mYUV.y_width
= mVideoFormat->bmiHeader.biHeight;
mYUV.uv_height = mHeight/2;
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h 2004-06-29 16:36:50 UTC (rev 6921)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h 2004-06-29 17:56:59 UTC (rev 6922)
@@ -61,8 +61,8 @@
//
// bool fillTheoraInfo(theora_info* outTheora, sTheoraFormatBlock* inTheoraFormatBlock);
//
- TheoraEncodeOutputPin* mOutputPin;
- __int64 mUptoFrame;
+ //TheoraEncodeOutputPin* mOutputPin; //Already in the base class. Naughty c++
+ //__int64 mUptoFrame; //Already in base class stupid !
TheoraEncoder mTheoraEncoder;
theora_info mTheoraInfo;
More information about the commits
mailing list