[xiph-commits] r11209 - branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-04-21 10:01:27 -0700 (Fri, 21 Apr 2006)
New Revision: 11209

Modified:
   branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.cpp
   branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.h
Log:
* Fix stereo part of speex wrapper

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.cpp	2006-04-21 15:57:20 UTC (rev 11208)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.cpp	2006-04-21 17:01:27 UTC (rev 11209)
@@ -10,8 +10,13 @@
 	,	mNumExtraHeaders(0)
 	,	mIsVBR(false)
 	,	mSpeexState(NULL)
-	,	mStereoState(NULL)
+	//,	mStereoState(NULL)
 {
+	//mStereoState = SPEEX_STEREO_STATE_INIT;
+	mStereoState.balance = 1.0;
+	mStereoState.e_ratio = 0.5;
+	mStereoState.smooth_left = 1.0;
+	mStereoState.smooth_right = 1.0;
 }
 
 SpeexDecoder::~SpeexDecoder(void)
@@ -65,7 +70,7 @@
 
 
 			if (mNumChannels == 2) {
-				speex_decode_stereo_int(outSamples, mFrameSize, mStereoState);
+				speex_decode_stereo_int(outSamples, mFrameSize, &mStereoState);
 			}
 		}
 		return SPEEX_DATA_OK;
@@ -116,7 +121,7 @@
 	if (mDecoderSettings.mForceChannels == SpeexDecodeSettings::SPEEX_CHANNEL_FORCE_STEREO) {
 		locCallback.callback_id = SPEEX_INBAND_STEREO;
 		locCallback.func = speex_std_stereo_request_handler;
-		locCallback.data = mStereoState;
+		locCallback.data = &mStereoState;
 		speex_decoder_ctl(locState, SPEEX_SET_HANDLER, &locCallback);
 	}
 

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.h	2006-04-21 15:57:20 UTC (rev 11208)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/libs/libOOSpeex/SpeexDecoder.h	2006-04-21 17:01:27 UTC (rev 11209)
@@ -54,7 +54,7 @@
 	int mNumExtraHeaders;
 	bool mIsVBR;
 
-	SpeexStereoState* mStereoState;
+	SpeexStereoState mStereoState;
 	SpeexBits mSpeexBits;
 	void* mSpeexState;