[xiph-commits] r7274 - in trunk/oggdsf: sln/oggdsf_all
illiminable at dactyl.lonelymoon.com
illiminable
Thu Jul 22 22:41:41 PDT 2004
src/lib/codecs/flac/filters/dsfFLACEncoder
Message-ID: <20040723054141.5F8C89AAAB at dactyl.lonelymoon.com>
Author: illiminable
Date: Thu Jul 22 22:41:41 2004
New Revision: 7274
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
Log:
* Flac Encoder builds but does nothing.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-23 05:41:39 UTC (rev 7274)
@@ -1034,9 +1034,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
ProjectSection(ProjectDependencies) = postProject
+ {6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{4906E533-2864-4840-ABC1-00CD844623EB} = {4906E533-2864-4840-ABC1-00CD844623EB}
{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+ {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
EndProjectSection
EndProject
Global
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h 2004-07-23 05:41:39 UTC (rev 7274)
@@ -31,7 +31,7 @@
#pragma once
-#include "FLACencoderdllstuff.h"
+#include "flacencoderdllstuff.h"
#include "AbstractAudioEncodeFilter.h"
//Forward Declarations
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2004-07-23 05:41:39 UTC (rev 7274)
@@ -80,6 +80,7 @@
//
//}
//return locErr;
+ return -1;
}
bool FLACEncodeInputPin::ConstructCodec() {
//mFishInfo.channels = mWaveFormat->nChannels;
@@ -97,7 +98,7 @@
//fish_sound_set_encoded_callback (mFishSound, SpeexEncodeInputPin::SpeexEncoded, this);
////FIX::: Proper return value
//return true;
-
+ return true;
}
void FLACEncodeInputPin::DestroyCodec() {
//fish_sound_delete(mFishSound);
@@ -169,6 +170,7 @@
//This is called back with encoded data after raw data is fed in by stream_encoder_process or
// stream_encoder_process_interleaved.
+ return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
}
void FLACEncodeInputPin::metadata_callback(const ::FLAC__StreamMetadata *metadata) {
//This is called back at the *end* of encoding with the headers that need to be written at the *start* of the stream.
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.cpp 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.cpp 2004-07-23 05:41:39 UTC (rev 7274)
@@ -1,12 +0,0 @@
-// dsfFLACEncoder.cpp : Defines the entry point for the DLL application.
-//
-
-#include "stdafx.h"
-BOOL APIENTRY DllMain( HANDLE hModule,
- DWORD ul_reason_for_call,
- LPVOID lpReserved
- )
-{
- return TRUE;
-}
-
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2004-07-23 05:41:39 UTC (rev 7274)
@@ -23,16 +23,17 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Strmbase.lib Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="Strmbasd.lib Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug""
@@ -122,9 +123,6 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath=".\dsfFLACEncoder.cpp">
- </File>
- <File
RelativePath=".\FLACEncodeFilter.cpp">
</File>
<File
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h 2004-07-23 05:26:34 UTC (rev 7273)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h 2004-07-23 05:41:39 UTC (rev 7274)
@@ -49,6 +49,11 @@
// unsigned long numChannels;
//
//};
+struct sFLACFormatBlock {
+ unsigned short numChannels;
+
+};
+
#include "AbstractAudioEncodeFilter.h"
#include "AbstractAudioEncodeInputPin.h"
#include "AbstractAudioEncodeOutputPin.h"
@@ -126,7 +131,3 @@
};
-struct sFLACFormatBlock {
-
-
-};
More information about the commits
mailing list