add getNextAccessPoint

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

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 1b7c5d9299b62ecb5ad1c50e25549204aa446f1f..b6792c65c48c9e243a370d5bcc019f435b6559b2 100644 (file)
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -13,6 +13,8 @@ eDVBTSTools::eDVBTSTools()
        
        m_begin_valid = 0;
        m_end_valid = 0;
+       
+       m_use_streaminfo = 0;
 }
 
 eDVBTSTools::~eDVBTSTools()
@@ -23,6 +25,17 @@ eDVBTSTools::~eDVBTSTools()
 int eDVBTSTools::openFile(const char *filename)
 {
        closeFile();
+       
+       m_streaminfo.load((std::string(filename) + ".ap").c_str());
+       
+       if (!m_streaminfo.empty())
+               m_use_streaminfo = 1;
+       else
+       {
+               eDebug("no recorded stream information available");
+               m_use_streaminfo = 0;
+       }
+
        m_fd = ::open(filename, O_RDONLY);
        if (m_fd < 0)
                return -1;
@@ -46,8 +59,11 @@ void eDVBTSTools::setSearchRange(int maxrange)
 }
 
        /* getPTS extracts a pts value from any PID at a given offset. */
-int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
+int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
 {
+       if (m_use_streaminfo)
+               return m_streaminfo.getPTS(offset, pts);
+       
        if (m_fd < 0)
                return -1;
 
@@ -63,7 +79,10 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
        {
                unsigned char block[188];
                if (read(m_fd, block, 188) != 188)
+               {
+                       eDebug("read error");
                        break;
+               }
                left -= 188;
                offset += 188;
                
@@ -112,6 +131,10 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
                        pts |= ((unsigned long long)(pes[12]&0xFF)) << 7;
                        pts |= ((unsigned long long)(pes[13]&0xFE)) >> 1;
                        offset -= 188;
+                       
+                               /* convert to zero-based */
+                       if (fixed)
+                               fixupPTS(offset, pts);
                        return 0;
                }
        }
@@ -119,6 +142,66 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
        return -1;
 }
 
+int eDVBTSTools::fixupPTS(const off_t &offset, pts_t &now)
+{
+       if (m_use_streaminfo)
+       {
+               return m_streaminfo.fixupPTS(offset, now);
+       } else
+       {
+                       /* for the simple case, we assume one epoch, with up to one wrap around in the middle. */
+               calcBegin();
+               if (!m_begin_valid)
+               {       
+                       eDebug("begin not valid, can't fixup");
+                       return -1;
+               }
+               
+               pts_t pos = m_pts_begin;
+               if ((now < pos) && ((pos - now) < 90000 * 10))
+               {       
+                       pos = 0;
+                       return 0;
+               }
+               
+               if (now < pos) /* wrap around */
+                       now = now + 0x200000000LL - pos;
+               else
+                       now -= pos;
+               return 0;
+       }
+}
+
+int eDVBTSTools::getOffset(off_t &offset, pts_t &pts)
+{
+       if (m_use_streaminfo)
+       {
+               offset = m_streaminfo.getAccessPoint(pts);
+               return 0;
+       } else
+       {
+               int bitrate = calcBitrate(); /* in bits/s */
+               if (bitrate <= 0)
+                       return -1;
+               
+               offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
+               offset -= offset % 188;
+
+               return 0;
+       }
+}
+
+int eDVBTSTools::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
+{
+       if (m_use_streaminfo)
+               return m_streaminfo.getNextAccessPoint(ts, start, direction);
+       else
+       {
+               eDebug("can't get next access point without streaminfo");
+               return -1;
+       }
+}
+
 void eDVBTSTools::calcBegin()
 {
        if (m_fd < 0)   
@@ -169,6 +252,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;
 }
 
@@ -179,6 +265,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)