[xiph-commits] r7920 - in trunk/oggdsf/src: lib/codecs/speex/filters/dsfSpeexEncoder lib/codecs/theora/filters/dsfTheoraEncoder tests/testliboggSpeed1

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-07 01:12:44 -0700 (Thu, 07 Oct 2004)
New Revision: 7920

Modified:
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
   trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
   trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp
Log:
* Filled in some of the format block stuff.

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2004-10-07 06:18:43 UTC (rev 7919)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2004-10-07 08:12:44 UTC (rev 7920)
@@ -94,6 +94,7 @@
 	//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);

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-10-07 06:18:43 UTC (rev 7919)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-10-07 08:12:44 UTC (rev 7920)
@@ -1296,6 +1296,14 @@
 	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.frameRateNumerator = locNum;
 	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.frameRateDenominator = 1;
 	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.maxKeyframeInterval = 6;   //log2(keyframe_freq) from above
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.frameHeight = mHeight;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.frameWidth = mWidth;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.colourSpace = OC_CS_UNSPECIFIED;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.height = mTheoraInfo.height;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.width = mTheoraInfo.width;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.xOffset = mXOffset;
+	((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.yOffset = mYOffset;
+
 	return true;
 
 }

Modified: trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp
===================================================================
--- trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp	2004-10-07 06:18:43 UTC (rev 7919)
+++ trunk/oggdsf/src/tests/testliboggSpeed1/testliboggSpeed1.cpp	2004-10-07 08:12:44 UTC (rev 7920)
@@ -15,7 +15,7 @@
 		QueryPerformanceCounter(&perfStart);
   int pageCount = 0;
   int packetCount = 0;
-  const unsigned short BUFF_SIZE = 4096;
+  const unsigned short BUFF_SIZE = 8092;
   ogg_sync_state   syncState; /* sync and verify incoming physical bitstream */
  
   ogg_page         oggPage; /* one Ogg bitstream page.  Vorbis packets are inside */