add possibility to set tuner priority for alternative services in Customize
[vuplus_dvbapp] / lib / dvb / dvb.cpp
index ad5dfa6..b7d278c 100644 (file)
@@ -2,6 +2,7 @@
 #include <lib/base/filepush.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
+#include <lib/dvb/pmt.h>
 #include <lib/dvb/sec.h>
 
 #include <errno.h>
@@ -42,6 +43,23 @@ DEFINE_REF(eDVBResourceManager);
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
+RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
+{
+       if (instance)
+       {
+               ptr = instance;
+               return 0;
+       }
+       return -1;
+}
+
+ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
+{
+       ePtr<eDVBResourceManager> ptr;
+       eDVBResourceManager::getInstance(ptr);
+       return ptr;
+}
+
 eDVBResourceManager::eDVBResourceManager()
        :m_releaseCachedChannelTimer(eApp)
 {
@@ -65,9 +83,19 @@ eDVBResourceManager::eDVBResourceManager()
        eDebug("found %d adapter, %d frontends and %d demux", 
                m_adapter.size(), m_frontend.size(), m_demux.size());
 
+       eDVBCAService::registerChannelCallback(this);
+
        CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
+void eDVBResourceManager::feStateChanged()
+{
+       int mask=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+               if (i->m_inuse)
+                       mask |= ( 1 << i->m_frontend->getSlotID() );
+       /* emit */ frontendUseMaskChanged(mask);
+}
 
 DEFINE_REF(eDVBAdapterLinux);
 eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
@@ -197,18 +225,57 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
                        m_demux.push_back(new eDVBRegisteredDemux(demux, adapter));
        }
 
+       ePtr<eDVBRegisteredFrontend> prev_dvbt_frontend;
        for (i=0; i<num_fe; ++i)
        {
                ePtr<eDVBFrontend> frontend;
-
                if (!adapter->getFrontend(frontend, i))
                {
+                       int frontendType=0;
+                       frontend->getFrontendType(frontendType);
+                       eDVBRegisteredFrontend *new_fe = new eDVBRegisteredFrontend(frontend, adapter);
+                       CONNECT(new_fe->stateChanged, eDVBResourceManager::feStateChanged);
+                       m_frontend.push_back(new_fe);
                        frontend->setSEC(m_sec);
-                       m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
+                       // we must link all dvb-t frontends ( for active antenna voltage )
+                       if (frontendType == iDVBFrontend::feTerrestrial)
+                       {
+                               if (prev_dvbt_frontend)
+                               {
+                                       prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)new_fe);
+                                       frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)&(*prev_dvbt_frontend));
+                               }
+                               prev_dvbt_frontend = new_fe;
+                       }
                }
        }
 }
 
+PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
+{
+       if (!PyList_Check(list))
+       {
+               PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
+               return NULL;
+       }
+       if ((unsigned int)PyList_Size(list) != m_frontend.size())
+       {
+               char blasel[256];
+               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
+                       m_frontend.size(), PyList_Size(list));
+               PyErr_SetString(PyExc_StandardError, blasel);
+               return NULL;
+       }
+       int pos=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+       {
+               ePyObject obj = PyList_GET_ITEM(list, pos++);
+               if (!i->m_frontend->setSlotInfo(obj))
+                       return NULL;
+       }
+       Py_RETURN_NONE;
+}
+
 RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
 {
        ePtr<eDVBRegisteredFrontend> best;
@@ -236,15 +303,51 @@ RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, eP
        return -1;
 }
 
-RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int nr)
+RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index)
 {
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr)
-               if ((!nr) && !i->m_inuse)
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+               if (!i->m_inuse && i->m_frontend->getSlotID() == slot_index)
                {
+                       // check if another slot linked to this is in use
+                       eDVBRegisteredFrontend *satpos_depends_to_fe =
+                               (eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
+                       if ( (int)satpos_depends_to_fe != -1 )
+                       {
+                               if (satpos_depends_to_fe->m_inuse)
+                               {
+                                       eDebug("another satpos depending frontend is in use.. so allocateFrontendByIndex not possible!");
+                                       goto alloc_fe_by_id_not_possible;
+                               }
+                       }
+                       else // check linked tuners
+                       {
+                               eDVBRegisteredFrontend *next =
+                                       (eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
+                               while ( (int)next != -1 )
+                               {
+                                       if (next->m_inuse)
+                                       {
+                                               eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+                                               goto alloc_fe_by_id_not_possible;
+                                       }
+                                       next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
+                               }
+                               eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
+                                       i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
+                               while ( (int)prev != -1 )
+                               {
+                                       if (prev->m_inuse)
+                                       {
+                                               eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+                                               goto alloc_fe_by_id_not_possible;
+                                       }
+                                       prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
+                               }
+                       }
                        fe = new eDVBAllocatedFrontend(i);
                        return 0;
                }
-       
+alloc_fe_by_id_not_possible:
        fe = 0;
        return -1;
 }
@@ -263,21 +366,33 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
        int n=0;
                /* FIXME: hardware demux policy */
        if (!(cap & iDVBChannel::capDecode))
-               ++i, ++n;
+       {
+               if (m_demux.size() > 2)  /* assumed to be true, otherwise we have lost anyway */
+               {
+                       ++i, ++n;
+                       ++i, ++n;
+               }
+       }
        
        for (; i != m_demux.end(); ++i, ++n)
-               if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
+       {
+               int is_decode = n < 2;
+               
+               int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse;
+               
+               if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter)))
                {
-                       if ((cap & iDVBChannel::capDecode) && n)
+                       if ((cap & iDVBChannel::capDecode) && !is_decode)
                                continue;
                        
                        demux = new eDVBAllocatedDemux(i);
                        if (fe)
-                               demux->get().setSourceFrontend(fe->m_frontend->getID());
+                               demux->get().setSourceFrontend(fe->m_frontend->getDVBID());
                        else
                                demux->get().setSourcePVR(0);
                        return 0;
                }
+       }
        eDebug("demux not found");
        return -1;
 }
@@ -396,7 +511,7 @@ void eDVBResourceManager::releaseCachedChannel()
        m_cached_channel=0;
 }
 
-RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int slot_index)
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
@@ -407,7 +522,7 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
                m_releaseCachedChannelTimer.stop();
        }
 
-       if (allocateFrontendByIndex(fe, frontend_index))
+       if (allocateFrontendByIndex(fe, slot_index))
                return errNoFrontend;
        
        eDVBChannel *ch;
@@ -422,9 +537,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
 
+       if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+       {
+               m_cached_channel_state_changed_conn.disconnect();
+               m_cached_channel=0;
+               m_releaseCachedChannelTimer.stop();
+       }
+
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
-       
+
        channel = ch;
        return 0;
 }
@@ -460,7 +582,7 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
        return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
+int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
@@ -472,18 +594,44 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
                        if (c > bestval)
                                bestval = c;
                }
+       return bestval;
+}
 
-       return bestval>0;
+int tuner_type_channel_default(ePtr<iDVBChannelList> &channellist, const eDVBChannelID &chid)
+{
+       if (channellist)
+       {
+               ePtr<iDVBFrontendParameters> feparm;
+               if (!channellist->getChannelFrontendData(chid, feparm))
+               {
+                       int system;
+                       if (!feparm->getSystem(system))
+                       {
+                               switch(system)
+                               {
+                                       case iDVBFrontend::feSatellite:
+                                               return 50000;
+                                       case iDVBFrontend::feCable:
+                                               return 40000;
+                                       case iDVBFrontend::feTerrestrial:
+                                               return 30000;
+                                       default:
+                                               break;
+                               }
+                       }
+               }
+       }
+       return 0;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
+int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-       bool ret=true;
+       int ret=0;
        if (m_cached_channel)
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
                if(channelid==cache_chan->getChannelID())
-                       return ret;
+                       return tuner_type_channel_default(m_list, channelid);
        }
 
                /* first, check if a channel is already existing. */
@@ -494,7 +642,7 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
                if (i->m_channel_id == channelid)
                {
 //                     eDebug("found shared channel..");
-                       return ret;
+                       return tuner_type_channel_default(m_list, channelid);
                }
        }
 
