[xiph-commits] r7738 - trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-09-11 09:20:03 -0700 (Sat, 11 Sep 2004)
New Revision: 7738

Modified:
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
Log:
* Fixed bug in speex encoder where it wasn't advertising it's granule pos conversion parameters... which didn't make a difference to single stream files... but would have prevented a correct muxing of theora+speex files. Done some testing of theora+speex muxing, and it seems to work.


Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h	2004-09-11 07:45:08 UTC (rev 7737)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h	2004-09-11 16:20:03 UTC (rev 7738)
@@ -45,6 +45,7 @@
 public:
 
 	friend class SpeexEncodeOutputPin;
+	friend class SpeexEncodeInputPin;
 	SpeexEncodeFilter(void);
 	virtual ~SpeexEncodeFilter(void);
 

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2004-09-11 07:45:08 UTC (rev 7737)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2004-09-11 16:20:03 UTC (rev 7738)
@@ -91,7 +91,10 @@
 	mFishInfo.format = FISH_SOUND_SPEEX;
 	mFishInfo.samplerate = mWaveFormat->nSamplesPerSec;
 
-
+	//Change to fill in vorbis format block so muxer can work
+	((SpeexEncodeFilter*)mParentFilter)->mSpeexFormatBlock.numChannels = mWaveFormat->nChannels;
+	((SpeexEncodeFilter*)mParentFilter)->mSpeexFormatBlock.samplesPerSec = mWaveFormat->nSamplesPerSec;
+	//
 	
 	mFishSound = fish_sound_new (FISH_SOUND_ENCODE, &mFishInfo);