[xiph-commits] r8546 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/codecs/vorbis/filters/dsfVorbisEncoder
src/lib/core/directshow/dsfOggDemux src/tools/iTranscode
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Tue Dec 28 17:52:02 PST 2004
Author: illiminable
Date: 2004-12-28 17:52:01 -0800 (Tue, 28 Dec 2004)
New Revision: 8546
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h
trunk/oggdsf/src/tools/iTranscode/iTranscode.cpp
Log:
* CMML Filter update to remove allocator leak
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-29 01:52:01 UTC (rev 8546)
@@ -627,6 +627,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A0E68123D9D541DFA9691752981C903A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3933,6 +3939,34 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A0E68123D9D541DFA9691752981C903A"
+ {
+ "SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Debug\\testCMMLParser.exe"
+ "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"
+ "OutputProjectGuid" = "8:{BF72BA81-0735-46FB-8C8C-E36758477756}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
"SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-29 01:52:01 UTC (rev 8546)
@@ -179,9 +179,10 @@
locSample->SetDiscontinuity(FALSE);
locSample->SetSyncPoint(TRUE);
-
+ locHR = Deliver(locSample);
- return Deliver(locSample);
+ int x = locSample->Release();
+ return locHR;
}
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.cpp 2004-12-29 01:52:01 UTC (rev 8546)
@@ -70,6 +70,9 @@
{
}
+STDMETHODIMP VorbisEncodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+ return AbstractTransformFilter::NonDelegatingQueryInterface(riid, ppv);
+}
bool VorbisEncodeFilter::ConstructPins()
{
//Inputs Audio / PCM / WaveFormatEx
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.h 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeFilter.h 2004-12-29 01:52:01 UTC (rev 8546)
@@ -54,6 +54,10 @@
VorbisEncodeFilter(void);
virtual ~VorbisEncodeFilter(void);
+ //COM Initialisation
+ DECLARE_IUNKNOWN
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
//COM Creator function
static CUnknown* WINAPI VorbisEncodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/ds_guids.h 2004-12-29 01:52:01 UTC (rev 8546)
@@ -22,6 +22,8 @@
DEFINE_GUID(MEDIASUBTYPE_Speex,
0x25a9729d, 0x12f6, 0x420e, 0xbd, 0x53, 0x1d, 0x63, 0x1d, 0xc2, 0x17, 0xdf);
+
+
// {44E04F43-58B3-4de1-9BAA-8901F852DAE4}
DEFINE_GUID(FORMAT_Vorbis,
0x44e04f43, 0x58b3, 0x4de1, 0x9b, 0xaa, 0x89, 0x1, 0xf8, 0x52, 0xda, 0xe4);
Modified: trunk/oggdsf/src/tools/iTranscode/iTranscode.cpp
===================================================================
--- trunk/oggdsf/src/tools/iTranscode/iTranscode.cpp 2004-12-29 01:50:46 UTC (rev 8545)
+++ trunk/oggdsf/src/tools/iTranscode/iTranscode.cpp 2004-12-29 01:52:01 UTC (rev 8546)
@@ -70,6 +70,7 @@
if (!locHasOutputs) {
//Renderer filter here. Remove it from the graph.
locHR = locGraphBuilder->RemoveFilter(locFilter);
+
//Break out of the filter loop.
break;
}
@@ -86,6 +87,7 @@
if (locHR == S_OK) {
//Created a vorbis filter...
locGraphBuilder->AddFilter(locVorbisEncoder, L"Vorbis Encode Filter");
+
////UPTO HERE::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
More information about the commits
mailing list