add week days to epg list

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

diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp
index 58b215ba00cabcca9278c5eae018dfe347e01269..4b8da89080cd3214663ff65f342139de845029a4 100644 (file)
--- a/lib/dvb/pvrparse.cpp
+++ b/lib/dvb/pvrparse.cpp
@@ -208,9 +208,7 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
        off_t last = 0;
        for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
        {
-               std::map<off_t, pts_t>::const_iterator d = m_timestamp_deltas.find(i->first);
-               if (d != m_timestamp_deltas.end())
-                       delta = d->second;
+               pts_t delta = getDelta(i->first);
                pts_t c = i->second - delta;
                if (c > ts)
                        break;
@@ -219,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)
 {
 }
@@ -329,6 +362,30 @@ void eMPEGStreamParserTS::parseData(off_t offset, const void *data, unsigned int
                        /* sorry for the redundant code here, but there are too many special cases... */
        while (len)
        {
+                       /* emergency resync. usually, this should not happen, because the data should 
+                          be sync-aligned.
+                          
+                          to make this code work for non-strictly-sync-aligned data, (for example, bad 
+                          files) we fix a possible resync here by skipping data until the next 0x47.
+                          
+                          if this is a false 0x47, the packet will be dropped by wantPacket, and the
+                          next time, sync will be re-established. */
+               int skipped = 0;
+               while (!m_pktptr && len)
+               {
+                       if (packet[0] == 0x47)
+                               break;
+                       len--;
+                       packet++;
+                       skipped++;
+               }
+               
+               if (skipped)
+                       eDebug("SYNC LOST: skipped %d bytes.", skipped);
+               
+               if (!len)
+                       break;
+               
                if (m_pktptr)
                {
                                /* skip last packet */