insert cutmark on EIT change

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

diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp
index d6978301447dde39d1f1ab2516421fb42f88ce5b..59313669e421749379ccf5e7ed9521a0159ebc86 100644 (file)
--- a/lib/dvb/pvrparse.cpp
+++ b/lib/dvb/pvrparse.cpp
@@ -146,7 +146,7 @@ int eMPEGStreamInformation::fixupPTS(const off_t &offset, pts_t &ts)
        std::multimap<pts_t, off_t>::const_iterator 
                l = m_pts_to_offset.upper_bound(ts - 60 * 90000), 
                u = m_pts_to_offset.upper_bound(ts + 60 * 90000), 
        std::multimap<pts_t, off_t>::const_iterator 
                l = m_pts_to_offset.upper_bound(ts - 60 * 90000), 
                u = m_pts_to_offset.upper_bound(ts + 60 * 90000), 

-               nearest = m_access_points.end();
+               nearest = m_pts_to_offset.end();

 
        while (l != u)
        {
 
        while (l != u)
        {


@@ -154,7 +154,7 @@ int eMPEGStreamInformation::fixupPTS(const off_t &offset, pts_t &ts)
                        nearest = l;
                ++l;
        }
                        nearest = l;
                ++l;
        }

-       if (nearest == m_access_points.end())
+       if (nearest == m_pts_to_offset.end())

                return 1;
 
        ts -= getDelta(nearest->second);
                return 1;
 
        ts -= getDelta(nearest->second);


@@ -219,7 +219,6 @@ pts_t eMPEGStreamInformation::getInterpolated(off_t offset)
 off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
 {
                /* FIXME: more efficient implementation */
 off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
 {
                /* FIXME: more efficient implementation */

-       pts_t delta = 0;

        off_t last = 0;
        for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
        {
        off_t last = 0;
        for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
        {


@@ -267,7 +266,7 @@ int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, in
        return 0;
 }
 
        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), m_last_pts_valid(0)

 {
 }
 
 {
 }
 


@@ -314,6 +313,9 @@ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset)
                pts |= ((unsigned long long)(pkt[12]&0xFF)) << 7;
                pts |= ((unsigned long long)(pkt[13]&0xFE)) >> 1;
                ptsvalid = 1;
                pts |= ((unsigned long long)(pkt[12]&0xFF)) << 7;
                pts |= ((unsigned long long)(pkt[13]&0xFE)) >> 1;
                ptsvalid = 1;

+               
+               m_last_pts = pts;
+               m_last_pts_valid = 1;

 
 #if 0          
                int sec = pts / 90000;
 
 #if 0          
                int sec = pts / 90000;


@@ -348,9 +350,9 @@ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset)
                        if (ptsvalid)
                        {
                                m_streaminfo.m_access_points[offset] = pts;
                        if (ptsvalid)
                        {
                                m_streaminfo.m_access_points[offset] = pts;

-                               eDebug("Sequence header at %llx, pts %llx", offset, pts);
+//                             eDebug("Sequence header at %llx, pts %llx", offset, pts);

                        } else
                        } else

-                               eDebug("Sequence header but no valid PTS value.");
+                               /*eDebug("Sequence header but no valid PTS value.")*/;

                }
 
                if (pkt[3] == 0x09) /* MPEG4 AVC unit access delimiter */
                }
 
                if (pkt[3] == 0x09) /* MPEG4 AVC unit access delimiter */


@@ -358,9 +360,9 @@ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset)
                        if (ptsvalid)
                        {
                                m_streaminfo.m_access_points[offset] = pts;
                        if (ptsvalid)
                        {
                                m_streaminfo.m_access_points[offset] = pts;

-                               eDebug("MPEG4 AVC UAD at %llx, pts %llx", offset, pts);
+//                             eDebug("MPEG4 AVC UAD at %llx, pts %llx", offset, pts);

                        } else
                        } else

-                               eDebug("MPEG4 AVC UAD but no valid PTS value.");
+                               /*eDebug("MPEG4 AVC UAD but no valid PTS value.")*/;

                }
        }
        return 0;
                }
        }
        return 0;


@@ -504,3 +506,15 @@ void eMPEGStreamParserTS::setPid(int _pid)
        m_pktptr = 0;
        m_pid = _pid;
 }
        m_pktptr = 0;
        m_pid = _pid;
 }

+
+int eMPEGStreamParserTS::getLastPTS(pts_t &last_pts)
+{
+       if (!m_last_pts_valid)
+       {
+               last_pts = 0;
+               return -1;
+       }
+       last_pts = m_last_pts;
+       return 0;
+}
+