[xiph-commits] r11198 - branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-04-21 02:25:43 -0700 (Fri, 21 Apr 2006)
New Revision: 11198

Modified:
   branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp
   branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h
Log:
* Clean up some dead code in speex decode filter

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp	2006-04-21 09:14:52 UTC (rev 11197)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp	2006-04-21 09:25:43 UTC (rev 11198)
@@ -177,108 +177,6 @@
 		return -1;
 	}
 
-
-
-
-
-
-
-
-
-
-
-
-
-	////Do we need to delete the pcm structure ???? 
-	////More of this can go to the abstract class.
-
-	////For convenience we do all these cast once and for all here.
-	//SpeexDecodeInputPin* locThis = reinterpret_cast<SpeexDecodeInputPin*> (inThisPointer);
-	//SpeexDecodeFilter* locFilter = reinterpret_cast<SpeexDecodeFilter*>(locThis->m_pFilter);
-	//
-
-	//if (! locThis->mBegun) {
-	//
-	//	fish_sound_command (locThis->mFishSound, FISH_SOUND_GET_INFO, &(locThis->mFishInfo), sizeof (FishSoundInfo)); 
-	//	locThis->mBegun = true;
-	//	
-	//	locThis->mNumChannels = locThis->mFishInfo.channels;
-	//	locThis->mFrameSize = locThis->mNumChannels * SIZE_16_BITS;
-	//	locThis->mSampleRate = locThis->mFishInfo.samplerate;
-
-	//}
-	//
-	////TO DO::: Move this somewhere else
-	//unsigned long locActualSize = inFrames * locThis->mFrameSize;
-	//unsigned long locTotalFrameCount = inFrames * locThis->mNumChannels;
-
-	//REFERENCE_TIME locFrameStart = (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-	////Increment the frame counter
-	//locThis->mUptoFrame += inFrames;
-	////Make the end frame counter
-
-	//
-	//REFERENCE_TIME locFrameEnd = (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-
-
-	//IMediaSample* locSample;
-	//HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
-
-	//if (locHR != S_OK) {
-	//	return locHR;
-	//}	
-	//
-	////Create pointers for the samples buffer to be assigned to
-	//BYTE* locBuffer = NULL;
-	//signed short* locShortBuffer = NULL;
-	//
-	////Make our pointers set to point to the samples buffer
-	//locSample->GetPointer(&locBuffer);
-	//locShortBuffer = (short *) locBuffer;
-	//
-	//signed short tempInt = 0;
-	//float tempFloat = 0;
-	//
-	////FIX:::Move the clipping to the abstract function
-
-	//if (locSample->GetSize() >= locActualSize) {
-	//	//Do float to int conversion with clipping
-	//	float SINT_MAX_AS_FLOAT = 32767.0f;
-	//	for (unsigned long i = 0; i < locTotalFrameCount; i++) {
-	//		//Clipping because vorbis puts out floats out of range -1 to 1
-	//		if (((float*)inPCM)[i] <= -1.0f) {
-	//			tempInt = SINT_MIN;	
-	//		} else if (((float*)inPCM)[i] >= 1.0f) {
-	//			tempInt = SINT_MAX;
-	//		} else {
-	//			//FIX:::Take out the unnescessary variable.
-	//			tempFloat = ((( (float*) inPCM )[i]) * SINT_MAX_AS_FLOAT);
-	//			//ASSERT((tempFloat <= 32767.0f) && (tempFloat >= -32786.0f));
-	//			tempInt = (signed short)(tempFloat);
-	//			//tempInt = (signed short) ((( (float*) inPCM )[i]) * SINT_MAX_AS_FLOAT);
-	//		}
-	//		
-	//		*locShortBuffer = tempInt;
-	//		locShortBuffer++;
-	//	}
-	//	
-	//	//Set the sample parameters.
-	//	locThis->SetSampleParams(locSample, locActualSize, &locFrameStart, &locFrameEnd);
-
-	//	{
-	//		CAutoLock locLock(locThis->m_pLock);
-	//		HRESULT locHR = ((SpeexDecodeOutputPin*)(locThis->mOutputPin))->mDataQueue->Receive(locSample);
-	//		if (locHR != S_OK) {
-	//			return locHR;				
-	//		}
-	//	}
-
-	//	
-	//	return 0;
-	//} else {
-	//	throw 0;
-	//}
-
 }
 
 STDMETHODIMP SpeexDecodeInputPin::Receive(IMediaSample* inSample) 
@@ -409,13 +307,7 @@
 	}
 	return CBaseInputPin::SetMediaType(inMediaType);
 
-	//if (inMediaType->subtype == MEDIASUBTYPE_Speex) {
-	//	((SpeexDecodeFilter*)mParentFilter)->setSpeexFormat((sSpeexFormatBlock*)inMediaType->pbFormat);
 
-	//} else {
-	//	throw 0;
-	//}
-	//return CBaseInputPin::SetMediaType(inMediaType);
 }
 
 HRESULT SpeexDecodeInputPin::CheckMediaType(const CMediaType *inMediaType)

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h	2006-04-21 09:14:52 UTC (rev 11197)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h	2006-04-21 09:25:43 UTC (rev 11198)
@@ -35,14 +35,8 @@
 //#include <pullpin.h>
 //#include <initguid.h>
 
-//#ifdef DSFABSTRACOGGAUDIODECODER_EXPORTS
-//#pragma message("----> Exporting from Abstract Library...")
-//#define ABS_AUDIO_DEC_API __declspec(dllexport)
-//#else
-//#pragma message("<---- Importing from Abstract Library...")
-//#define ABS_AUDIO_DEC_API __declspec(dllimport)
-//#endif
 
+
 #ifdef LIBOOOGG_EXPORTS
 #define LIBOOOGG_API __declspec(dllexport)
 #else