[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/fileformat atomizer.cpp, 1.18.8.6.2.6, 1.18.8.6.2.7 qtswtrack.cpp, 1.3.94.1, 1.3.
From:       joeli () helixcommunity ! org
Date:       2012-10-13 2:32:36
[Download RAW message or body]

Update of /cvsroot/datatype/mp4/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv32166/datatype/mp4/fileformat

Modified Files:
      Tag: hxclient_3_6_1_atlas
	atomizer.cpp qtswtrack.cpp qttrack.cpp 
Log Message:
merged DTDrive compile issue from Swift.
added by joeli at 2012/10/12

modified files:
common/fileio/pub/platform/unix/fio.h
common/netio/pub/bio.h
common/netio/pub/platform/unix/sockio.h
datatype/mp4/fileformat/atomizer.cpp
datatype/mp4/fileformat/pub/qtswtrack.h
datatype/mp4/fileformat/qtswtrack.cpp
datatype/mp4/fileformat/qttrack.cpp
datatype/h261/renderer/config.h



Index: atomizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/atomizer.cpp,v
retrieving revision 1.18.8.6.2.6
retrieving revision 1.18.8.6.2.7
diff -u -d -r1.18.8.6.2.6 -r1.18.8.6.2.7
--- atomizer.cpp	3 May 2012 03:17:17 -0000	1.18.8.6.2.6
+++ atomizer.cpp	13 Oct 2012 02:32:23 -0000	1.18.8.6.2.7
@@ -514,7 +514,7 @@
 	CallbackHandle retVal;
 
 	m_ulRecursionCount = 0;
-	m_ulSize = ulSize;
+	m_Size = ulSize;
 	m_CallbackStep = ATMZR_CBSTEP_Read;
 	retVal = m_pScheduler->RelativeEnter(m_pRecursionCallback, 0);
 	if (!retVal)
@@ -1417,10 +1417,10 @@
     switch (m_pAtomizer->m_CallbackStep)
     {
     case ATMZR_CBSTEP_Read:
-	m_pAtomizer->ReadData(m_pAtomizer->m_ulSize);
+	m_pAtomizer->ReadData(m_pAtomizer->m_Size);
 	return HXR_OK;
     case ATMZR_CBSTEP_Seek:
-	m_pAtomizer->SeekData(m_pAtomizer->m_ulSize,
+	m_pAtomizer->SeekData(m_pAtomizer->m_Size,
 			      m_pAtomizer->m_bRelative);
 	return HXR_OK;
     default:

Index: qtswtrack.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtswtrack.cpp,v
retrieving revision 1.3.94.1
retrieving revision 1.3.94.2
diff -u -d -r1.3.94.1 -r1.3.94.2
--- qtswtrack.cpp	3 May 2012 03:17:19 -0000	1.3.94.1
+++ qtswtrack.cpp	13 Oct 2012 02:32:23 -0000	1.3.94.2
@@ -693,7 +693,7 @@
  */
 HX_RESULT CQTSwitchTrack::ComputeTrackSize(HX_OFF_T& nTrackSizeOut)
 {
-    return m_pPrimaryTrack->ComputeTrackSize(ulTrackSizeOut);
+    return m_pPrimaryTrack->ComputeTrackSize(nTrackSizeOut);
 }
 
 /****************************************************************************

Index: qttrack.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrack.cpp,v
retrieving revision 1.30.2.3.20.15
retrieving revision 1.30.2.3.20.16
diff -u -d -r1.30.2.3.20.15 -r1.30.2.3.20.16
--- qttrack.cpp	3 May 2012 03:17:19 -0000	1.30.2.3.20.15
+++ qttrack.cpp	13 Oct 2012 02:32:23 -0000	1.30.2.3.20.16
@@ -912,7 +912,7 @@
 
                     return ReturnPacket(HXR_OK,
                                         pBuffer,
-					hxPageOffset, 
+					nPageOffset, 
                                         m_SampleSize.GetSampleSize());
                 }
             }
@@ -1317,14 +1317,14 @@
     if (pBuffer)
     {
 #ifdef QTCONFIG_BFRAG
-        if ((ulOffset != 0) || (ulSize != pBuffer->GetSize()))
+        if ((nOffset != 0) || (ulSize != pBuffer->GetSize()))
         {
 #ifdef QTCONFIG_BFRAG_FACTORY
             pBuffer = 
                 m_pFileFormat->m_pBufferFragmentFactory->WrapFragment(
-                    pBuffer, ulOffset, ulSize);
+                    pBuffer, nOffset, ulSize);
 #else   // QTCONFIG_BFRAG_FACTORY
-            pBuffer = new CBufferFragment(pBuffer, ulOffset, ulSize);
+            pBuffer = new CBufferFragment(pBuffer, nOffset, ulSize);
             
             if (pBuffer)
             {


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]