X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/af6a8a3a102ff0230fcc6d90ad213e2e7d706fa8..ee592339f4631a94c8b6ce1bc62bb1bfed0a0ec8:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index ad5dfa64..934ce249 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -42,6 +42,23 @@ DEFINE_REF(eDVBResourceManager); eDVBResourceManager *eDVBResourceManager::instance; +RESULT eDVBResourceManager::getInstance(ePtr &ptr) +{ + if (instance) + { + ptr = instance; + return 0; + } + return -1; +} + +ePtr NewResourceManagerPtr(void) +{ + ePtr ptr; + eDVBResourceManager::getInstance(ptr); + return ptr; +} + eDVBResourceManager::eDVBResourceManager() :m_releaseCachedChannelTimer(eApp) { @@ -68,6 +85,14 @@ eDVBResourceManager::eDVBResourceManager() CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel); } +void eDVBResourceManager::feStateChanged() +{ + int mask=0; + for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i) + if (i->m_inuse) + mask |= ( 1 << i->m_frontend->getID() ); + /* emit */ frontendUseMaskChanged(mask); +} DEFINE_REF(eDVBAdapterLinux); eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr) @@ -197,14 +222,28 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) m_demux.push_back(new eDVBRegisteredDemux(demux, adapter)); } + ePtr prev_dvbt_frontend; for (i=0; i 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; + } } } } @@ -263,12 +302,23 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr 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); @@ -278,6 +328,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtrget().setSourcePVR(0); return 0; } + } eDebug("demux not found"); return -1; } @@ -422,9 +473,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr 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 +518,7 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1 & return 0; } -bool eDVBResourceManager::canAllocateFrontend(ePtr &feparm) +int eDVBResourceManager::canAllocateFrontend(ePtr &feparm) { ePtr best; int bestval = 0; @@ -473,12 +531,12 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr &fepa bestval = c; } - return bestval>0; + return bestval; } -bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore) +int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore) { - bool ret=true; + int ret=30000; if (m_cached_channel) { eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel); @@ -507,7 +565,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 is used in eDVBServicePMTHandler + // another on eUsePtr 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 fe; if (!i->m_channel->getFrontend(fe)) @@ -560,14 +622,14 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con if (!m_list) { eDebug("no channel list set!"); - ret = false; + ret = 0; goto error; } if (m_list->getChannelFrontendData(channelid, feparm)) { eDebug("channel not found!"); - ret = false; + ret = 0; goto error; } @@ -582,6 +644,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 ¤t_span_remaining); +}; + +int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, size_t ¤t_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) @@ -704,7 +860,10 @@ void eDVBChannel::cueSheetEvent(int event) m_skipmode_n = m_skipmode_m = 0; } } + 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 +886,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) { @@ -749,17 +926,17 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off eDebug("getNextSourceSpan, no decoding demux. forcing normal play"); 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; - + + current_offset += align(m_skipmode_m, blocksize); + while (!m_cue->m_seek_requests.empty()) { std::pair seek = m_cue->m_seek_requests.front(); @@ -785,10 +962,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) @@ -811,33 +1004,45 @@ 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; } - + for (std::list >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i) { - if ((current_offset >= i->first) && (current_offset < i->second)) + int aligned_start = align(i->first, blocksize); + int 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,12 +1056,15 @@ 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; + + if ((i->second - i->first) > max) + len = max; + else + len = aligned_end - aligned_start; + + start = aligned_end - len; + eDebug("skipping to %llx, %d", start, len); } return; } @@ -871,6 +1079,7 @@ 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); return; } @@ -967,6 +1176,11 @@ RESULT eDVBChannel::getDemux(ePtr &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 +1188,9 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) RESULT eDVBChannel::getFrontend(ePtr &frontend) { + frontend = 0; + if (!m_frontend) + return -ENODEV; frontend = &m_frontend->get(); if (frontend) return 0; @@ -1012,12 +1229,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 +1244,9 @@ RESULT eDVBChannel::playFile(const char *file) } CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); + m_state = state_ok; + m_stateChanged(this); + return 0; } @@ -1127,7 +1345,7 @@ eCueSheet::eCueSheet() void eCueSheet::seekTo(int relative, const pts_t &pts) { { - eSingleLock l(m_lock); + eSingleLocker l(m_lock); m_seek_requests.push_back(std::pair(relative, pts)); } m_event(evtSeek); @@ -1135,14 +1353,14 @@ void eCueSheet::seekTo(int relative, const pts_t &pts) void eCueSheet::clear() { - eSingleLock l(m_lock); + eSingleLocker l(m_lock); m_spans.clear(); } void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end) { { - eSingleLock l(m_lock); + eSingleLocker l(m_lock); m_spans.push_back(std::pair(begin, end)); } } @@ -1155,7 +1373,7 @@ void eCueSheet::commitSpans() void eCueSheet::setSkipmode(const pts_t &ratio) { { - eSingleLock l(m_lock); + eSingleLocker l(m_lock); m_skipmode_ratio = ratio; } m_event(evtSkipmode);