fix cached channel handling

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index cac5a67925c11b125ed744af33017d034ba84dd9..f246936588842d5c957390a86c599931717488e9 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -43,6 +43,7 @@ DEFINE_REF(eDVBResourceManager);
 eDVBResourceManager *eDVBResourceManager::instance;
 
 eDVBResourceManager::eDVBResourceManager()
+       :m_releaseCachedChannelTimer(eApp)
 {
        avail = 1;
        busy = 0;
@@ -63,6 +64,8 @@ eDVBResourceManager::eDVBResourceManager()
        
        eDebug("found %d adapter, %d frontends and %d demux", 
                m_adapter.size(), m_frontend.size(), m_demux.size());
+
+       CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
 
@@ -307,6 +310,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                        channel = m_cached_channel;
                        return 0;
                }
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
        }
 
@@ -355,16 +359,52 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                return errChidNotFound;
        }
        m_cached_channel = channel = ch;
+       m_cached_channel_state_changed_conn =
+               CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
 
        return 0;
 }
 
+void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
+{
+       int state=0;
+       chan->getState(state);
+       switch (state)
+       {
+               case iDVBChannel::state_release:
+               case iDVBChannel::state_ok:
+               {
+                       eDebug("stop release channel timer");
+                       m_releaseCachedChannelTimer.stop();
+                       break;
+               }
+               case iDVBChannel::state_last_instance:
+               {
+                       eDebug("start release channel timer");
+                       m_releaseCachedChannelTimer.start(3000, true);
+                       break;
+               }
+               default: // ignore all other events
+                       break;
+       }
+}
+
+void eDVBResourceManager::releaseCachedChannel()
+{
+       eDebug("release cached channel");
+       m_cached_channel_state_changed_conn.disconnect();
+       m_cached_channel=0;
+}
+
 RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
        if (m_cached_channel)
+       {
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
+       }
 
        if (allocateFrontendByIndex(fe, frontend_index))
                return errNoFrontend;
@@ -382,7 +422,10 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
        ePtr<eDVBAllocatedDemux> demux;
 
        if (m_cached_channel)
+       {
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
+       }
 
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
@@ -630,9 +673,6 @@ void eDVBChannel::pvrEvent(int event)
 
 void eDVBChannel::cueSheetEvent(int event)
 {
-               /* we need proper locking here! */
-       eDebug("CUE SHEET EVENT %d", event);
-       
        switch (event)
        {
        case eCueSheet::evtSeek:
@@ -641,27 +681,30 @@ void eDVBChannel::cueSheetEvent(int event)
                break;
        case eCueSheet::evtSkipmode:
        {
-               m_cue->m_seek_requests.push_back(std::pair<int, pts_t>(1, 0)); /* resync */
-               if (m_cue->m_skipmode_ratio)
                {
-                       int bitrate = m_tstools.calcBitrate(); /* in bits/s */
-                       eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate);
-                                       /* i agree that this might look a bit like black magic. */
-                       m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
-                       m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio;
-
-                       eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n);
-                       
-                       if (abs(m_skipmode_m) < abs(m_skipmode_n))
+                       eSingleLocker l(m_cue->m_lock);
+                       m_cue->m_seek_requests.push_back(std::pair<int, pts_t>(1, 0)); /* resync */
+                       if (m_cue->m_skipmode_ratio)
+                       {
+                               int bitrate = m_tstools.calcBitrate(); /* in bits/s */
+                               eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate);
+                                               /* i agree that this might look a bit like black magic. */
+                               m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
+                               m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio;
+       
+                               eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n);
+                               
+                               if (abs(m_skipmode_m) < abs(m_skipmode_n))
+                               {
+                                       eFatal("damn, something is wrong with this calculation");
+                                       m_skipmode_n = m_skipmode_m = 0;
+                               }
+                               
+                       } else
                        {
-                               eFatal("damn, something is wrong with this calculation");
+                               eDebug("skipmode ratio is 0, normal play");
                                m_skipmode_n = m_skipmode_m = 0;
                        }
-                       
-               } else
-               {
-                       eDebug("skipmode ratio is 0, normal play");
-                       m_skipmode_n = m_skipmode_m = 0;
                }
                flushPVR(m_cue->m_decoding_demux);
                break;
@@ -685,6 +728,8 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                size = max;
                return;
        }
+
+       eSingleLocker l(m_cue->m_lock);
        
        if (!m_cue->m_decoding_demux)
        {
@@ -778,7 +823,11 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 
 void eDVBChannel::AddUse()
 {
-       ++m_use_count;
+       if (++m_use_count > 1 && m_state == state_last_instance)
+       {
+               m_state = state_ok;
+               m_stateChanged(this);
+       }
 }
 
 void eDVBChannel::ReleaseUse()
@@ -788,6 +837,11 @@ void eDVBChannel::ReleaseUse()
                m_state = state_release;
                m_stateChanged(this);
        }
+       else if (m_use_count == 1)
+       {
+               m_state = state_last_instance;
+               m_stateChanged(this);
+       }
 }
 
 RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontendParameters> &feparm)
@@ -1021,24 +1075,34 @@ eCueSheet::eCueSheet()
 
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
-       m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
+       {
+               eSingleLock l(m_lock);
+               m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
+       }
        m_event(evtSeek);
 }
        
 void eCueSheet::clear()
 {
+       eSingleLock l(m_lock);
        m_spans.clear();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
-       m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
+       {
+               eSingleLock l(m_lock);
+               m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
+       }
        m_event(evtSpanChanged);
 }
 
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
-       m_skipmode_ratio = ratio;
+       {
+               eSingleLock l(m_lock);
+               m_skipmode_ratio = ratio;
+       }
        m_event(evtSkipmode);
 }