@@ -507,7 +655,11 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
                if (i->m_channel_id == ignore)
                {
                        eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
-                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1)  // channel only used once..
+                       // one eUsePtr<iDVBChannel> is used in eDVBServicePMTHandler
+                       // another on eUsePtr<iDVBChannel> is used in the eDVBScan instance used in eDVBServicePMTHandler (for SDT scan)
+                       // so we must check here if usecount is 3 (when the channel is equal to the cached channel)
+                       // or 2 when the cached channel is not equal to the compared channel
+                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 3 : channel->getUseCount() == 2)  // channel only used once..
                        {
                                ePtr<iDVBFrontend> fe;
                                if (!i->m_channel->getFrontend(fe))
@@ -560,14 +712,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
        if (!m_list)
        {
                eDebug("no channel list set!");
-               ret = false;
                goto error;
        }
 
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
-               ret = false;
                goto error;
        }
 
@@ -582,6 +732,100 @@ error:
        return ret;
 }
 
+class eDVBChannelFilePush: public eFilePushThread
+{
+public:
+       void setIFrameSearch(int enabled) { m_iframe_search = enabled; m_iframe_state = 0; }
+protected:
+       int m_iframe_search, m_iframe_state, m_pid;
+       int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);
+};
+
+int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, size_t &current_span_remaining)
+{
+#if 0 /* not yet */
+       if (!m_iframe_search)
+               return len;
+
+       unsigned char *data = (unsigned char*)_data; /* remove that const. we know what we are doing. */
+
+       eDebug("filterRecordData, size=%d (mod 188=%d), first byte is %02x", len, len %188, data[0]);
+
+       unsigned char *d = data;
+       while ((d = (unsigned char*)memmem(d, data + len - d, "\x00\x00\x01", 3)))
+       {
+               int offset = d - data;
+               int ts_offset = offset - offset % 188; /* offset to the start of TS packet */
+               unsigned char *ts = data + ts_offset;
+               int pid = ((ts[1] << 8) | ts[2]) & 0x1FFF;
+
+               if ((d[3] == 0) && (m_pid == pid))  /* picture start */
+               {
+                       int picture_type = (d[5] >> 3) & 7;
+                       d += 4;
+                       
+                       eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
+
+                       if (m_iframe_state == 1)
+                       {
+                                       /* we are allowing data, and stop allowing data on the next frame. 
+                                          we now found a frame. so stop here. */
+                               memset(data + offset, 0, 188 - (offset%188)); /* zero out rest of TS packet */
+                               current_span_remaining = 0;
+                               m_iframe_state = 0;
+                               unsigned char *fts = ts + 188;
+                               while (fts < (data + len))
+                               {
+                                       fts[1] |= 0x1f;
+                                       fts[2] |= 0xff; /* drop packet */
+                                       fts += 188;
+                               }
+
+                               return len; // ts_offset + 188; /* deliver this packet, but not more. */
+                       } else
+                       {
+                               if (picture_type != 1) /* we are only interested in I frames */
+                                       continue;
+                       
+                               unsigned char *fts = data;
+                               while (fts < ts)
+                               {
+                                       fts[1] |= 0x1f;
+                                       fts[2] |= 0xff; /* drop packet */
+                               
+                                       fts += 188;
+                               }
+                                               /* force payload only */
+                               ts[3] &= ~0x30;
+                               ts[3] |=  0x10;
+                               
+//                             memset(ts + 4, 0xFF, (offset % 188) - 4);
+
+                               m_iframe_state = 1;
+                       }
+               } else if ((d[3] & 0xF0) == 0xE0) /* video stream */
+               {
+                       if (m_pid != pid)
+                       {
+                               eDebug("now locked to pid %04x", pid);
+                               m_pid = pid;
+                       }
+//                     m_pid = 0x6e;
+                       d += 4;
+               } else
+                       d += 4; /* ignore */
+
+       }
+
+       if (m_iframe_state == 1)
+               return len;
+       else
+               return 0; /* we need find an iframe first */
+#else
+       return len;
+#endif
+}
+
 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend): m_state(state_idle), m_mgr(mgr)
@@ -677,8 +921,10 @@ void eDVBChannel::cueSheetEvent(int event)
        case eCueSheet::evtSkipmode:
        {
                {
-                       eSingleLocker l(m_cue->m_lock);
+                       m_cue->m_lock.WrLock();
                        m_cue->m_seek_requests.push_back(std::pair<int, pts_t>(1, 0)); /* resync */
+                       m_cue->m_lock.Unlock();
+                       eRdLocker l(m_cue->m_lock);
                        if (m_cue->m_skipmode_ratio)
                        {
                                int bitrate = m_tstools.calcBitrate(); /* in bits/s */
@@ -704,7 +950,11 @@ void eDVBChannel::cueSheetEvent(int event)
                                m_skipmode_n = m_skipmode_m = 0;
                        }
                }
+               ASSERT(m_pvr_thread);
+               m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
+               eDebug("flush pvr");
                flushPVR(m_cue->m_decoding_demux);
+               eDebug("done");
                break;
        }
        case eCueSheet::evtSpanChanged:
