clamp jumps at SOF

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 5bd8fe6af44eeb3ca232db164ae6eb0784bc0e03..86b1965e31b4bf802cc176281566541f8c9331fb 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -626,11 +626,11 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
        } else if (state == iDVBFrontend::stateLostLock)
        {
                        /* on managed channels, we try to retune in order to re-acquire lock. */
-               if (m_feparm)
+               if (m_current_frontend_parameters)
                {
                        eDebug("OURSTATE: lost lock, trying to retune");
                        ourstate = state_tuning;
-                       m_frontend->get().tune(*m_feparm);
+                       m_frontend->get().tune(*m_current_frontend_parameters);
                } else
                        /* on unmanaged channels, we don't do this. the client will do this. */
                {
@@ -767,9 +767,9 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                int relative = seek.first;
                pts_t pts = seek.second;
 
+               pts_t now = 0;
                if (relative)
                {
-                       pts_t now;
                        if (!m_cue->m_decoder)
                        {
                                eDebug("no decoder - can't seek relative");
@@ -785,11 +785,33 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                eDebug("seekTo: getCurrentPosition failed!");
                                continue;
                        }
+               }
+               
+               if (relative == 1) /* pts relative */
+               {
                        pts += now;
+                       if (pts < 0)
+                               pts = 0;
                }
 
-               if (pts < 0)
-                       pts = 0;
+               if (relative != 2)
+                       if (pts < 0)
+                               pts = 0;
+               
+               if (relative == 2) /* AP relative */
+               {
+                       eDebug("AP relative seeking: %lld, at %lld", pts, now);
+                       pts_t nextap;
+                       if (m_tstools.getNextAccessPoint(nextap, now, pts))
+                       {
+                               pts = now;
+                               eDebug("AP relative seeking failed!");
+                       } else
+                       {
+                               eDebug("next ap is %llx\n", pts);
+                               pts = nextap;
+                       }
+               }
                
                off_t offset = 0;
                if (m_tstools.getOffset(offset, pts))
@@ -854,9 +876,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
        start = current_offset;
        size = max;
        eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
-       
-       if (size < 4096)
-               eFatal("blub");
        return;
 }
 
@@ -903,7 +922,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
                        /* if tuning fails, shutdown the channel immediately. */
        int res;
        res = m_frontend->get().tune(*feparm);
-       m_feparm = feparm;
+       m_current_frontend_parameters = feparm;
        
        if (res)
        {
@@ -962,8 +981,13 @@ RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
        frontend = &m_frontend->get();
        if (frontend)
                return 0;
-       else
-               return -ENODEV;
+       return -ENODEV;
+}
+
+RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &param)
+{
+       param = m_current_frontend_parameters;
+       return 0;
 }
 
 RESULT eDVBChannel::playFile(const char *file)
@@ -993,14 +1017,6 @@ RESULT eDVBChannel::playFile(const char *file)
                return -ENODEV;
        }
        
-       m_pvr_fd_src = open(file, O_RDONLY|O_LARGEFILE);
-       if (m_pvr_fd_src < 0)
-       {
-               eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
-               close(m_pvr_fd_dst);
-               return -ENOENT;
-       }
-       
        m_state = state_ok;
        m_stateChanged(this);
        
@@ -1008,7 +1024,13 @@ RESULT eDVBChannel::playFile(const char *file)
        m_pvr_thread->enablePVRCommit(1);
        m_pvr_thread->setScatterGather(this);
 
-       m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+       if (m_pvr_thread->start(file, m_pvr_fd_dst))
+       {
+               delete m_pvr_thread;
+               m_pvr_thread = 0;
+               eDebug("can't open PVR file %s (%m)", file);
+               return -ENOENT;
+       }
        CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
        return 0;
@@ -1019,7 +1041,6 @@ void eDVBChannel::stopFile()
        if (m_pvr_thread)
        {
                m_pvr_thread->stop();
-               ::close(m_pvr_fd_src);
                ::close(m_pvr_fd_dst);
                delete m_pvr_thread;
                m_pvr_thread = 0;