[xiph-commits] r8445 -
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Thu Dec 16 05:46:21 PST 2004
Author: illiminable
Date: 2004-12-16 05:46:20 -0800 (Thu, 16 Dec 2004)
New Revision: 8445
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLAppControl.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.h
Log:
Fix end-of-line markers
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,331 +1,331 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#include "StdAfx.h"
-
-#include "cmmldecodefilter.h"
-
-//COM Factory Template
-CFactoryTemplate g_Templates[] =
-{
- {
- L"CMML Decode Filter", // Name
- &CLSID_CMMLDecodeFilter, // CLSID
- CMMLDecodeFilter::CreateInstance, // Method to create an instance of Speex Decoder
- 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]);
-
-//-----------------------------------------------------------
-CMMLDecodeFilter::CMMLDecodeFilter(void)
- : CTransformFilter(NAME("CMML Decoder"), NULL, CLSID_CMMLDecodeFilter)
-
- , mCMMLParser(NULL)
- , mSeenHead(false)
- , mHeadTag(NULL)
- , mCMMLCallbacks(NULL)
-{
- //debugLog.open("G:\\logs\\cmml_decode.logs", ios_base::out);
- mCMMLParser = new CMMLParser;
- //debugLog.open("C:\\Temp\\cmmlfilter.log", ios_base::out);
- //debugLog<<"*** Log Begins ***"<<endl;
-}
-
-CMMLDecodeFilter::~CMMLDecodeFilter(void)
-{
- //debugLog<<"*** Log Ends ***"<<endl;
- //debugLog.close();
- delete mCMMLParser;
-}
-
-CUnknown* WINAPI CMMLDecodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
-{
- //This routine is the COM implementation to create a new Filter
- CMMLDecodeFilter *pNewObject = new CMMLDecodeFilter();
- if (pNewObject == NULL) {
- *pHr = E_OUTOFMEMORY;
- }
- return pNewObject;
-}
-
-STDMETHODIMP CMMLDecodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
- if (riid == IID_ICMMLAppControl) {
- *ppv = (ICMMLAppControl*)this;
- ((IUnknown*)*ppv)->AddRef();
- return NOERROR;
- }
-
- return CTransformFilter::NonDelegatingQueryInterface(riid, ppv);
-}
-
-HRESULT CMMLDecodeFilter::CheckInputType(const CMediaType* inInputMediaType) {
- if ( (inInputMediaType->majortype == MEDIATYPE_Text) &&
- (inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
- (inInputMediaType->formattype == FORMAT_CMML) ){
-
- //debugLog<<"Input Type Accepted"<<endl;
- return S_OK;
- } else {
- return VFW_E_TYPE_NOT_ACCEPTED;
- }
-}
-HRESULT CMMLDecodeFilter::CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType) {
- if ( (inInputMediaType->majortype == MEDIATYPE_Text) &&
- (inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
- (inInputMediaType->formattype == FORMAT_CMML) &&
- (inOutputMediaType->majortype == MEDIATYPE_Text) &&
- (inOutputMediaType->subtype == MEDIASUBTYPE_SubtitleVMR9) ){
-
- //debugLog << "Transform Accepted"<<endl;
- return S_OK;
- } else {
- return VFW_E_TYPE_NOT_ACCEPTED;
- }
-
-}
-HRESULT CMMLDecodeFilter::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest) {
- //FIX::: Abstract this out properly
-
- HRESULT locHR = S_OK;
-
- ALLOCATOR_PROPERTIES locReqAlloc;
- ALLOCATOR_PROPERTIES locActualAlloc;
-
- const unsigned long MIN_BUFFER_SIZE = 1024;
- const unsigned long DEFAULT_BUFFER_SIZE = 4096;
- const unsigned long MIN_NUM_BUFFERS = 10;
- const unsigned long DEFAULT_NUM_BUFFERS = 15;
-
-
-
-
- if (inPropertyRequest->cbAlign <= 0) {
- locReqAlloc.cbAlign = 1;
- } else {
- locReqAlloc.cbAlign = inPropertyRequest->cbAlign;
- }
-
-
- if (inPropertyRequest->cbBuffer < MIN_BUFFER_SIZE) {
- locReqAlloc.cbBuffer = DEFAULT_BUFFER_SIZE;
- } else {
- locReqAlloc.cbBuffer = inPropertyRequest->cbBuffer;
- }
-
-
- if (inPropertyRequest->cbPrefix < 0) {
- locReqAlloc.cbPrefix = 0;
- } else {
- locReqAlloc.cbPrefix = inPropertyRequest->cbPrefix;
- }
-
-
- if (inPropertyRequest->cBuffers < MIN_NUM_BUFFERS) {
- locReqAlloc.cBuffers = DEFAULT_NUM_BUFFERS;
- } else {
- locReqAlloc.cBuffers = inPropertyRequest->cBuffers;
- }
-
-
- locHR = inAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
-
- if (locHR != S_OK) {
- return locHR;
- }
-
- locHR = inAllocator->Commit();
-
- return locHR;
-}
-HRESULT CMMLDecodeFilter::GetMediaType(int inPosition, CMediaType* outMediaType) {
- if (inPosition < 0) {
- return E_INVALIDARG;
- } else if (inPosition == 0) {
- outMediaType->majortype = MEDIATYPE_Text;
- outMediaType->subtype = MEDIASUBTYPE_SubtitleVMR9;
- return S_OK;
- } else {
- return VFW_S_NO_MORE_ITEMS;
- }
-}
-HRESULT CMMLDecodeFilter::Transform(IMediaSample* inSample, IMediaSample* outSample) {
- //inSample->AddRef();
- //debugLog<<"In sample ref count = "<<inSample->Release();
-
- //outSample->AddRef();
- //debugLog<<"Out sample ref count = "<<outSample->Release();
-
- unsigned long locSize = inSample->GetActualDataLength();
- char* locCMML = NULL;
- BYTE* locInBuff = NULL;
- BYTE* locOutBuff = NULL;
- HRESULT locHR = S_FALSE;
- wstring locWCMML;
- char* locText = NULL;
- string locTextStr;
- unsigned long locTextSize = 0;
- //outSample->SetMediaTime(NULL, NULL);
-
- LONGLONG locStart, locEnd;
- inSample->GetTime(&locStart, &locEnd);
- //debugLog<<"Input Sample Time : "<<locStart<<" to "<<locEnd<<endl;
- LONGLONG locSampleTime = locStart;
- inSample->GetMediaTime(&locStart, &locEnd);
- //debugLog<<"Input Sample Media Time : "<<locStart<<" to "<<locEnd<<endl;
- locSampleTime -= locStart;
- //debugLog<<"Corrected Sample time = "<<locSampleTime<<endl;
- //debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
- if (locSize > 0) {
- locCMML = new char[locSize+1];
- locCMML[locSize] = '\0';
-
- locHR = inSample->GetPointer(&locInBuff);
- memcpy((void*)locCMML, (const void*) locInBuff, locSize);
- //debugLog<<" : Sample Text = "<<locCMML<<endl<<endl;
- locWCMML = toWStr(locCMML);
- if (mSeenHead == false) {
- //debugLog << " : Processing a head tag"<<endl;
- //Head tag... needs error checks
- mSeenHead = true;
- mHeadTag = new C_HeadTag;
- bool locParseOK = mCMMLParser->parseHeadTag(locWCMML, mHeadTag);
- if (locParseOK) {
- //debugLog<<" : Parse OK"<<endl;
-
- //:::Comment out the subtitle sending for now.
- //------------------------------------------------------------
- //locHR = outSample->GetPointer(&locOutBuff);
- //locTextSize = mHeadTag->title()->text().size();
- //locTextStr = mHeadTag->title()->text();
- //
- ////debugLog<<" : Title Text = "<<locTextStr<<endl;
- //memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
- //locOutBuff[locTextSize] = '\0';
- //outSample->SetActualDataLength(locTextSize + 1);
- //------------------------------------------------------------
- outSample->SetActualDataLength(0);
- //------------------------------------------------------------
-
-
- if (mCMMLCallbacks != NULL) {
- mCMMLCallbacks->headCallback(mHeadTag->clone());
- }
- } else {
- //debugLog<<" : Parse FAILED"<<endl;
- }
-
- } else {
- //Clip Tag... needs error checks
- //debugLog << " : Processing a clip tag"<<endl;
- C_ClipTag locClipTag;
- bool locParseOK = mCMMLParser->parseClipTag(locWCMML, &locClipTag);
- if (locParseOK) {
- //debugLog<<" : Parse OK"<<endl;
-
- //::: Comment out the subtitle part for now
- //------------------------------------------------------------
- //locHR = outSample->GetPointer(&locOutBuff);
- //locTextSize = locClipTag.anchor()->text().size();
- //locTextStr = locClipTag.anchor()->text();
- //memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
- //
- ////debugLog << " : Clip Text = "<<locTextStr<<endl;
- //locOutBuff[locTextSize] = '\0';
- //outSample->SetActualDataLength(locTextSize + 1);
- ////debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
- ////LONGLONG locSampleTime = ;
- //outSample->SetTime(&locSampleTime, &locSampleTime);
- //outSample->SetMediaTime(NULL, NULL);
- //outSample->SetSyncPoint(TRUE);
- //outSample->SetDiscontinuity(FALSE);
- //outSample->SetPreroll(FALSE);
- //------------------------------------------------------------
- outSample->SetActualDataLength(0);
- //------------------------------------------------------------
- if (mCMMLCallbacks != NULL) {
- mCMMLCallbacks->clipCallback(locClipTag.clone());
- }
-
- } else {
- //debugLog<<" : Parse FAILED"<<endl;
- delete[] locCMML;
- return S_FALSE;
- }
- }
-
- //debugLog<<"Returning... "<<endl<<endl;
- delete[] locCMML;
- return S_OK;
-
- } else {
- //Zero length Sample... Blank out... Don't send.
- //debugLog<<"Zero length sample..."<<endl;
- outSample->SetActualDataLength(0);
- //debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
- //LONGLONG locSampleTime = ;
- outSample->SetTime(&locSampleTime, &locSampleTime);
- outSample->SetMediaTime(NULL, NULL);
- outSample->SetSyncPoint(TRUE);
- outSample->SetDiscontinuity(FALSE);
- outSample->SetPreroll(FALSE);
- return S_OK;
- }
-}
-
-wstring CMMLDecodeFilter::toWStr(string inString) {
- wstring retVal;
-
- //LPCWSTR retPtr = new wchar_t[retVal.length() + 1];
- for (std::string::const_iterator i = inString.begin(); i != inString.end(); i++) {
- retVal.append(1, *i);
- }
-
-
- return retVal;
-}
-
-//Implementation of ICMMLAppControl
-STDMETHODIMP_(bool) CMMLDecodeFilter::setCallbacks(ICMMLCallbacks* inCallbacks) {
- mCMMLCallbacks = inCallbacks;
- return true;
-}
-STDMETHODIMP_(ICMMLCallbacks*) CMMLDecodeFilter::getCallbacks() {
- return mCMMLCallbacks;
-}
-
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "StdAfx.h"
+
+#include "cmmldecodefilter.h"
+
+//COM Factory Template
+CFactoryTemplate g_Templates[] =
+{
+ {
+ L"CMML Decode Filter", // Name
+ &CLSID_CMMLDecodeFilter, // CLSID
+ CMMLDecodeFilter::CreateInstance, // Method to create an instance of Speex Decoder
+ 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]);
+
+//-----------------------------------------------------------
+CMMLDecodeFilter::CMMLDecodeFilter(void)
+ : CTransformFilter(NAME("CMML Decoder"), NULL, CLSID_CMMLDecodeFilter)
+
+ , mCMMLParser(NULL)
+ , mSeenHead(false)
+ , mHeadTag(NULL)
+ , mCMMLCallbacks(NULL)
+{
+ //debugLog.open("G:\\logs\\cmml_decode.logs", ios_base::out);
+ mCMMLParser = new CMMLParser;
+ //debugLog.open("C:\\Temp\\cmmlfilter.log", ios_base::out);
+ //debugLog<<"*** Log Begins ***"<<endl;
+}
+
+CMMLDecodeFilter::~CMMLDecodeFilter(void)
+{
+ //debugLog<<"*** Log Ends ***"<<endl;
+ //debugLog.close();
+ delete mCMMLParser;
+}
+
+CUnknown* WINAPI CMMLDecodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr)
+{
+ //This routine is the COM implementation to create a new Filter
+ CMMLDecodeFilter *pNewObject = new CMMLDecodeFilter();
+ if (pNewObject == NULL) {
+ *pHr = E_OUTOFMEMORY;
+ }
+ return pNewObject;
+}
+
+STDMETHODIMP CMMLDecodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+ if (riid == IID_ICMMLAppControl) {
+ *ppv = (ICMMLAppControl*)this;
+ ((IUnknown*)*ppv)->AddRef();
+ return NOERROR;
+ }
+
+ return CTransformFilter::NonDelegatingQueryInterface(riid, ppv);
+}
+
+HRESULT CMMLDecodeFilter::CheckInputType(const CMediaType* inInputMediaType) {
+ if ( (inInputMediaType->majortype == MEDIATYPE_Text) &&
+ (inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
+ (inInputMediaType->formattype == FORMAT_CMML) ){
+
+ //debugLog<<"Input Type Accepted"<<endl;
+ return S_OK;
+ } else {
+ return VFW_E_TYPE_NOT_ACCEPTED;
+ }
+}
+HRESULT CMMLDecodeFilter::CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType) {
+ if ( (inInputMediaType->majortype == MEDIATYPE_Text) &&
+ (inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
+ (inInputMediaType->formattype == FORMAT_CMML) &&
+ (inOutputMediaType->majortype == MEDIATYPE_Text) &&
+ (inOutputMediaType->subtype == MEDIASUBTYPE_SubtitleVMR9) ){
+
+ //debugLog << "Transform Accepted"<<endl;
+ return S_OK;
+ } else {
+ return VFW_E_TYPE_NOT_ACCEPTED;
+ }
+
+}
+HRESULT CMMLDecodeFilter::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest) {
+ //FIX::: Abstract this out properly
+
+ HRESULT locHR = S_OK;
+
+ ALLOCATOR_PROPERTIES locReqAlloc;
+ ALLOCATOR_PROPERTIES locActualAlloc;
+
+ const unsigned long MIN_BUFFER_SIZE = 1024;
+ const unsigned long DEFAULT_BUFFER_SIZE = 4096;
+ const unsigned long MIN_NUM_BUFFERS = 10;
+ const unsigned long DEFAULT_NUM_BUFFERS = 15;
+
+
+
+
+ if (inPropertyRequest->cbAlign <= 0) {
+ locReqAlloc.cbAlign = 1;
+ } else {
+ locReqAlloc.cbAlign = inPropertyRequest->cbAlign;
+ }
+
+
+ if (inPropertyRequest->cbBuffer < MIN_BUFFER_SIZE) {
+ locReqAlloc.cbBuffer = DEFAULT_BUFFER_SIZE;
+ } else {
+ locReqAlloc.cbBuffer = inPropertyRequest->cbBuffer;
+ }
+
+
+ if (inPropertyRequest->cbPrefix < 0) {
+ locReqAlloc.cbPrefix = 0;
+ } else {
+ locReqAlloc.cbPrefix = inPropertyRequest->cbPrefix;
+ }
+
+
+ if (inPropertyRequest->cBuffers < MIN_NUM_BUFFERS) {
+ locReqAlloc.cBuffers = DEFAULT_NUM_BUFFERS;
+ } else {
+ locReqAlloc.cBuffers = inPropertyRequest->cBuffers;
+ }
+
+
+ locHR = inAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
+
+ if (locHR != S_OK) {
+ return locHR;
+ }
+
+ locHR = inAllocator->Commit();
+
+ return locHR;
+}
+HRESULT CMMLDecodeFilter::GetMediaType(int inPosition, CMediaType* outMediaType) {
+ if (inPosition < 0) {
+ return E_INVALIDARG;
+ } else if (inPosition == 0) {
+ outMediaType->majortype = MEDIATYPE_Text;
+ outMediaType->subtype = MEDIASUBTYPE_SubtitleVMR9;
+ return S_OK;
+ } else {
+ return VFW_S_NO_MORE_ITEMS;
+ }
+}
+HRESULT CMMLDecodeFilter::Transform(IMediaSample* inSample, IMediaSample* outSample) {
+ //inSample->AddRef();
+ //debugLog<<"In sample ref count = "<<inSample->Release();
+
+ //outSample->AddRef();
+ //debugLog<<"Out sample ref count = "<<outSample->Release();
+
+ unsigned long locSize = inSample->GetActualDataLength();
+ char* locCMML = NULL;
+ BYTE* locInBuff = NULL;
+ BYTE* locOutBuff = NULL;
+ HRESULT locHR = S_FALSE;
+ wstring locWCMML;
+ char* locText = NULL;
+ string locTextStr;
+ unsigned long locTextSize = 0;
+ //outSample->SetMediaTime(NULL, NULL);
+
+ LONGLONG locStart, locEnd;
+ inSample->GetTime(&locStart, &locEnd);
+ //debugLog<<"Input Sample Time : "<<locStart<<" to "<<locEnd<<endl;
+ LONGLONG locSampleTime = locStart;
+ inSample->GetMediaTime(&locStart, &locEnd);
+ //debugLog<<"Input Sample Media Time : "<<locStart<<" to "<<locEnd<<endl;
+ locSampleTime -= locStart;
+ //debugLog<<"Corrected Sample time = "<<locSampleTime<<endl;
+ //debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
+ if (locSize > 0) {
+ locCMML = new char[locSize+1];
+ locCMML[locSize] = '\0';
+
+ locHR = inSample->GetPointer(&locInBuff);
+ memcpy((void*)locCMML, (const void*) locInBuff, locSize);
+ //debugLog<<" : Sample Text = "<<locCMML<<endl<<endl;
+ locWCMML = toWStr(locCMML);
+ if (mSeenHead == false) {
+ //debugLog << " : Processing a head tag"<<endl;
+ //Head tag... needs error checks
+ mSeenHead = true;
+ mHeadTag = new C_HeadTag;
+ bool locParseOK = mCMMLParser->parseHeadTag(locWCMML, mHeadTag);
+ if (locParseOK) {
+ //debugLog<<" : Parse OK"<<endl;
+
+ //:::Comment out the subtitle sending for now.
+ //------------------------------------------------------------
+ //locHR = outSample->GetPointer(&locOutBuff);
+ //locTextSize = mHeadTag->title()->text().size();
+ //locTextStr = mHeadTag->title()->text();
+ //
+ ////debugLog<<" : Title Text = "<<locTextStr<<endl;
+ //memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
+ //locOutBuff[locTextSize] = '\0';
+ //outSample->SetActualDataLength(locTextSize + 1);
+ //------------------------------------------------------------
+ outSample->SetActualDataLength(0);
+ //------------------------------------------------------------
+
+
+ if (mCMMLCallbacks != NULL) {
+ mCMMLCallbacks->headCallback(mHeadTag->clone());
+ }
+ } else {
+ //debugLog<<" : Parse FAILED"<<endl;
+ }
+
+ } else {
+ //Clip Tag... needs error checks
+ //debugLog << " : Processing a clip tag"<<endl;
+ C_ClipTag locClipTag;
+ bool locParseOK = mCMMLParser->parseClipTag(locWCMML, &locClipTag);
+ if (locParseOK) {
+ //debugLog<<" : Parse OK"<<endl;
+
+ //::: Comment out the subtitle part for now
+ //------------------------------------------------------------
+ //locHR = outSample->GetPointer(&locOutBuff);
+ //locTextSize = locClipTag.anchor()->text().size();
+ //locTextStr = locClipTag.anchor()->text();
+ //memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
+ //
+ ////debugLog << " : Clip Text = "<<locTextStr<<endl;
+ //locOutBuff[locTextSize] = '\0';
+ //outSample->SetActualDataLength(locTextSize + 1);
+ ////debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
+ ////LONGLONG locSampleTime = ;
+ //outSample->SetTime(&locSampleTime, &locSampleTime);
+ //outSample->SetMediaTime(NULL, NULL);
+ //outSample->SetSyncPoint(TRUE);
+ //outSample->SetDiscontinuity(FALSE);
+ //outSample->SetPreroll(FALSE);
+ //------------------------------------------------------------
+ outSample->SetActualDataLength(0);
+ //------------------------------------------------------------
+ if (mCMMLCallbacks != NULL) {
+ mCMMLCallbacks->clipCallback(locClipTag.clone());
+ }
+
+ } else {
+ //debugLog<<" : Parse FAILED"<<endl;
+ delete[] locCMML;
+ return S_FALSE;
+ }
+ }
+
+ //debugLog<<"Returning... "<<endl<<endl;
+ delete[] locCMML;
+ return S_OK;
+
+ } else {
+ //Zero length Sample... Blank out... Don't send.
+ //debugLog<<"Zero length sample..."<<endl;
+ outSample->SetActualDataLength(0);
+ //debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
+ //LONGLONG locSampleTime = ;
+ outSample->SetTime(&locSampleTime, &locSampleTime);
+ outSample->SetMediaTime(NULL, NULL);
+ outSample->SetSyncPoint(TRUE);
+ outSample->SetDiscontinuity(FALSE);
+ outSample->SetPreroll(FALSE);
+ return S_OK;
+ }
+}
+
+wstring CMMLDecodeFilter::toWStr(string inString) {
+ wstring retVal;
+
+ //LPCWSTR retPtr = new wchar_t[retVal.length() + 1];
+ for (std::string::const_iterator i = inString.begin(); i != inString.end(); i++) {
+ retVal.append(1, *i);
+ }
+
+
+ return retVal;
+}
+
+//Implementation of ICMMLAppControl
+STDMETHODIMP_(bool) CMMLDecodeFilter::setCallbacks(ICMMLCallbacks* inCallbacks) {
+ mCMMLCallbacks = inCallbacks;
+ return true;
+}
+STDMETHODIMP_(ICMMLCallbacks*) CMMLDecodeFilter::getCallbacks() {
+ return mCMMLCallbacks;
+}
+
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,77 +1,77 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#pragma once
-#include "cmmldecoderdllstuff.h"
-#include <string>
-#include <fstream>
-#include "StringHelper.h"
-#include "libWinCMMLParse.h"
-#include "CMMLParser.h"
-#include "libCMMLTags.h"
-#include "ICMMLAppControl.h"
-using namespace std;
-class CMMLDecodeFilter
- : public CTransformFilter
- , public ICMMLAppControl
-{
-public:
- CMMLDecodeFilter(void);
- virtual ~CMMLDecodeFilter(void);
- //COM Creator Function
- DECLARE_IUNKNOWN
- static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
- STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
-
- //Implement the Tranform filter interface
- HRESULT CheckInputType(const CMediaType* inInputMediaType);
- HRESULT CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType);
- HRESULT DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest);
- HRESULT GetMediaType(int inPosition, CMediaType* outMediaType);
- HRESULT Transform(IMediaSample* inSample, IMediaSample* outSample);
-
- //Implement ICMMLAppControl
- virtual STDMETHODIMP_(bool) setCallbacks(ICMMLCallbacks* inCallbacks);
- virtual STDMETHODIMP_(ICMMLCallbacks*) getCallbacks();
-protected:
- wstring toWStr(string inString);
- CMMLParser* mCMMLParser;
- bool mSeenHead;
- C_HeadTag* mHeadTag;
- ICMMLCallbacks* mCMMLCallbacks;
-
- //fstream debugLog;
-
-
-};
\ No newline at end of file
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+#include "cmmldecoderdllstuff.h"
+#include <string>
+#include <fstream>
+#include "StringHelper.h"
+#include "libWinCMMLParse.h"
+#include "CMMLParser.h"
+#include "libCMMLTags.h"
+#include "ICMMLAppControl.h"
+using namespace std;
+class CMMLDecodeFilter
+ : public CTransformFilter
+ , public ICMMLAppControl
+{
+public:
+ CMMLDecodeFilter(void);
+ virtual ~CMMLDecodeFilter(void);
+ //COM Creator Function
+ DECLARE_IUNKNOWN
+ static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
+ //Implement the Tranform filter interface
+ HRESULT CheckInputType(const CMediaType* inInputMediaType);
+ HRESULT CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType);
+ HRESULT DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest);
+ HRESULT GetMediaType(int inPosition, CMediaType* outMediaType);
+ HRESULT Transform(IMediaSample* inSample, IMediaSample* outSample);
+
+ //Implement ICMMLAppControl
+ virtual STDMETHODIMP_(bool) setCallbacks(ICMMLCallbacks* inCallbacks);
+ virtual STDMETHODIMP_(ICMMLCallbacks*) getCallbacks();
+protected:
+ wstring toWStr(string inString);
+ CMMLParser* mCMMLParser;
+ bool mSeenHead;
+ C_HeadTag* mHeadTag;
+ ICMMLCallbacks* mCMMLCallbacks;
+
+ //fstream debugLog;
+
+
+};
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,5 +1,5 @@
-#pragma once
-#pragma message("Getting CMML IIDS")
-// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
-DEFINE_GUID(IID_ICMMLAppControl,
-0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
+#pragma once
+#pragma message("Getting CMML IIDS")
+// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
+DEFINE_GUID(IID_ICMMLAppControl,
+0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLAppControl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLAppControl.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLAppControl.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,56 +1,56 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#pragma once
-#include "ICMMLCallbacks.h"
-
-#ifndef __ICMMLAPPCONTROL__
-#define __ICMMLAPPCONTROL__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-DECLARE_INTERFACE_(ICMMLAppControl, IUnknown) {
-
- virtual STDMETHODIMP_(bool) setCallbacks(ICMMLCallbacks* inCallbacks) PURE;
- virtual STDMETHODIMP_(ICMMLCallbacks*) getCallbacks() PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
\ No newline at end of file
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+#include "ICMMLCallbacks.h"
+
+#ifndef __ICMMLAPPCONTROL__
+#define __ICMMLAPPCONTROL__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+DECLARE_INTERFACE_(ICMMLAppControl, IUnknown) {
+
+ virtual STDMETHODIMP_(bool) setCallbacks(ICMMLCallbacks* inCallbacks) PURE;
+ virtual STDMETHODIMP_(ICMMLCallbacks*) getCallbacks() PURE;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLAppControl.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,43 +1,43 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#pragma once
-#include "libCMMLTags.h"
-
-class ICMMLCallbacks
-{
-public:
- virtual bool clipCallback(C_ClipTag* inClipTag) = 0;
- virtual bool headCallback(C_HeadTag* inHeadTag) = 0;
-};
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+#include "libCMMLTags.h"
+
+class ICMMLCallbacks
+{
+public:
+ virtual bool clipCallback(C_ClipTag* inClipTag) = 0;
+ virtual bool headCallback(C_HeadTag* inHeadTag) = 0;
+};
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,102 +1,102 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-#include "StdAfx.h"
-#include "cmmldecoderdllstuff.h"
-
-extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
-{
- return DllEntryPoint((HINSTANCE)(hModule), dwReason, lpReserved);
-}
-
-
-
-//The folowing two functions do the registration and deregistration of the dll and it's contained com objects.
-STDAPI DllRegisterServer()
-{
-
-
- HRESULT hr;
- IFilterMapper2* locFilterMapper = NULL;
-
- hr = AMovieDllRegisterServer2(TRUE);
-
-
-
-
- hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
-
-
- hr = locFilterMapper->RegisterFilter(
- CLSID_CMMLDecodeFilter, // Filter CLSID.
- L"CMML Decode Filter", // Filter name.
- NULL, // Device moniker.
- &CLSID_LegacyAmFilterCategory, // Direct Show general category
- L"CMML Decode Filter", // Instance data. ???????
- &CMMLDecodeFilterReg // Pointer to filter information.
- );
-
- locFilterMapper->Release();
-
- return hr;
-
-}
-
-STDAPI DllUnregisterServer()
-{
- HRESULT hr;
- IFilterMapper2* locFilterMapper = NULL;
-
- hr = AMovieDllRegisterServer2(FALSE);
- if (FAILED(hr)) {
-
- return hr;
- }
-
- hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,
- IID_IFilterMapper2, (void **)&locFilterMapper);
-
- if (FAILED(hr)) {
- return hr;
- }
-
-
- hr = locFilterMapper->UnregisterFilter(&CLSID_LegacyAmFilterCategory, L"CMML Decode Filter", CLSID_CMMLDecodeFilter);
-
-
- //
- locFilterMapper->Release();
- return hr;
-
-}
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+#include "StdAfx.h"
+#include "cmmldecoderdllstuff.h"
+
+extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
+BOOL APIENTRY DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
+{
+ return DllEntryPoint((HINSTANCE)(hModule), dwReason, lpReserved);
+}
+
+
+
+//The folowing two functions do the registration and deregistration of the dll and it's contained com objects.
+STDAPI DllRegisterServer()
+{
+
+
+ HRESULT hr;
+ IFilterMapper2* locFilterMapper = NULL;
+
+ hr = AMovieDllRegisterServer2(TRUE);
+
+
+
+
+ hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
+
+
+ hr = locFilterMapper->RegisterFilter(
+ CLSID_CMMLDecodeFilter, // Filter CLSID.
+ L"CMML Decode Filter", // Filter name.
+ NULL, // Device moniker.
+ &CLSID_LegacyAmFilterCategory, // Direct Show general category
+ L"CMML Decode Filter", // Instance data. ???????
+ &CMMLDecodeFilterReg // Pointer to filter information.
+ );
+
+ locFilterMapper->Release();
+
+ return hr;
+
+}
+
+STDAPI DllUnregisterServer()
+{
+ HRESULT hr;
+ IFilterMapper2* locFilterMapper = NULL;
+
+ hr = AMovieDllRegisterServer2(FALSE);
+ if (FAILED(hr)) {
+
+ return hr;
+ }
+
+ hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,
+ IID_IFilterMapper2, (void **)&locFilterMapper);
+
+ if (FAILED(hr)) {
+ return hr;
+ }
+
+
+ hr = locFilterMapper->UnregisterFilter(&CLSID_LegacyAmFilterCategory, L"CMML Decode Filter", CLSID_CMMLDecodeFilter);
+
+
+ //
+ locFilterMapper->Release();
+ return hr;
+
+}
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,110 +1,110 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#pragma once
-#include <streams.h>
-#include <pullpin.h>
-#include <initguid.h>
-
-#include "CMMLDecoderIIDs.h"
-// {966D76B4-7D2F-4f01-B840-94E425D2214F}
-DEFINE_GUID(MEDIASUBTYPE_SubtitleVMR9,
-0x966d76b4, 0x7d2f, 0x4f01, 0xb8, 0x40, 0x94, 0xe4, 0x25, 0xd2, 0x21, 0x4f);
-
-// {53696C76-6961-40b2-B136-436F6E726164}
-DEFINE_GUID(FORMAT_CMML,
-0x53696c76, 0x6961, 0x40b2, 0xb1, 0x36, 0x43, 0x6f, 0x6e, 0x72, 0x61, 0x64);
-
-
-// {5A656E74-6172-6F26-B79C-D6416E647282}
-DEFINE_GUID(MEDIASUBTYPE_CMML,
-0x5a656e74, 0x6172, 0x6f26, 0xb7, 0x9c, 0xd6, 0x41, 0x6e, 0x64, 0x72, 0x82);
-
-// {BF1121D1-8739-45e1-BCD8-90B828F643AB}
-DEFINE_GUID(CLSID_CMMLDecodeFilter,
-0xbf1121d1, 0x8739, 0x45e1, 0xbc, 0xd8, 0x90, 0xb8, 0x28, 0xf6, 0x43, 0xab);
-
-//This structure defines the type of input we accept on the input pin... Stream/Annodex
-
-const REGPINTYPES CMMLDecodeOutputTypes = {
- &MEDIATYPE_Text,
- &MEDIASUBTYPE_SubtitleVMR9
-};
-
-const REGPINTYPES CMMLDecodeInputTypes = {
- &MEDIATYPE_Text,
- &MEDIASUBTYPE_CMML
-};
-const REGFILTERPINS CMMLDecodePinReg[] = {
- {
- L"CMML Input", //Name (obsoleted)
- FALSE, //Renders from this pin ?? Not sure about this.
- FALSE, //Not an output pin
- FALSE, //Cannot have zero instances of this pin
- FALSE, //Cannot have more than one instance of this pin
- NULL, //Connects to filter (obsoleted)
- NULL, //Connects to pin (obsoleted)
- 1, //upport two media type
- &CMMLDecodeInputTypes //Pointer to media type (Audio/Vorbis or Audio/Speex)
- } ,
-
- {
- L"Subtitle VMR9 Output", //Name (obsoleted)
- FALSE, //Renders from this pin ?? Not sure about this.
- TRUE, //Is an output pin
- FALSE, //Cannot have zero instances of this pin
- FALSE, //Cannot have more than one instance of this pin
- NULL, //Connects to filter (obsoleted)
- NULL, //Connects to pin (obsoleted)
- 1, //Only support one media type
- &CMMLDecodeOutputTypes //Pointer to media type (Audio/PCM)
-
- }
-};
-
-
-
-const REGFILTER2 CMMLDecodeFilterReg = {
- 1,
- MERIT_PREFERRED + 2,
- 2,
- CMMLDecodePinReg
-
-};
-
-
-struct sCMMLFormatBlock {
- __int64 granuleNumerator;
- __int64 granuleDenominator;
-};
\ No newline at end of file
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+#include <streams.h>
+#include <pullpin.h>
+#include <initguid.h>
+
+#include "CMMLDecoderIIDs.h"
+// {966D76B4-7D2F-4f01-B840-94E425D2214F}
+DEFINE_GUID(MEDIASUBTYPE_SubtitleVMR9,
+0x966d76b4, 0x7d2f, 0x4f01, 0xb8, 0x40, 0x94, 0xe4, 0x25, 0xd2, 0x21, 0x4f);
+
+// {53696C76-6961-40b2-B136-436F6E726164}
+DEFINE_GUID(FORMAT_CMML,
+0x53696c76, 0x6961, 0x40b2, 0xb1, 0x36, 0x43, 0x6f, 0x6e, 0x72, 0x61, 0x64);
+
+
+// {5A656E74-6172-6F26-B79C-D6416E647282}
+DEFINE_GUID(MEDIASUBTYPE_CMML,
+0x5a656e74, 0x6172, 0x6f26, 0xb7, 0x9c, 0xd6, 0x41, 0x6e, 0x64, 0x72, 0x82);
+
+// {BF1121D1-8739-45e1-BCD8-90B828F643AB}
+DEFINE_GUID(CLSID_CMMLDecodeFilter,
+0xbf1121d1, 0x8739, 0x45e1, 0xbc, 0xd8, 0x90, 0xb8, 0x28, 0xf6, 0x43, 0xab);
+
+//This structure defines the type of input we accept on the input pin... Stream/Annodex
+
+const REGPINTYPES CMMLDecodeOutputTypes = {
+ &MEDIATYPE_Text,
+ &MEDIASUBTYPE_SubtitleVMR9
+};
+
+const REGPINTYPES CMMLDecodeInputTypes = {
+ &MEDIATYPE_Text,
+ &MEDIASUBTYPE_CMML
+};
+const REGFILTERPINS CMMLDecodePinReg[] = {
+ {
+ L"CMML Input", //Name (obsoleted)
+ FALSE, //Renders from this pin ?? Not sure about this.
+ FALSE, //Not an output pin
+ FALSE, //Cannot have zero instances of this pin
+ FALSE, //Cannot have more than one instance of this pin
+ NULL, //Connects to filter (obsoleted)
+ NULL, //Connects to pin (obsoleted)
+ 1, //upport two media type
+ &CMMLDecodeInputTypes //Pointer to media type (Audio/Vorbis or Audio/Speex)
+ } ,
+
+ {
+ L"Subtitle VMR9 Output", //Name (obsoleted)
+ FALSE, //Renders from this pin ?? Not sure about this.
+ TRUE, //Is an output pin
+ FALSE, //Cannot have zero instances of this pin
+ FALSE, //Cannot have more than one instance of this pin
+ NULL, //Connects to filter (obsoleted)
+ NULL, //Connects to pin (obsoleted)
+ 1, //Only support one media type
+ &CMMLDecodeOutputTypes //Pointer to media type (Audio/PCM)
+
+ }
+};
+
+
+
+const REGFILTER2 CMMLDecodeFilterReg = {
+ 1,
+ MERIT_PREFERRED + 2,
+ 2,
+ CMMLDecodePinReg
+
+};
+
+
+struct sCMMLFormatBlock {
+ __int64 granuleNumerator;
+ __int64 granuleDenominator;
+};
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.cpp 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.cpp 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,12 +1,12 @@
-// dsfCMMLDecoder.cpp : Defines the entry point for the DLL application.
-//
-
-#include "stdafx.h"
-BOOL APIENTRY DllMain( HANDLE hModule,
- DWORD ul_reason_for_call,
- LPVOID lpReserved
- )
-{
- return TRUE;
-}
-
+// dsfCMMLDecoder.cpp : Defines the entry point for the DLL application.
+//
+
+#include "stdafx.h"
+BOOL APIENTRY DllMain( HANDLE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ return TRUE;
+}
+
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.cpp 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.cpp 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,42 +1,42 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-// stdafx.cpp : source file that includes just the standard includes
-// dsfCMMLDecoder.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+// stdafx.cpp : source file that includes just the standard includes
+// dsfCMMLDecoder.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.h 2004-12-16 13:10:24 UTC (rev 8444)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.h 2004-12-16 13:46:20 UTC (rev 8445)
@@ -1,42 +1,42 @@
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-
-// TODO: reference additional headers your program requires here
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+
+// TODO: reference additional headers your program requires here
Property changes on: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/stdafx.h
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the commits
mailing list