@@ -727,10 +977,28 @@ void eDVBChannel::cueSheetEvent(int event)
        }
 }
 
+       /* align toward zero */
+static inline long long align(long long x, int align)
+{
+       int sign = x < 0;
+
+       if (sign)
+               x = -x;
+
+       x -= x % align;
+
+       if (sign)
+               x = -x;
+
+       return x;
+}
+
        /* remember, this gets called from another thread. */
 void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size)
 {
-       unsigned int max = 10*1024*1024;
+       const int blocksize = 188;
+       unsigned int max = align(10*1024*1024, blocksize);
+       current_offset = align(current_offset, blocksize);
        
        if (!m_cue)
        {
@@ -740,30 +1008,34 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                return;
        }
 
-       eSingleLocker l(m_cue->m_lock);
-       
+       m_cue->m_lock.RdLock();
        if (!m_cue->m_decoding_demux)
        {
                start = current_offset;
                size = max;
                eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
+               m_cue->m_lock.Unlock();
                return;
        }
-       
+
        if (m_skipmode_n)
        {
                eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n);
-               max = m_skipmode_n;
+               max = align(m_skipmode_n, blocksize);
        }
-       
-       eDebug("getNextSourceSpan, current offset is %08llx!", current_offset);
-       
-       current_offset += m_skipmode_m;
-       
+
+       eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
+
+       current_offset += align(m_skipmode_m, blocksize);
+
        while (!m_cue->m_seek_requests.empty())
        {
                std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
+               m_cue->m_lock.Unlock();
+               m_cue->m_lock.WrLock();
                m_cue->m_seek_requests.pop_front();
+               m_cue->m_lock.Unlock();
+               m_cue->m_lock.RdLock();
                int relative = seek.first;
                pts_t pts = seek.second;
 
@@ -785,10 +1057,26 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                eDebug("seekTo: getCurrentPosition failed!");
                                continue;
                        }
+               } else if (pts < 0) /* seek relative to end */
+               {
+                       pts_t len;
+                       if (!getLength(len))
+                       {
+                               eDebug("seeking relative to end. len=%lld, seek = %lld", len, pts);
+                               pts += len;
+                       } else
+                       {
+                               eWarning("getLength failed - can't seek relative to end!");
+                               continue;
+                       }
                }
                
                if (relative == 1) /* pts relative */
+               {
                        pts += now;
+                       if (pts < 0)
+                               pts = 0;
+               }
 
                if (relative != 2)
                        if (pts < 0)
@@ -800,7 +1088,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                        pts_t nextap;
                        if (m_tstools.getNextAccessPoint(nextap, now, pts))
                        {
-                               pts = now;
+                               pts = now - 90000; /* approx. 1s */
                                eDebug("AP relative seeking failed!");
                        } else
                        {
@@ -811,33 +1099,47 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                
                off_t offset = 0;
                if (m_tstools.getOffset(offset, pts))
+               {
+                       eDebug("get offset for pts=%lld failed!", pts);
                        continue;
+               }
 
                eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
-               current_offset = offset;
+               current_offset = align(offset, blocksize); /* in case tstools return non-aligned offset */
        }
-       
+
+       m_cue->m_lock.Unlock();
+
        for (std::list<std::pair<off_t, off_t> >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i)
        {
-               if ((current_offset >= i->first) && (current_offset < i->second))
+               long long aligned_start = align(i->first, blocksize);
+               long long aligned_end = align(i->second, blocksize);
+       
+               if ((current_offset >= aligned_start) && (current_offset < aligned_end))
                {
                        start = current_offset;
-                       size = i->second - current_offset;
-                       if (size > max)
+                               /* max can not exceed max(size_t). aligned_end - current_offset, however, can. */
+                       if ((aligned_end - current_offset) > max)
                                size = max;
-                       eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second);
+                       else
+                               size = aligned_end - current_offset;
+                       eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
                        return;
                }
