[xiph-commits] r10258 - in branches/oggdsf_new_demux/src/lib:
codecs/vorbis/filters/dsfVorbisDecoder core/directshow/dsfOggDemux2
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Sun Oct 23 00:09:24 PDT 2005
Author: illiminable
Date: 2005-10-23 00:09:01 -0700 (Sun, 23 Oct 2005)
New Revision: 10258
Modified:
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.h
branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.cpp
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.h
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h
Log:
* Remove some dead code from vorbis decoder
* Slight change of plan for demuxer, go back to packetwise distribution or it will break not ogg containers
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -124,82 +124,3 @@
mVorbisFormatInfo = new sVorbisFormatBlock; //Deleted in destructor.
*mVorbisFormatInfo = *inFormatBlock;
}
-
-//Old imp
-//******************************************************************
-//#include "stdafx.h"
-//#include "vorbisdecodefilter.h"
-//
-////Include Files
-//#include "stdafx.h"
-//#include "VorbisDecodeFilter.h"
-//
-////COM Factory Template
-//CFactoryTemplate g_Templates[] =
-//{
-// {
-// L"Vorbis Decode Filter", // Name
-// &CLSID_VorbisDecodeFilter, // CLSID
-// VorbisDecodeFilter::CreateInstance, // Method to create an instance of MyComponent
-// NULL, // Initialization function
-// NULL // Set-up information (for filters)
-// }
-//
-//};
-//
-//// Generic way of determining the number of items in the template
-//int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-//
-//
-//
-////*************************************************************************************************
-//VorbisDecodeFilter::VorbisDecodeFilter()
-// : AbstractAudioDecodeFilter(NAME("Vorbis Decoder"), CLSID_VorbisDecodeFilter, VORBIS)
-// , mVorbisFormatInfo(NULL)
-//{
-//
-// bool locWasConstructed = ConstructPins();
-//}
-//
-//bool VorbisDecodeFilter::ConstructPins()
-//{
-// DbgLog((LOG_TRACE,1,TEXT("Vorbis Constructor...")));
-// //Output pin must be done first because it's passed to the input pin.
-// mOutputPin = new VorbisDecodeOutputPin(this, m_pLock); //Deleted in base class destructor
-//
-// CMediaType* locAcceptMediaType = new CMediaType(&MEDIATYPE_Audio); //Deleted in pin destructor
-// locAcceptMediaType->subtype = MEDIASUBTYPE_Vorbis;
-// locAcceptMediaType->formattype = FORMAT_Vorbis;
-// mInputPin = new VorbisDecodeInputPin(this, m_pLock, mOutputPin, locAcceptMediaType); //Deleted in base class filter destructor.
-// return true;
-//}
-//
-//VorbisDecodeFilter::~VorbisDecodeFilter(void)
-//{
-// DbgLog((LOG_TRACE,1,TEXT("Vorbis Destructor...")));
-// //DestroyPins();
-// delete mVorbisFormatInfo;
-//}
-//
-//CUnknown* WINAPI VorbisDecodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
-//{
-//
-// VorbisDecodeFilter *pNewObject = new VorbisDecodeFilter();
-// if (pNewObject == NULL) {
-// *pHr = E_OUTOFMEMORY;
-// }
-// return pNewObject;
-//}
-//
-////QUERY::: Do we need these ? Aren't we all friedns here ??
-////RESULT::: Keep them, set function must be kept... get could go... but keep for consistency
-//sVorbisFormatBlock* VorbisDecodeFilter::getVorbisFormatBlock()
-//{
-// return mVorbisFormatInfo;
-//}
-//void VorbisDecodeFilter::setVorbisFormat(sVorbisFormatBlock* inFormatBlock)
-//{
-// delete mVorbisFormatInfo;
-// mVorbisFormatInfo = new sVorbisFormatBlock; //Deleted in destructor.
-// *mVorbisFormatInfo = *inFormatBlock;
-//}
\ No newline at end of file
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -68,49 +68,3 @@
//Format Block
sVorbisFormatBlock* mVorbisFormatInfo;
};
-
-
-
-
-//Old implementation
-//**********************************************
-//#pragma once
-////Include Files
-//#include "vorbisdecoderdllstuff.h"
-//#include "AbstractAudioDecodeFilter.h"
-//
-////Forward Declarations
-//struct sVorbisFormatBlock;
-//class VorbisDecodeInputPin;
-//class VorbisDecodeOutputPin;
-//
-////Class Interface
-//class VorbisDecodeFilter
-// //Base Classes
-// : public AbstractAudioDecodeFilter
-//{
-//public:
-// //Friends
-// friend class VorbisDecodeInputPin;
-// friend class VorbisDecodeOutputPin;
-//
-// //Constructors and Destructors
-// VorbisDecodeFilter(void);
-// virtual ~VorbisDecodeFilter(void);
-//
-// //COM Creator Function
-// static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
-//
-//
-//
-// //VIRTUAL FUNCTIONS - AbstractAudioDecodeFilter
-// virtual bool ConstructPins();
-//
-// //FIX::: Do we need these ? Aren't they all friends ??
-// virtual sVorbisFormatBlock* getVorbisFormatBlock();
-// virtual void setVorbisFormat(sVorbisFormatBlock* inFormatBlock);
-//
-//protected:
-// //Format Block
-// sVorbisFormatBlock* mVorbisFormatInfo;
-//};
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -241,227 +241,3 @@
return CBaseInputPin::SetMediaType(inMediaType);
}
-
-
-
-//Old imp
-//*************************************************
-//#include "stdafx.h"
-//
-//#include "VorbisDecodeInputPin.h"
-//
-//
-//VorbisDecodeInputPin::VorbisDecodeInputPin(AbstractAudioDecodeFilter* inFilter, CCritSec* inFilterLock, AbstractAudioDecodeOutputPin* inOutputPin, CMediaType* inAcceptMediaType)
-// : AbstractAudioDecodeInputPin(inFilter, inFilterLock, inOutputPin, NAME("VorbisDecodeInputPin"), L"Vorbis In", inAcceptMediaType),
-// mBegun(false)
-// , mFishSound(NULL)
-//
-//{
-// //debugLog.open("g:\\logs\\vorbislog.log", ios_base::out);
-// ConstructCodec();
-//}
-//
-//STDMETHODIMP VorbisDecodeInputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
-//{
-// if (riid == IID_IMediaSeeking) {
-// *ppv = (IMediaSeeking*)this;
-// ((IUnknown*)*ppv)->AddRef();
-// return NOERROR;
-// }
-//
-// return CBaseInputPin::NonDelegatingQueryInterface(riid, ppv);
-//}
-//bool VorbisDecodeInputPin::ConstructCodec() {
-// mFishSound = fish_sound_new (FISH_SOUND_DECODE, &mFishInfo); //Deleted by destroycodec from destructor.
-//
-// int i = 1;
-// //FIX::: Use new API for interleave setting
-// fish_sound_command(mFishSound, FISH_SOUND_SET_INTERLEAVE, &i, sizeof(int));
-//
-// fish_sound_set_decoded_callback (mFishSound, VorbisDecodeInputPin::VorbisDecoded, this);
-// //FIX::: Proper return value
-// return true;
-//}
-//void VorbisDecodeInputPin::DestroyCodec() {
-// fish_sound_delete(mFishSound);
-// mFishSound = NULL;
-//}
-//VorbisDecodeInputPin::~VorbisDecodeInputPin(void)
-//{
-// //debugLog.close();
-// DestroyCodec();
-//}
-//
-//
-//
-//int __cdecl VorbisDecodeInputPin::VorbisDecoded (FishSound* inFishSound, float** inPCM, long inFrames, void* inThisPointer)
-//{
-//
-// DbgLog((LOG_TRACE,1,TEXT("Decoded... Sending...")));
-// //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.
-// VorbisDecodeInputPin* locThis = reinterpret_cast<VorbisDecodeInputPin*> (inThisPointer);
-// VorbisDecodeFilter* locFilter = reinterpret_cast<VorbisDecodeFilter*>(locThis->m_pFilter);
-//
-//
-// if (locThis->CheckStreaming() == S_OK) {
-// 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;
-//
-// }
-//
-// //FIX::: Most of this will be obselete... the demux does it all.
-//
-//
-// unsigned long locActualSize = inFrames * locThis->mFrameSize;
-// unsigned long locTotalFrameCount = inFrames * locThis->mNumChannels;
-//
-// //REFERENCE_TIME locFrameStart = locThis->CurrentStartTime() + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-//
-//
-// //New hacks for chaining.
-// if (locThis->mSeekTimeBase == -1) {
-// //locThis->debugLog<<"Chaining was detected... setting chain time base to : "<<locThis->mPreviousEndTime<<endl;
-// //This is our signal this is the start of a chain...
-// // This can only happen on non-seekable streams.
-// locThis->mChainTimeBase = locThis->mPreviousEndTime;
-//
-// locThis->mSeekTimeBase = 0;
-// }
-//
-// //Start time hacks
-// REFERENCE_TIME locTimeBase = ((locThis->mLastSeenStartGranPos * UNITS) / locThis->mSampleRate) - locThis->mSeekTimeBase + locThis->mChainTimeBase;
-//
-//
-//
-// //locThis->aadDebug<<"Last Seen : " <<locThis->mLastSeenStartGranPos<<endl;
-// //locThis->debugLog<<"Last Seen : " << locThis->mLastSeenStartGranPos<<endl;
-// //locThis->debugLog<<"Time Base : " << locTimeBase << endl;
-// //locThis->debugLog<<"FrameCount : " <<locThis->mUptoFrame<<endl;
-// //locThis->debugLog<<"Seek TB : " <<locThis->mSeekTimeBase<<endl;
-//
-// //Temp - this will break seeking
-// REFERENCE_TIME locFrameStart = locTimeBase + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-// //Increment the frame counter
-// locThis->mUptoFrame += inFrames;
-// //Make the end frame counter
-//
-// //REFERENCE_TIME locFrameEnd = locThis->CurrentStartTime() + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-// REFERENCE_TIME locFrameEnd = locTimeBase + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
-// locThis->mPreviousEndTime = locFrameEnd;
-//
-//
-//
-// //locThis->debugLog<<"Start : "<<locFrameStart<<endl;
-// //locThis->debugLog<<"End : "<<locFrameEnd<<endl;
-// //locThis->debugLog<<"=================================================="<<endl;
-// IMediaSample* locSample;
-// HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
-//
-// if (locHR != S_OK) {
-// return -1;
-// }
-//
-//
-// //Create pointers for the samples buffer to be assigned to
-// BYTE* locBuffer = NULL;
-// signed short* locShortBuffer = NULL;
-//
-// 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
-// const 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);
-//
-// //Add a reference so it isn't deleted en route.... or not
-// //locSample->AddRef();
-// HRESULT lHR = locThis->mOutputPin->mDataQueue->Receive(locSample);
-// if (lHR != S_OK) {
-// DbgLog((LOG_TRACE,1,TEXT("Queue rejected us...")));
-// return -1;
-// }
-// }
-//
-// //Don't Release the sample it gets done for us !
-// //locSample->Release();
-//
-// return 0;
-// } else {
-// throw 0;
-// }
-// } else {
-// DbgLog((LOG_TRACE,1,TEXT("Fishsound sending stuff we aren't ready for...")));
-// return -1;
-// }
-//
-//}
-//
-//
-//
-//long VorbisDecodeInputPin::decodeData(BYTE* inBuf, long inNumBytes)
-//{
-// //debugLog << "Decode called... Last Gran Pos : "<<mLastSeenStartGranPos<<endl;
-// DbgLog((LOG_TRACE,1,TEXT("decodeData")));
-// long locErr = fish_sound_decode(mFishSound, inBuf, inNumBytes);
-// //FIX::: Do something here ?
-// if (locErr < 0) {
-// //debugLog <<"** Fish Sound error **"<<endl;
-// } else {
-// //debugLog << "Fish Sound OK >=0 "<<endl;
-// }
-// return locErr;
-//}
-//
-//
-//HRESULT VorbisDecodeInputPin::SetMediaType(const CMediaType* inMediaType) {
-// //FIX:::Error checking
-// //RESOLVED::: Bit better.
-//
-// if (inMediaType->subtype == MEDIASUBTYPE_Vorbis) {
-// ((VorbisDecodeFilter*)mParentFilter)->setVorbisFormat((sVorbisFormatBlock*)inMediaType->pbFormat);
-// mParentFilter->mAudioFormat = AbstractAudioDecodeFilter::VORBIS;
-// } else {
-// throw 0;
-// }
-// return CBaseInputPin::SetMediaType(inMediaType);
-//}
-//
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -85,51 +85,3 @@
};
-
-//Old imp
-//************************************************************
-//#pragma once
-//#include <fstream>
-//using namespace std;
-//#include "vorbisdecoderdllstuff.h"
-//#include "AbstractAudioDecodeInputPin.h"
-//#include "VorbisDecodeInputPin.h"
-//
-//#include "VorbisDecodeFilter.h"
-//
-//extern "C" {
-////#include <fishsound/fishsound.h>
-//#include "fish_cdecl.h"
-//}
-//
-//class VorbisDecodeOutputPin;
-//
-//class VorbisDecodeInputPin
-// : public AbstractAudioDecodeInputPin
-//{
-//public:
-//
-// DECLARE_IUNKNOWN
-// STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
-// VorbisDecodeInputPin(AbstractAudioDecodeFilter* inFilter, CCritSec* inFilterLock, AbstractAudioDecodeOutputPin* inOutputPin, CMediaType* inAcceptMediaType);
-// virtual ~VorbisDecodeInputPin(void);
-// static int __cdecl VorbisDecoded (FishSound* inFishSound, float** inPCM, long inFrames, void* inThisPointer);
-//
-// virtual HRESULT SetMediaType(const CMediaType* inMediaType);
-//
-// //VIRTUAL FUNCTIONS - AbstractAudioDecodeInputPin
-// //FIX:::These should be protected.
-// virtual bool ConstructCodec();
-// virtual void DestroyCodec();
-//
-// long decodeData(unsigned char* inBuf, long inNumBytes);
-//
-//protected:
-//
-// HRESULT mHR;
-// bool mBegun;
-//
-// FishSound* mFishSound;
-// FishSoundInfo mFishInfo;
-//
-//};
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -73,43 +73,3 @@
return S_FALSE;
}
}
-
-
-//Old imp
-//****************************************************
-//#include "stdafx.h"
-//#include "Vorbisdecodeoutputpin.h"
-//
-//VorbisDecodeOutputPin::VorbisDecodeOutputPin(VorbisDecodeFilter* inParentFilter, CCritSec* inFilterLock)
-// : AbstractAudioDecodeOutputPin(inParentFilter, inFilterLock,NAME("VorbisDecodeOutputPin"), L"PCM Out")
-//{
-//
-//
-//}
-//VorbisDecodeOutputPin::~VorbisDecodeOutputPin(void)
-//{
-//
-//
-//}
-//
-//STDMETHODIMP VorbisDecodeOutputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
-//{
-// if (riid == IID_IMediaSeeking) {
-// *ppv = (IMediaSeeking*)this;
-// ((IUnknown*)*ppv)->AddRef();
-// return NOERROR;
-// }
-//
-// return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv);
-//}
-//
-//bool VorbisDecodeOutputPin::FillWaveFormatExBuffer(WAVEFORMATEX* inFormatBuffer) {
-// inFormatBuffer->wFormatTag = WAVE_FORMAT_PCM;
-// inFormatBuffer->nChannels = ((VorbisDecodeFilter*)m_pFilter)->mVorbisFormatInfo->numChannels;
-// inFormatBuffer->nSamplesPerSec = ((VorbisDecodeFilter*)m_pFilter)->mVorbisFormatInfo->samplesPerSec;
-// inFormatBuffer->wBitsPerSample = 16;
-// inFormatBuffer->nBlockAlign = (inFormatBuffer->nChannels) * (inFormatBuffer->wBitsPerSample >> 3);
-// inFormatBuffer->nAvgBytesPerSec = ((inFormatBuffer->nChannels) * (inFormatBuffer->wBitsPerSample >> 3)) * inFormatBuffer->nSamplesPerSec;
-// inFormatBuffer->cbSize = 0;
-// return true;
-//}
\ No newline at end of file
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -44,31 +44,10 @@
DECLARE_IUNKNOWN
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
VorbisDecodeOutputPin(VorbisDecodeFilter* inParentFilter,CCritSec* inFilterLock, vector<CMediaType*> inAcceptableMediaTypes);
virtual ~VorbisDecodeOutputPin(void);
protected:
virtual HRESULT CreateAndFillFormatBuffer(CMediaType* outMediaType, int inPosition);
- //virtual bool FillWaveFormatExBuffer(WAVEFORMATEX* inFormatBuffer);
};
-//Old imp
-//*************************************
-//#pragma once
-//#include "vorbisdecoderdllstuff.h"
-//#include "AbstractAudioDecodeOutputPin.h"
-//
-//
-//class VorbisDecodeFilter;
-//class VorbisDecodeOutputPin :
-// public AbstractAudioDecodeOutputPin
-//{
-//public:
-// DECLARE_IUNKNOWN
-// STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
-// VorbisDecodeOutputPin(VorbisDecodeFilter* inParentFilter,CCritSec* inFilterLock);
-// virtual ~VorbisDecodeOutputPin(void);
-//
-// virtual bool FillWaveFormatExBuffer(WAVEFORMATEX* inFormatBuffer);
-//};
-
-
Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -31,29 +31,10 @@
#pragma once
-//***************************** Old imp
-//#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
-//
-//
-//
-//#include "AbstractAudioDecodeFilter.h"
-//#include "AbstractAudioDecodeInputPin.h"
-//#include "AbstractAudioDecodeOutputPin.h"
-//***************************** Old imp ends
-
-//**************************** New imp
-
#include "AbstractTransformFilter.h"
#include "AbstractTransformInputPin.h"
#include "AbstractTransformOutputPin.h"
-//****************************** New imp ends
#include "VorbisDecodeInputPin.h"
#include "VorbisDecodeOutputPin.h"
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -29,7 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "StdAfx.h"
-#include "OggDemuxPageSourceFilter.h"
+#include "OggDemuxPacketSourceFilter.h"
#include "OggStreamMapper.h"
// This template lets the Object factory create us properly and work with COM infrastructure.
@@ -37,8 +37,8 @@
{
{
L"OggDemuxFilter", // Name
- &CLSID_OggDemuxPageSourceFilter, // CLSID
- OggDemuxPageSourceFilter::CreateInstance, // Method to create an instance of MyComponent
+ &CLSID_OggDemuxPacketSourceFilter, // CLSID
+ OggDemuxPacketSourceFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
NULL // Set-up information (for filters)
}
@@ -59,16 +59,16 @@
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
//COM Creator Function
-CUnknown* WINAPI OggDemuxPageSourceFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
+CUnknown* WINAPI OggDemuxPacketSourceFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
{
- OggDemuxPageSourceFilter *pNewObject = new OggDemuxPageSourceFilter();
+ OggDemuxPacketSourceFilter *pNewObject = new OggDemuxPacketSourceFilter();
if (pNewObject == NULL) {
*pHr = E_OUTOFMEMORY;
}
return pNewObject;
}
//COM Interface query function
-STDMETHODIMP OggDemuxPageSourceFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
+STDMETHODIMP OggDemuxPacketSourceFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
{
if (riid == IID_IFileSourceFilter) {
*ppv = (IFileSourceFilter*)this;
@@ -96,8 +96,8 @@
return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
}
-OggDemuxPageSourceFilter::OggDemuxPageSourceFilter(void)
- : CBaseFilter(NAME("OggDemuxPageSourceFilter"), NULL, m_pLock, CLSID_OggDemuxPageSourceFilter)
+OggDemuxPacketSourceFilter::OggDemuxPacketSourceFilter(void)
+ : CBaseFilter(NAME("OggDemuxPacketSourceFilter"), NULL, m_pLock, CLSID_OggDemuxPacketSourceFilter)
, mDataSource(NULL)
, mSeenAllBOSPages(false)
, mSeenPositiveGranulePos(false)
@@ -113,13 +113,13 @@
mStreamMapper = new OggStreamMapper(this, m_pLock);
}
-OggDemuxPageSourceFilter::~OggDemuxPageSourceFilter(void)
+OggDemuxPacketSourceFilter::~OggDemuxPacketSourceFilter(void)
{
delete mStreamMapper;
//TODO::: Delete the locks
}
//IMEdiaStreaming
-STDMETHODIMP OggDemuxPageSourceFilter::Run(REFERENCE_TIME tStart)
+STDMETHODIMP OggDemuxPacketSourceFilter::Run(REFERENCE_TIME tStart)
{
//const REFERENCE_TIME A_LONG_TIME = UNITS * 1000;
//CAutoLock locLock(m_pLock);
@@ -132,7 +132,7 @@
}
-STDMETHODIMP OggDemuxPageSourceFilter::Pause(void)
+STDMETHODIMP OggDemuxPacketSourceFilter::Pause(void)
{
//CAutoLock locLock(m_pLock);
//debugLog << "** Pause called **"<<endl;
@@ -154,7 +154,7 @@
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::Stop(void)
+STDMETHODIMP OggDemuxPacketSourceFilter::Stop(void)
{
//CAutoLock locLock(m_pLock);
//debugLog<<"** Stop Called ** "<<endl;
@@ -171,7 +171,7 @@
}
-bool OggDemuxPageSourceFilter::acceptOggPage(OggPage* inOggPage)
+bool OggDemuxPacketSourceFilter::acceptOggPage(OggPage* inOggPage)
{
if (!mSeenAllBOSPages) {
if (!inOggPage->header()->isBOS()) {
@@ -191,7 +191,7 @@
return mStreamMapper->acceptOggPage(inOggPage);
}
}
-HRESULT OggDemuxPageSourceFilter::SetUpPins()
+HRESULT OggDemuxPacketSourceFilter::SetUpPins()
{
CAutoLock locDemuxLock(mDemuxLock);
CAutoLock locSourceLock(mSourceFileLock);
@@ -264,12 +264,12 @@
//TODO:::
return S_OK;
}
-int OggDemuxPageSourceFilter::GetPinCount()
+int OggDemuxPacketSourceFilter::GetPinCount()
{
//TODO::: Implement
return mStreamMapper->numPins();
}
-CBasePin* OggDemuxPageSourceFilter::GetPin(int inPinNo)
+CBasePin* OggDemuxPacketSourceFilter::GetPin(int inPinNo)
{
if (inPinNo < 0) {
return NULL;
@@ -278,7 +278,7 @@
}
//IFileSource Interface
-STDMETHODIMP OggDemuxPageSourceFilter::GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType)
{
////Return the filename and mediatype of the raw data
LPOLESTR x = SysAllocString(mFileName.c_str());
@@ -290,7 +290,7 @@
}
-STDMETHODIMP OggDemuxPageSourceFilter::Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType)
+STDMETHODIMP OggDemuxPacketSourceFilter::Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType)
{
////Initialise the file here and setup all the streams
CAutoLock locLock(m_pLock);
@@ -309,13 +309,13 @@
}
//IAMFilterMiscFlags Interface
-ULONG OggDemuxPageSourceFilter::GetMiscFlags(void)
+ULONG OggDemuxPacketSourceFilter::GetMiscFlags(void)
{
return AM_FILTER_MISC_FLAGS_IS_SOURCE;
}
//CAMThread Stuff
-DWORD OggDemuxPageSourceFilter::ThreadProc(void) {
+DWORD OggDemuxPacketSourceFilter::ThreadProc(void) {
//while(true) {
// DWORD locThreadCommand = GetRequest();
@@ -339,7 +339,7 @@
-STDMETHODIMP OggDemuxPageSourceFilter::GetCapabilities(DWORD* inCapabilities)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetCapabilities(DWORD* inCapabilities)
{
//if (mSeekTable->enabled()) {
// //debugLog<<"GetCaps "<<mSeekingCap<<endl;
@@ -355,7 +355,7 @@
//TODO:::
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetDuration(LONGLONG* outDuration)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetDuration(LONGLONG* outDuration)
{
//if (mSeekTable->enabled()) {
// //debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
@@ -370,14 +370,14 @@
}
-STDMETHODIMP OggDemuxPageSourceFilter::CheckCapabilities(DWORD *pCapabilities)
+STDMETHODIMP OggDemuxPacketSourceFilter::CheckCapabilities(DWORD *pCapabilities)
{
//debugLog<<"CheckCaps : Not impl"<<endl;
//TODO:::
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::IsFormatSupported(const GUID *pFormat)
+STDMETHODIMP OggDemuxPacketSourceFilter::IsFormatSupported(const GUID *pFormat)
{
//ASSERT(pFormat != NULL);
//if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
@@ -393,20 +393,20 @@
}
-STDMETHODIMP OggDemuxPageSourceFilter::QueryPreferredFormat(GUID *pFormat){
+STDMETHODIMP OggDemuxPacketSourceFilter::QueryPreferredFormat(GUID *pFormat){
//debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
*pFormat = TIME_FORMAT_MEDIA_TIME;
return S_OK;
}
-STDMETHODIMP OggDemuxPageSourceFilter::SetTimeFormat(const GUID *pFormat){
+STDMETHODIMP OggDemuxPacketSourceFilter::SetTimeFormat(const GUID *pFormat){
//debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetTimeFormat( GUID *pFormat){
+STDMETHODIMP OggDemuxPacketSourceFilter::GetTimeFormat( GUID *pFormat){
*pFormat = TIME_FORMAT_MEDIA_TIME;
return S_OK;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetStopPosition(LONGLONG *pStop){
+STDMETHODIMP OggDemuxPacketSourceFilter::GetStopPosition(LONGLONG *pStop){
//if (mSeekTable->enabled()) {
// //debugLog<<"GetStopPos = " << mSeekTable->fileDuration()<<" ds units"<<endl;
@@ -421,18 +421,18 @@
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetCurrentPosition(LONGLONG *pCurrent)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetCurrentPosition(LONGLONG *pCurrent)
{
//TODO::: Implement this properly
//debugLog<<"GetCurrentPos = NOT_IMPL"<<endl;
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat){
+STDMETHODIMP OggDemuxPacketSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat){
//debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags){
+STDMETHODIMP OggDemuxPacketSourceFilter::SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags){
//CAutoLock locLock(m_pLock);
@@ -495,13 +495,13 @@
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop)
{
//debugLog<<"Getpos : Not IMPL"<<endl;
//debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
+STDMETHODIMP OggDemuxPacketSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
//debugLog<<"****GetAvailable : NOT IMPL"<<endl;
//if (mSeekTable->enabled()) {
// //debugLog<<"Get Avail ok"<<endl;
@@ -517,25 +517,25 @@
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::SetRate(double dRate)
+STDMETHODIMP OggDemuxPacketSourceFilter::SetRate(double dRate)
{
//debugLog<<"Set RATE : NOT IMPL"<<endl;
return E_NOTIMPL;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetRate(double *dRate)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetRate(double *dRate)
{
*dRate = 1.0;
return S_OK;;
}
-STDMETHODIMP OggDemuxPageSourceFilter::GetPreroll(LONGLONG *pllPreroll)
+STDMETHODIMP OggDemuxPacketSourceFilter::GetPreroll(LONGLONG *pllPreroll)
{
*pllPreroll = 0;
//debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
return S_OK;
}
-STDMETHODIMP OggDemuxPageSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
+STDMETHODIMP OggDemuxPacketSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
//if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
// //debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
// return S_OK;
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -37,7 +37,7 @@
class OggStreamMapper;
-class OggDemuxPageSourceFilter
+class OggDemuxPacketSourceFilter
: public CBaseFilter
, public CAMThread
, public IFileSourceFilter
@@ -48,8 +48,8 @@
//, public IAMMediaContent
{
public:
- OggDemuxPageSourceFilter(void);
- virtual ~OggDemuxPageSourceFilter(void);
+ OggDemuxPacketSourceFilter(void);
+ virtual ~OggDemuxPacketSourceFilter(void);
//Com Stuff
DECLARE_IUNKNOWN
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -29,10 +29,10 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "StdAfx.h"
-#include ".\oggdemuxpagesourcepin.h"
+#include ".\OggDemuxPacketsourcepin.h"
-OggDemuxPageSourcePin:: OggDemuxPageSourcePin( TCHAR* inObjectName
- , OggDemuxPageSourceFilter* inParentFilter
+OggDemuxPacketSourcePin:: OggDemuxPacketSourcePin( TCHAR* inObjectName
+ , OggDemuxPacketSourceFilter* inParentFilter
, CCritSec* inFilterLock
, OggPage* inBOSPage)
: CBaseOutputPin( NAME("Ogg Demux Output Pin")
@@ -48,28 +48,28 @@
}
-OggDemuxPageSourcePin::~OggDemuxPageSourcePin(void)
+OggDemuxPacketSourcePin::~OggDemuxPacketSourcePin(void)
{
delete[] mBOSAsFormatBlock;
delete mBOSPage;
}
-bool OggDemuxPageSourcePin::acceptOggPage(OggPage* inOggPage)
+bool OggDemuxPacketSourcePin::acceptOggPage(OggPage* inOggPage)
{
//TODO:::
return true;
}
-BYTE* OggDemuxPageSourcePin::getBOSAsFormatBlock()
+BYTE* OggDemuxPacketSourcePin::getBOSAsFormatBlock()
{
return mBOSAsFormatBlock;
}
-unsigned long OggDemuxPageSourcePin::getSerialNo()
+unsigned long OggDemuxPacketSourcePin::getSerialNo()
{
return mBOSPage->header()->StreamSerialNo();
}
-IOggDecoder* OggDemuxPageSourcePin::getDecoderInterface()
+IOggDecoder* OggDemuxPacketSourcePin::getDecoderInterface()
{
if (mDecoderInterface == NULL) {
IOggDecoder* locDecoder = NULL;
@@ -85,7 +85,7 @@
return mDecoderInterface;
}
-HRESULT OggDemuxPageSourcePin::GetMediaType(int inPosition, CMediaType* outMediaType)
+HRESULT OggDemuxPacketSourcePin::GetMediaType(int inPosition, CMediaType* outMediaType)
{
//Put it in from the info we got in the constructor.
if (inPosition == 0) {
@@ -107,7 +107,7 @@
return VFW_S_NO_MORE_ITEMS;
}
}
-HRESULT OggDemuxPageSourcePin::CheckMediaType(const CMediaType* inMediaType) {
+HRESULT OggDemuxPacketSourcePin::CheckMediaType(const CMediaType* inMediaType) {
if ( (inMediaType->majortype == MEDIATYPE_OggPageStream)
&& (inMediaType->subtype == MEDIASUBTYPE_None)
&& (inMediaType->formattype == FORMAT_OggBOSPage)) {
@@ -118,7 +118,7 @@
return E_FAIL;
}
}
-HRESULT OggDemuxPageSourcePin::DecideBufferSize(IMemAllocator* inoutAllocator, ALLOCATOR_PROPERTIES* inoutInputRequest)
+HRESULT OggDemuxPacketSourcePin::DecideBufferSize(IMemAllocator* inoutAllocator, ALLOCATOR_PROPERTIES* inoutInputRequest)
{
HRESULT locHR = S_OK;
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourcePin.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -33,14 +33,14 @@
#include <libOOOgg/OggPage.h>
#include <libOOOgg/IOggCallback.h>
#include "IOggDecoder.h"
-class OggDemuxPageSourcePin
+class OggDemuxPacketSourcePin
: public CBaseOutputPin
, public IOggCallback
{
public:
- //OggDemuxPageSourcePin(void);
- OggDemuxPageSourcePin( TCHAR* inObjectName,
- OggDemuxPageSourceFilter* inParentFilter,
+ //OggDemuxPacketSourcePin(void);
+ OggDemuxPacketSourcePin( TCHAR* inObjectName,
+ OggDemuxPacketSourceFilter* inParentFilter,
CCritSec* inFilterLock,
OggPage* inBOSPage);
//StreamHeaders* inHeaderSource,
@@ -49,7 +49,7 @@
//bool inAllowSeek,
//unsigned long inNumBuffers,
//unsigned long inBufferSize);
- ~OggDemuxPageSourcePin(void);
+ ~OggDemuxPacketSourcePin(void);
static const unsigned long NUM_PAGE_BUFFERS = 100;
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -1,7 +1,7 @@
#include "StdAfx.h"
#include ".\oggstreammapper.h"
-OggStreamMapper::OggStreamMapper(OggDemuxPageSourceFilter* inParentFilter, CCritSec* inParentFilterLock)
+OggStreamMapper::OggStreamMapper(OggDemuxPacketSourceFilter* inParentFilter, CCritSec* inParentFilterLock)
: mStreamState(eStreamState::STRMAP_READY)
, mParentFilter(inParentFilter)
, mParentFilterLock(inParentFilterLock)
@@ -11,7 +11,7 @@
OggStreamMapper::~OggStreamMapper(void)
{
}
-OggDemuxPageSourcePin* OggStreamMapper::getPinByIndex(unsigned long inIndex)
+OggDemuxPacketSourcePin* OggStreamMapper::getPinByIndex(unsigned long inIndex)
{
if (inIndex < mPins.size()) {
return mPins[inIndex];
@@ -43,7 +43,7 @@
//Partial fall through
case STRMAP_PARSING_HEADERS:
if (!allStreamsReady()) {
- OggDemuxPageSourcePin* locPin = getMatchingPin(inOggPage->header()->StreamSerialNo());
+ OggDemuxPacketSourcePin* locPin = getMatchingPin(inOggPage->header()->StreamSerialNo());
//TODO::: NULL pointer check
IOggDecoder* locDecoder = locPin->getDecoderInterface();
if (locDecoder == NULL) {
@@ -78,7 +78,7 @@
//Partial fall through
case STRMAP_DATA:
{
- OggDemuxPageSourcePin* locPin = getMatchingPin(inOggPage->header()->StreamSerialNo());
+ OggDemuxPacketSourcePin* locPin = getMatchingPin(inOggPage->header()->StreamSerialNo());
return locPin->acceptOggPage(inOggPage);
}
case STRMAP_FINISHED:
@@ -94,7 +94,7 @@
bool OggStreamMapper::allStreamsReady()
{
bool locAllReady = true;
- //OggDemuxPageSourcePin* locPin = NULL;
+ //OggDemuxPacketSourcePin* locPin = NULL;
for (size_t i = 0; i < mPins.size(); i++) {
locAllReady = locAllReady && (mPins[i]->isStreamReady());
}
@@ -104,14 +104,14 @@
bool OggStreamMapper::addNewPin(OggPage* inOggPage)
{
- OggDemuxPageSourcePin* locNewPin = new OggDemuxPageSourcePin(NAME("OggPageSourcePin"), mParentFilter, mParentFilterLock, inOggPage);
+ OggDemuxPacketSourcePin* locNewPin = new OggDemuxPacketSourcePin(NAME("OggPageSourcePin"), mParentFilter, mParentFilterLock, inOggPage);
mPins.push_back(locNewPin);
return true;
}
-OggDemuxPageSourcePin* OggStreamMapper::getMatchingPin(unsigned long inSerialNo)
+OggDemuxPacketSourcePin* OggStreamMapper::getMatchingPin(unsigned long inSerialNo)
{
- OggDemuxPageSourcePin* locPin = NULL;
+ OggDemuxPacketSourcePin* locPin = NULL;
for (size_t i = 0; i < mPins.size(); i++) {
locPin = mPins[i];
if (locPin->getSerialNo() == inSerialNo) {
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -1,7 +1,7 @@
#pragma once
-//#include "OggDemuxPageSourcePin.h"
-//#include "OggDemuxPageSourceFilter.h"
+//#include "OggDemuxPacketSourcePin.h"
+//#include "OggDemuxPacketSourceFilter.h"
#include <libOOOgg/IOggCallback.h>
#include <vector>
@@ -22,7 +22,7 @@
STRMAP_ERROR
};
- OggStreamMapper(OggDemuxPageSourceFilter* inParentFilter, CCritSec* inParentFilterLock);
+ OggStreamMapper(OggDemuxPacketSourceFilter* inParentFilter, CCritSec* inParentFilterLock);
virtual ~OggStreamMapper(void);
//IOggCallback Interface
@@ -33,14 +33,14 @@
bool allStreamsReady();
unsigned long numPins() { return mPins.size(); }
- OggDemuxPageSourcePin* getPinByIndex(unsigned long inIndex);
+ OggDemuxPacketSourcePin* getPinByIndex(unsigned long inIndex);
protected:
eStreamState mStreamState;
- vector<OggDemuxPageSourcePin*> mPins;
- OggDemuxPageSourceFilter* mParentFilter;
+ vector<OggDemuxPacketSourcePin*> mPins;
+ OggDemuxPacketSourceFilter* mParentFilter;
CCritSec* mParentFilterLock;
bool addNewPin(OggPage* inOggPage);
- OggDemuxPageSourcePin* getMatchingPin(unsigned long inSerialNo);
+ OggDemuxPacketSourcePin* getMatchingPin(unsigned long inSerialNo);
};
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -14,16 +14,16 @@
//**********************************
// {C9361F5A-3282-4944-9899-6D99CDC5370B}
-DEFINE_GUID(CLSID_OggDemuxPageSourceFilter,
+DEFINE_GUID(CLSID_OggDemuxPacketSourceFilter,
0xc9361f5a, 0x3282, 0x4944, 0x98, 0x99, 0x6d, 0x99, 0xcd, 0xc5, 0x37, 0xb);
// {60891713-C24F-4767-B6C9-6CA05B3338FC}
-DEFINE_GUID(MEDIATYPE_OggPageStream,
+DEFINE_GUID(MEDIATYPE_OggPacketStream,
0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
// {95388704-162C-42a9-8149-C3577C12AAF9}
-DEFINE_GUID(FORMAT_OggBOSPage,
+DEFINE_GUID(FORMAT_OggIdentHeader,
0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
// {43F0F818-10B0-4c86-B9F1-F6B6E2D33462}
@@ -75,7 +75,7 @@
//Structure defining the registration details of the filter
-const REGFILTER2 OggDemuxPageSourceFilterReg = {
+const REGFILTER2 OggDemuxPacketSourceFilterReg = {
1,
MERIT_NORMAL,
0,
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2005-10-23 07:09:01 UTC (rev 10258)
@@ -66,12 +66,12 @@
}
hr = locFilterMapper->RegisterFilter(
- CLSID_OggDemuxPageSourceFilter, // Filter CLSID.
+ CLSID_OggDemuxPacketSourceFilter, // Filter CLSID.
L"Ogg Demux Page Source Filter", // Filter name.
NULL, // Device moniker.
&CLSID_LegacyAmFilterCategory, // Direct Show general category
L"Ogg Demux Page Source Filter", // Instance data. ???????
- &OggDemuxPageSourceFilterReg // Pointer to filter information.
+ &OggDemuxPacketSourceFilterReg // Pointer to filter information.
);
#if (!defined(DONT_TOUCH_REGISTRY))
@@ -113,7 +113,7 @@
hr = locFilterMapper->UnregisterFilter(&CLSID_LegacyAmFilterCategory,
- L"Ogg Demux Page Source Filter", CLSID_OggDemuxPageSourceFilter);
+ L"Ogg Demux Page Source Filter", CLSID_OggDemuxPacketSourceFilter);
//
locFilterMapper->Release();
Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h 2005-10-23 04:07:44 UTC (rev 10257)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h 2005-10-23 07:09:01 UTC (rev 10258)
@@ -55,9 +55,9 @@
#include <Initguid.h>
#include <Qnetwork.h>
#include "oggdllstuff.h"
-#include "OggDemuxPageSourceFilter.h"
+#include "OggDemuxPacketSourceFilter.h"
#include "ds_guids.h"
-#include "OggDemuxPageSourcePin.h"
+#include "OggDemuxPacketSourcePin.h"
//#include "OggStreamMapper.h"
More information about the commits
mailing list