add getNextAccessPoint

diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp
index bde43765595c0b46459a56471f0f564bca980eae..65e599c335fe4b96cd4dee4faa5e7e4d07977b11 100644 (file)
--- a/lib/dvb/pvrparse.cpp
+++ b/lib/dvb/pvrparse.cpp
@@ -217,6 +217,41 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
        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)
 {
 }

diff --git a/lib/dvb/pvrparse.h b/lib/dvb/pvrparse.h
index 7b5863314f1e80d464e39caa3e4c7ed82e837c5c..9a0c3eb0f27ad6a6f38dfe4b9f5dca045ae46f49 100644 (file)
--- a/lib/dvb/pvrparse.h
+++ b/lib/dvb/pvrparse.h
@@ -40,6 +40,8 @@ public:
        
        off_t getAccessPoint(pts_t ts);
        
+       int getNextAccessPoint(pts_t &ts, const pts_t &start, int direction);
+       
        bool empty();
 };
 

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index e440aecad5753b601cd75dbaf6871d424667bb5c..b6792c65c48c9e243a370d5bcc019f435b6559b2 100644 (file)
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -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)   

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index f23d8108cf5247090056476cc6d90091e2acc39b..76128071dcca786ecd7749b813535c13dfe2b95d 100644 (file)
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -41,6 +41,8 @@ public:
                /* 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();