add getNextAccessPoint
authorFelix Domke <tmbinc@elitedvb.net>
Tue, 28 Feb 2006 01:43:36 +0000 (01:43 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Tue, 28 Feb 2006 01:43:36 +0000 (01:43 +0000)
lib/dvb/pvrparse.cpp
lib/dvb/pvrparse.h
lib/dvb/tstools.cpp
lib/dvb/tstools.h

index bde4376..65e599c 100644 (file)
@@ -217,6 +217,41 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
        return last;
 }
 
        return last;
 }
 
+int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
+{
+       off_t offset = getAccessPoint(start);
+       std::map<off_t, pts_t>::const_iterator i = m_access_points.find(offset);
+       if (i == m_access_points.end())
+       {
+               eDebug("getNextAccessPoint: initial AP not found");
+               return -1;
+       }
+       while (direction)
+       {
+               if (direction > 0)
+               {
+                       if (i == m_access_points.end())
+                               return -1;
+                       ++i;
+                       direction--;
+               }
+               if (direction < 0)
+               {
+                       if (i == m_access_points.begin())
+                       {
+                               eDebug("at start");
+                               return -1;
+                       }
+                       --i;
+                       direction++;
+               }
+       }
+       ts = i->second - getDelta(i->first);
+       eDebug("fine, at %llx - %llx = %llx", ts, i->second, getDelta(i->first));
+       eDebug("fine, at %lld - %lld = %lld", ts, i->second, getDelta(i->first));
+       return 0;
+}
+
 eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0)
 {
 }
 eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0)
 {
 }
index 7b58633..9a0c3eb 100644 (file)
@@ -40,6 +40,8 @@ public:
        
        off_t getAccessPoint(pts_t ts);
        
        
        off_t getAccessPoint(pts_t ts);
        
+       int getNextAccessPoint(pts_t &ts, const pts_t &start, int direction);
+       
        bool empty();
 };
 
        bool empty();
 };
 
index e440aec..b6792c6 100644 (file)
@@ -191,6 +191,17 @@ int eDVBTSTools::getOffset(off_t &offset, pts_t &pts)
        }
 }
 
        }
 }
 
+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)   
 void eDVBTSTools::calcBegin()
 {
        if (m_fd < 0)   
index f23d810..7612807 100644 (file)
@@ -41,6 +41,8 @@ public:
                /* get (approximate) offset corresponding to PTS */
        int getOffset(off_t &offset, pts_t &pts);
        
                /* get (approximate) offset corresponding to PTS */
        int getOffset(off_t &offset, pts_t &pts);
        
+       int getNextAccessPoint(pts_t &ts, const pts_t &start, int direction);
+       
        void calcBegin();
        void calcEnd();
        
        void calcBegin();
        void calcEnd();