display remaining time for next event

[enigma2.git] / lib / dvb / tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 81e62dd256e6e3cf03b18cb03f23f57e76993bd0..bec17a56922329026a7e3be8193364dfd0227086 100644 (file)
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/dvb/tstools.h>
 #include <lib/base/eerror.h>
 #include <unistd.h>
@@ -46,6 +45,7 @@ void eDVBTSTools::setSearchRange(int maxrange)
        m_maxrange = maxrange;
 }
 
+       /* getPTS extracts a pts value from any PID at a given offset. */
 int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 {
        if (m_fd < 0)
@@ -71,8 +71,11 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
                {
                        int i = 0;
                        while (i < 188)
+                       {
                                if (block[i] == 0x47)
                                        break;
+                               ++i;
+                       }
                        offset = lseek(m_fd, i - 188, SEEK_CUR);
                        continue;
                }
@@ -120,6 +123,7 @@ void eDVBTSTools::calcBegin()
 {
        if (m_fd < 0)   
                return;
+
        if (!m_begin_valid)
        {
                m_offset_begin = 0;
@@ -133,7 +137,14 @@ void eDVBTSTools::calcEnd()
        if (m_fd < 0)   
                return;
        
-       m_offset_end = lseek(m_fd, 0, SEEK_END);
+       off_t end = lseek(m_fd, 0, SEEK_END);
+       
+       if (abs(end - m_offset_end) > 1*1024*1024)
+       {
+               m_offset_end = end;
+               m_end_valid = 0;
+               eDebug("file size changed, recalc length");
+       }
        
        int maxiter = 10;
        
@@ -158,6 +169,9 @@ int eDVBTSTools::calcLen(pts_t &len)
        if (!(m_begin_valid && m_end_valid))
                return -1;
        len = m_pts_end - m_pts_begin;
+               /* wrap around? */
+       if (len < 0)
+               len += 0x200000000LL;
        return 0;
 }
 
@@ -168,6 +182,10 @@ int eDVBTSTools::calcBitrate()
                return -1;
 
        pts_t len_in_pts = m_pts_end - m_pts_begin;
+
+               /* wrap around? */
+       if (len_in_pts < 0)
+               len_in_pts += 0x200000000LL;
        off_t len_in_bytes = m_offset_end - m_offset_begin;
        
        if (!len_in_pts)