[xiph-commits] r7281 - in trunk/oggdsf: scripts

[illiminable at dactyl.lonelymoon.com]

src/lib/codecs/flac/filters/dsfFLACEncoder
Message-ID: <20040723082052.709C19AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Fri Jul 23 01:20:52 2004
New Revision: 7281

Modified:
trunk/oggdsf/scripts/note2self.txt
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
Log:
* Preliminary test on flac encoder after some more bug fixes seem ok... however no metadata/headers are written into the stream because they aren't created until after encoding, which makes it pretty difficult to insert them back into the stream... i'm sure some good hacking will fix that !

Modified: trunk/oggdsf/scripts/note2self.txt
===================================================================
--- trunk/oggdsf/scripts/note2self.txt	2004-07-23 07:52:29 UTC (rev 7280)
+++ trunk/oggdsf/scripts/note2self.txt	2004-07-23 08:20:51 UTC (rev 7281)
@@ -30,11 +30,14 @@

=========================================

-The encoder don't properly fill out their format blocks... this is no
+The encoders don't properly fill out their format blocks... this is no
problem for the muxer, but if you try to chain an encoder to a decoder,
bad things will happen !

+ADD 2004/07/23 - Now the flac encoder does, an the theora partially does.
+----------------------------------------------------------------

+
*** IMPORANT ***
HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions


Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp	2004-07-23 07:52:29 UTC (rev 7280)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp	2004-07-23 08:20:51 UTC (rev 7281)
@@ -114,6 +114,11 @@
set_channels(mWaveFormat->nChannels);
set_sample_rate(mWaveFormat->nSamplesPerSec);
set_bits_per_sample(mWaveFormat->wBitsPerSample);
+
+	FLACEncodeFilter* locParentFilter = (FLACEncodeFilter*)mParentFilter;	//View only don't delete.
+	locParentFilter->mFLACFormatBlock.numBitsPerSample = mWaveFormat->wBitsPerSample;
+	locParentFilter->mFLACFormatBlock.numChannels = mWaveFormat->nChannels;
+	locParentFilter->mFLACFormatBlock.sampleRate = mWaveFormat->nSamplesPerSec;
init();

//