[xiph-commits] r8451 - in trunk/oggdsf/src/lib: codecs/cmml/dsfCMMLRawSource core/ogg/libOOOgg

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-16 06:59:42 -0800 (Thu, 16 Dec 2004)
New Revision: 8451

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
Log:
* Fixed no timestamp bug in cmml source


Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2004-12-16 14:51:07 UTC (rev 8450)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2004-12-16 14:59:42 UTC (rev 8451)
@@ -158,8 +158,17 @@
 
 	memcpy((void*)locOutBuffer, (const void*)locNarrowStr.c_str(), locNarrowStr.size());
 
-	if (inTag->ta
+	if (inTag->tagType() == C_CMMLTag::CLIP) {
+		C_ClipTag* locClip = (C_ClipTag*)inTag;
+		locStart = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start()));
+		locStop = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->end()));
+
+	}
 	locSample->SetActualDataLength(locNarrowStr.size());
+	locSample->SetTime(&locStart, &locStop);
+	locSample->SetMediaTime(NULL, NULL);
+	locSample->SetDiscontinuity(FALSE);
+	locSample->SetSyncPoint(TRUE);
 
 	
 

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp	2004-12-16 14:51:07 UTC (rev 8450)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp	2004-12-16 14:59:42 UTC (rev 8451)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 //===========================================================================
 //Copyright (C) 2003, 2004 Zentaro Kavanagh
 //
@@ -46,51 +45,3 @@
 OggPaginatorSettings::~OggPaginatorSettings(void)
 {
 }
-=======
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
-//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 "OggPaginatorSettings.h"
-
-OggPaginatorSettings::OggPaginatorSettings(void)
-	:	mSerialNo(0)
-	,	mMaxPageSize(8192)
-	,	mTargetPageSize(4096)
-	,	mMinPageSize(4096)
-	,	mNumHeaders(0)
-{
-}
-
-OggPaginatorSettings::~OggPaginatorSettings(void)
-{
-}
->>>>>>> .r8448

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h	2004-12-16 14:51:07 UTC (rev 8450)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h	2004-12-16 14:59:42 UTC (rev 8451)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 //===========================================================================
 //Copyright (C) 2003, 2004 Zentaro Kavanagh
 //
@@ -46,51 +45,3 @@
 	unsigned long mMaxPacksPerPage;
 
 };
-=======
-//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
-//
-//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
-
-class LIBOOOGG_API OggPaginatorSettings
-{
-public:
-	OggPaginatorSettings(void);
-	~OggPaginatorSettings(void);
-
-	unsigned long mSerialNo;
-	unsigned long mMaxPageSize;
-	unsigned long mTargetPageSize;
-	unsigned long mMinPageSize;
-	unsigned long mNumHeaders;
-
-};
->>>>>>> .r8448