-               if (current_offset < i->first)
+               if (current_offset < aligned_start)
                {
                                /* ok, our current offset is in an 'out' zone. */
                        if ((m_skipmode_m >= 0) || (i == m_source_span.begin()))
                        {
                                        /* in normal playback, just start at the next zone. */
                                start = i->first;
-                               size = i->second - i->first;
-                               if (size > max)
+
+                                       /* size is not 64bit! */
+                               if ((i->second - i->first) > max)
                                        size = max;
+                               else
+                                       size = aligned_end - aligned_start;
+
                                eDebug("skip");
                                if (m_skipmode_m < 0)
                                {
@@ -851,26 +1153,35 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                        /* when skipping reverse, however, choose the zone before. */
                                --i;
                                eDebug("skip to previous block, which is %llx..%llx", i->first, i->second);
-                               size_t len = i->second - i->first;
-                               if (max > len)
-                                       max = len;
-                               start = i->second - max;
-                               size = max;
-                               eDebug("skipping to %llx, %d", start, size);
+                               size_t len;
+
+                               aligned_start = align(i->first, blocksize);
+                               aligned_end = align(i->second, blocksize);
+
+                               if ((aligned_end - aligned_start) > max)
+                                       len = max;
+                               else
+                                       len = aligned_end - aligned_start;
+
+                               start = aligned_end - len;
+                               eDebug("skipping to %llx, %d", start, len);
                        }
+
+                       eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
                        return;
                }
        }
-       
+
        if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
        {
                eDebug("reached SOF");
                m_skipmode_m = 0;
                m_pvr_thread->sendEvent(eFilePushThread::evtUser);
        }
-       
+
        start = current_offset;
        size = max;
+
        eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
        return;
 }
@@ -967,6 +1278,11 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
        
        demux = *our_demux;
                /* don't hold a reference to the decoding demux, we don't need it. */
+               
+               /* FIXME: by dropping the 'allocated demux' in favour of the 'iDVBDemux',
+                  the refcount is lost. thus, decoding demuxes are never allocated. 
+                  
+                  this poses a big problem for PiP. */
        if (cap & capDecode)
                our_demux = 0;
        return 0;
@@ -974,6 +1290,9 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 
 RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 {
+       frontend = 0;
+       if (!m_frontend)
+               return -ENODEV;
        frontend = &m_frontend->get();
        if (frontend)
                return 0;
@@ -1012,12 +1331,10 @@ RESULT eDVBChannel::playFile(const char *file)
                eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
                return -ENODEV;
        }
-       
-       m_state = state_ok;
-       m_stateChanged(this);
-       
-       m_pvr_thread = new eFilePushThread();
+
+       m_pvr_thread = new eDVBChannelFilePush();
        m_pvr_thread->enablePVRCommit(1);
+       m_pvr_thread->setStreamMode(1);
        m_pvr_thread->setScatterGather(this);
 
        if (m_pvr_thread->start(file, m_pvr_fd_dst))
@@ -1029,6 +1346,9 @@ RESULT eDVBChannel::playFile(const char *file)
        }
        CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
+       m_state = state_ok;
+       m_stateChanged(this);
+
        return 0;
 }
 
@@ -1126,25 +1446,24 @@ eCueSheet::eCueSheet()
 
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
-       {
-               eSingleLock l(m_lock);
-               m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
-       }
+       m_lock.WrLock();
+       m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
+       m_lock.Unlock();
        m_event(evtSeek);
 }
        
 void eCueSheet::clear()
 {
-       eSingleLock l(m_lock);
+       m_lock.WrLock();
        m_spans.clear();
+       m_lock.Unlock();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
-       {
-               eSingleLock l(m_lock);
-               m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
-       }
+       m_lock.WrLock();
+       m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
+       m_lock.Unlock();
 }
 
 void eCueSheet::commitSpans()
@@ -1154,10 +1473,9 @@ void eCueSheet::commitSpans()
 
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
-       {
-               eSingleLock l(m_lock);
-               m_skipmode_ratio = ratio;
-       }
+       m_lock.WrLock();
+       m_skipmode_ratio = ratio;
+       m_lock.Unlock();
        m_event(evtSkipmode);
 }