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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mpeg2ts/fileformat tsfformat.cpp, 1.20.2.11.2.14, 1.20.2.11.2.15
From:       ching_li () helixcommunity ! org
Date:       2012-05-25 10:47:11
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_3_6_1_atlas
	tsfformat.cpp 
Log Message:
should check EOF in the CTSFileFormat::Func() function

Index: tsfformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/fileformat/tsfformat.cpp,v
retrieving revision 1.20.2.11.2.14
retrieving revision 1.20.2.11.2.15
diff -u -d -r1.20.2.11.2.14 -r1.20.2.11.2.15
--- tsfformat.cpp	23 May 2012 10:01:22 -0000	1.20.2.11.2.14
+++ tsfformat.cpp	25 May 2012 10:47:08 -0000	1.20.2.11.2.15
@@ -128,7 +128,7 @@
     , m_nTotalPendingHeaders(0)
     , m_bNeedKeyFrame(FALSE)
     , m_bRawMode(FALSE)
-    , m_bUseRawDTS(FALSE)   
+    , m_bUseRawDTS(FALSE)
     , m_bFirstDTSBaseSet(FALSE)
     , m_bPostPMTSeekPending(FALSE)
 {
@@ -1428,20 +1428,22 @@
 #ifdef ANDROID
 STDMETHODIMP CTSFileFormat::Func()
 {
-    UINT64 ullReadSize = m_bUseRawDTS? m_ulTSReadSize: (m_ullFileSize - m_ullFileOffset);
-    if (ullReadSize > m_ulTSReadSize)
+    if (!m_bEndOfFileReached)
     {
-        ullReadSize = m_ulTSReadSize;
-    }
-    // read more TS packets
-    m_eStatus = GetPacketReadPending;
+        UINT64 ullReadSize = m_bUseRawDTS? m_ulTSReadSize: (m_ullFileSize - m_ullFileOffset);
+        if (ullReadSize > m_ulTSReadSize)
+        {
+            ullReadSize = m_ulTSReadSize;
+        }
+        // read more TS packets
+        m_eStatus = GetPacketReadPending;
 #ifdef HELIX_FEATURE_64_BIT_FILE_SUPPORT
-    if (m_pFileObject64)
-        m_pFileObject64->Read(ullReadSize);
-    else
+        if (m_pFileObject64)
+            m_pFileObject64->Read(ullReadSize);
+        else
 #endif
-    if (m_pFileObject)
         m_pFileObject->Read( (UINT32)ullReadSize );
+    }
 }
 #endif
 


_______________________________________________
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]