X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7843cbf34ccb5b867ae49fc9e7731247e525f81e..109805bc36dda9d5bc9a8cff1a95091751d1dc40:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 57db2462..b7d278cc 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -42,7 +43,25 @@ 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) { avail = 1; busy = 0; @@ -63,8 +82,20 @@ 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::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) @@ -194,18 +225,57 @@ 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; + } } } } +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::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 &fe, ePtr &feparm) { ePtr best; @@ -233,15 +303,51 @@ RESULT eDVBResourceManager::allocateFrontend(ePtr &fe, eP return -1; } -RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr &fe, int nr) +RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr &fe, int slot_index) { - for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr) - if ((!nr) && !i->m_inuse) + for (eSmartPtrList::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; } @@ -260,21 +366,33 @@ 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); 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; } @@ -304,10 +422,12 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse if(channelid==cache_chan->getChannelID()) { eDebug("use cached_channel"); - channel=m_cached_channel; + channel = m_cached_channel; return 0; } + m_cached_channel_state_changed_conn.disconnect(); m_cached_channel=0; + m_releaseCachedChannelTimer.stop(); } // eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get()); @@ -355,18 +475,54 @@ 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; } -RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel, int frontend_index) +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 (timer timeout)"); + m_cached_channel=0; +} + +RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel, int slot_index) { ePtr fe; if (m_cached_channel) + { + m_cached_channel_state_changed_conn.disconnect(); m_cached_channel=0; + m_releaseCachedChannelTimer.stop(); + } - if (allocateFrontendByIndex(fe, frontend_index)) + if (allocateFrontendByIndex(fe, slot_index)) return errNoFrontend; eDVBChannel *ch; @@ -381,12 +537,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; - if (m_cached_channel) + 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; } @@ -422,7 +582,7 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1 & return 0; } -bool eDVBResourceManager::canAllocateFrontend(ePtr &feparm) +int eDVBResourceManager::canAllocateFrontend(ePtr &feparm) { ePtr best; int bestval = 0; @@ -434,18 +594,44 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr &fepa if (c > bestval) bestval = c; } + return bestval; +} - return bestval>0; +int tuner_type_channel_default(ePtr &channellist, const eDVBChannelID &chid) +{ + if (channellist) + { + ePtr 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. */ @@ -456,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); } } @@ -469,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 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)) @@ -522,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; } @@ -544,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 ¤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) @@ -552,6 +834,8 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte m_pvr_thread = 0; + m_skipmode_n = m_skipmode_m = 0; + if (m_frontend) m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged); } @@ -560,14 +844,8 @@ eDVBChannel::~eDVBChannel() { if (m_channel_id) m_mgr->removeChannel(this); - - if (m_pvr_thread) - { - m_pvr_thread->stop(); - ::close(m_pvr_fd_src); - ::close(m_pvr_fd_dst); - delete m_pvr_thread; - } + + stopFile(); } void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) @@ -591,8 +869,18 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) ourstate = state_tuning; } else if (state == iDVBFrontend::stateLostLock) { - eDebug("OURSTATE: lost lock"); - ourstate = state_unavailable; + /* on managed channels, we try to retune in order to re-acquire lock. */ + if (m_current_frontend_parameters) + { + eDebug("OURSTATE: lost lock, trying to retune"); + ourstate = state_tuning; + m_frontend->get().tune(*m_current_frontend_parameters); + } else + /* on unmanaged channels, we don't do this. the client will do this. */ + { + eDebug("OURSTATE: lost lock, unavailable now."); + ourstate = state_unavailable; + } } else if (state == iDVBFrontend::stateFailed) { eDebug("OURSTATE: failed"); @@ -607,9 +895,304 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) } } +void eDVBChannel::pvrEvent(int event) +{ + switch (event) + { + case eFilePushThread::evtEOF: + eDebug("eDVBChannel: End of file!"); + m_event(this, evtEOF); + break; + case eFilePushThread::evtUser: /* start */ + eDebug("SOF"); + m_event(this, evtSOF); + break; + } +} + +void eDVBChannel::cueSheetEvent(int event) +{ + switch (event) + { + case eCueSheet::evtSeek: + eDebug("seek."); + flushPVR(m_cue->m_decoding_demux); + break; + case eCueSheet::evtSkipmode: + { + { + m_cue->m_lock.WrLock(); + m_cue->m_seek_requests.push_back(std::pair(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 */ + 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 / 8; + + if (m_cue->m_skipmode_ratio < 0) + m_skipmode_m -= m_skipmode_n; + + eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n); + + if (abs(m_skipmode_m) < abs(m_skipmode_n)) + { + eWarning("something is wrong with this calculation"); + m_skipmode_n = m_skipmode_m = 0; + } + + } else + { + eDebug("skipmode ratio is 0, normal play"); + 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: + { + m_source_span.clear(); + for (std::list >::const_iterator i(m_cue->m_spans.begin()); i != m_cue->m_spans.end(); ++i) + { + off_t offset_in, offset_out; + pts_t pts_in = i->first, pts_out = i->second; + if (m_tstools.getOffset(offset_in, pts_in) || m_tstools.getOffset(offset_out, pts_out)) + { + eDebug("span translation failed.\n"); + continue; + } + eDebug("source span: %llx .. %llx, translated to %llx..%llx", pts_in, pts_out, offset_in, offset_out); + m_source_span.push_back(std::pair(offset_in, offset_out)); + } + break; + } + } +} + + /* 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) +{ + const int blocksize = 188; + unsigned int max = align(10*1024*1024, blocksize); + current_offset = align(current_offset, blocksize); + + if (!m_cue) + { + eDebug("no cue sheet. forcing normal play"); + start = current_offset; + size = max; + return; + } + + 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 = align(m_skipmode_n, blocksize); + } + + 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 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; + + pts_t now = 0; + if (relative) + { + if (!m_cue->m_decoder) + { + eDebug("no decoder - can't seek relative"); + continue; + } + if (m_cue->m_decoder->getPTS(0, now)) + { + eDebug("decoder getPTS failed, can't seek relative"); + continue; + } + if (getCurrentPosition(m_cue->m_decoding_demux, now, 1)) + { + 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) + 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 - 90000; /* approx. 1s */ + 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)) + { + 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 = align(offset, blocksize); /* in case tstools return non-aligned offset */ + } + + m_cue->m_lock.Unlock(); + + for (std::list >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i) + { + 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; + /* max can not exceed max(size_t). aligned_end - current_offset, however, can. */ + if ((aligned_end - current_offset) > max) + size = max; + else + size = aligned_end - current_offset; + eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size); + return; + } + 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 is not 64bit! */ + if ((i->second - i->first) > max) + size = max; + else + size = aligned_end - aligned_start; + + eDebug("skip"); + if (m_skipmode_m < 0) + { + eDebug("reached SOF"); + /* reached SOF */ + m_skipmode_m = 0; + m_pvr_thread->sendEvent(eFilePushThread::evtUser); + } + } else + { + /* 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; + + 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; +} + 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() @@ -619,6 +1202,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 &feparm) @@ -641,6 +1229,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtrget().tune(*feparm); + m_current_frontend_parameters = feparm; if (res) { @@ -658,6 +1247,12 @@ RESULT eDVBChannel::connectStateChange(const Slot1 &stateChan return 0; } +RESULT eDVBChannel::connectEvent(const Slot2 &event, ePtr &connection) +{ + connection = new eConnection((iDVBChannel*)this, m_event.connect(event)); + return 0; +} + RESULT eDVBChannel::getState(int &state) { state = m_state; @@ -671,7 +1266,6 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing) RESULT eDVBChannel::getDemux(ePtr &demux, int cap) { - eDebug("get %d demux", cap); ePtr &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux; if (!our_demux) @@ -680,24 +1274,35 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap)) return -1; - } 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; } RESULT eDVBChannel::getFrontend(ePtr &frontend) { + frontend = 0; + if (!m_frontend) + return -ENODEV; frontend = &m_frontend->get(); if (frontend) return 0; - else - return -ENODEV; + return -ENODEV; +} + +RESULT eDVBChannel::getCurrentFrontendParameters(ePtr ¶m) +{ + param = m_current_frontend_parameters; + return 0; } RESULT eDVBChannel::playFile(const char *file) @@ -716,30 +1321,56 @@ RESULT eDVBChannel::playFile(const char *file) THEN DO A REAL FIX HERE! */ /* (this codepath needs to be improved anyway.) */ +#if HAVE_DVB_API_VERSION < 3 + m_pvr_fd_dst = open("/dev/pvr", O_WRONLY); +#else m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY); +#endif if (m_pvr_fd_dst < 0) { 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_pvr_fd_src = open(file, O_RDONLY|O_LARGEFILE); - if (m_pvr_fd_src < 0) + + 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)) { - eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file); - close(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); + m_state = state_ok; m_stateChanged(this); - - m_pvr_thread = new eFilePushThread(); - m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst); return 0; } +void eDVBChannel::stopFile() +{ + if (m_pvr_thread) + { + m_pvr_thread->stop(); + ::close(m_pvr_fd_dst); + delete m_pvr_thread; + m_pvr_thread = 0; + } +} + +void eDVBChannel::setCueSheet(eCueSheet *cuesheet) +{ + m_conn_cueSheetEvent = 0; + m_cue = cuesheet; + if (m_cue) + m_cue->connectEvent(slot(*this, &eDVBChannel::cueSheetEvent), m_conn_cueSheetEvent); +} + RESULT eDVBChannel::getLength(pts_t &len) { return m_tstools.calcLen(len); @@ -750,71 +1381,35 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in if (!decoding_demux) return -1; - off_t begin = 0; - /* getPTS for offset 0 is cached, so it doesn't harm. */ - int r = m_tstools.getPTS(begin, pos); - if (r) - { - eDebug("tstools getpts(0) failed!"); - return r; - } - pts_t now; - /* TODO: this is a gross hack. */ - r = decoding_demux->getSTC(now, mode ? 128 : 0); - - if (r) - { - eDebug("demux getSTC failed"); - return -1; - } + int r; -// eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos); - /* when we are less than 10 seconds before the start, return 0. */ - /* (we're just waiting for the timespam to start) */ - if ((now < pos) && ((pos - now) < 90000 * 10)) + if (mode == 0) /* demux */ { - pos = 0; - return 0; - } - - if (now < pos) /* wrap around */ - pos = now + ((pts_t)1)<<33 - pos; - else - pos = now - pos; - - return 0; -} - -RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) -{ - int bitrate = m_tstools.calcBitrate(); /* in bits/s */ - - if (bitrate == -1) - return -1; - - if (relative) - { - pts_t now; - if (getCurrentPosition(decoding_demux, now, 0)) + r = decoding_demux->getSTC(now, 0); + if (r) { - eDebug("seekTo: getCurrentPosition failed!"); + eDebug("demux getSTC failed"); return -1; } - pts += now; - } + } else + now = pos; /* fixup supplied */ - if (pts < 0) - pts = 0; + off_t off = 0; /* TODO: fixme */ + r = m_tstools.fixupPTS(off, now); + if (r) + { + eDebug("fixup PTS failed"); + return -1; + } - off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; + pos = now; - seekToPosition(decoding_demux, offset); return 0; } -RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) +void eDVBChannel::flushPVR(iDVBDemux *decoding_demux) { /* when seeking, we have to ensure that all buffers are flushed. there are basically 3 buffers: @@ -826,12 +1421,10 @@ RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) the ratebuffer (for example) would immediately refill from the not-yet-flushed PVR buffer. */ - eDebug("eDVBChannel: seekToPosition .. %llx", r); - m_pvr_thread->pause(); + m_pvr_thread->pause(); /* flush internal filepush buffer */ m_pvr_thread->flush(); - /* HACK: flush PVR buffer */ ::ioctl(m_pvr_fd_dst, 0); @@ -840,7 +1433,60 @@ RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) decoding_demux->flush(); /* demux will also flush all decoder.. */ - m_pvr_thread->seek(SEEK_SET, r); + /* resume will re-query the SG */ m_pvr_thread->resume(); +} + +DEFINE_REF(eCueSheet); + +eCueSheet::eCueSheet() +{ + m_skipmode_ratio = 0; +} + +void eCueSheet::seekTo(int relative, const pts_t &pts) +{ + m_lock.WrLock(); + m_seek_requests.push_back(std::pair(relative, pts)); + m_lock.Unlock(); + m_event(evtSeek); +} + +void eCueSheet::clear() +{ + m_lock.WrLock(); + m_spans.clear(); + m_lock.Unlock(); +} + +void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end) +{ + m_lock.WrLock(); + m_spans.push_back(std::pair(begin, end)); + m_lock.Unlock(); +} + +void eCueSheet::commitSpans() +{ + m_event(evtSpanChanged); +} + +void eCueSheet::setSkipmode(const pts_t &ratio) +{ + m_lock.WrLock(); + m_skipmode_ratio = ratio; + m_lock.Unlock(); + m_event(evtSkipmode); +} + +void eCueSheet::setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder) +{ + m_decoding_demux = demux; + m_decoder = decoder; +} + +RESULT eCueSheet::connectEvent(const Slot1 &event, ePtr &connection) +{ + connection = new eConnection(this, m_event.connect(event)); return 0; }