[xiph-commits] r11891 - in trunk/oggdsf/src/lib/codecs: speex/libs/libOOSpeex vorbis/filters/dsfVorbisEncoder

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-10-08 06:58:59 -0700 (Sun, 08 Oct 2006)
New Revision: 11891

Modified:
   trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp
   trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.h
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/PropsVorbisEncoder.cpp
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
Log:
* Tidy up code in SpeexEncoder
* Tidy up code in vorbisencode filter
* Tidy up code in vorbis proeprty page

Modified: trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp	2006-10-08 13:04:12 UTC (rev 11890)
+++ trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp	2006-10-08 13:58:59 UTC (rev 11891)
@@ -112,11 +112,9 @@
         mSpeexPreprocessState = NULL;
     }
 
-
     mSpeexWorkingFrameBuffer = new unsigned char[mSpeexFrameSize * inSettings.numChannels() * (mSampleWidth >> 3)];
     mSpeexWorkingFrameBufferUpto = 0;
 
-
     mSettings = inSettings;
 
     int locHeaderPacketSize = 0;
@@ -149,7 +147,6 @@
     StampedOggPacket* locCommentPacket = new StampedOggPacket(locCommentBuffer, locCommentHeaderSize, false, false, 0, 0, StampedOggPacket::OGG_BOTH);
     retPacketList.push_back(locCommentPacket);
 
-
     speex_bits_init(&mSpeexBits);
     return retPacketList;
 

Modified: trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.h	2006-10-08 13:04:12 UTC (rev 11890)
+++ trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.h	2006-10-08 13:58:59 UTC (rev 11891)
@@ -5,7 +5,6 @@
 
 #include "SpeexEncodeSettings.h"
 
-
 extern "C" {
 //#include "speex/speex.h"
 #include "speex_cdecl.h"
@@ -21,9 +20,6 @@
 
 //#include "speex/speex_preprocess.h"
 #include "speex_preprocess_cdecl.h"
-
-
-
 }
 
 #include <vector>
@@ -43,13 +39,11 @@
     vector<StampedOggPacket*> encode(const short* const inSampleBuffer, unsigned long inNumSamplesPerChannel);
     vector<StampedOggPacket*> flush();      //Needed?
 
-
     string getVendorString();
 
 private:
     static const unsigned long MAX_FRAME_BYTES = 2000;
     SpeexEncodeSettings mSettings;
-    
 
     long mSpeexFrameSize;
     long mSpeexLookAhead;
@@ -62,7 +56,5 @@
     void* mSpeexState;
     SpeexPreprocessState* mSpeexPreprocessState;
     SpeexBits mSpeexBits;
-    
 
-
 };

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/PropsVorbisEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/PropsVorbisEncoder.cpp	2006-10-08 13:04:12 UTC (rev 11890)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/PropsVorbisEncoder.cpp	2006-10-08 13:58:59 UTC (rev 11891)
@@ -61,10 +61,6 @@
 
     delete[] locStrBuff;
 
-
-
-
-
     return S_OK;
 }
 

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp	2006-10-08 13:04:12 UTC (rev 11890)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp	2006-10-08 13:58:59 UTC (rev 11891)
@@ -61,7 +61,6 @@
 //PURE VIRTUALS
 HRESULT VorbisEncodeInputPin::TransformData(unsigned char* inBuf, long inNumBytes) 
 {
-
     HRESULT locHR = S_OK;
     vector<StampedOggPacket*> locPackets;
     if (!mBegun) {
@@ -98,7 +97,6 @@
 
 }
 
-
 HRESULT VorbisEncodeInputPin::SetMediaType(const CMediaType* inMediaType) 
 {
 	if (	(inMediaType->subtype == MEDIASUBTYPE_PCM) &&
@@ -115,7 +113,6 @@
 	ConstructCodec();
 
 	return CBaseInputPin::SetMediaType(inMediaType);
-
 }
 
 HRESULT VorbisEncodeInputPin::EndOfStream()
@@ -173,12 +170,7 @@
         //TODO::: Should we be checking this return?
         locSample->GetPointer(&locBuffer);
 
-
-
-
 	    if (locSample->GetSize() >= inPackets[pack]->packetSize()) {
-
-
 		    memcpy((void*)locBuffer, (const void*)inPackets[pack]->packetData(), inPackets[pack]->packetSize());
     		
 		    //Set the sample parameters.