X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe478efd1c354b304a3b68aa8fbcc5e5a53e7833..f9aafeeb6715c4d5970bdad0f77fd0a7c9003163:/lib/dvb/pvrparse.cpp diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp index 5d301373..a6113329 100644 --- a/lib/dvb/pvrparse.cpp +++ b/lib/dvb/pvrparse.cpp @@ -63,8 +63,7 @@ void eMPEGStreamInformation::fixupDiscontinuties() if (!m_access_points.size()) return; - int first_is_unreliable = 0; - eDebug("Fixing discontinuities ..."); +// eDebug("Fixing discontinuities ..."); /* if we have no delta at the beginning, extrapolate it */ if ((m_access_points.find(0) == m_access_points.end()) && (m_access_points.size() > 1)) @@ -78,8 +77,7 @@ void eMPEGStreamInformation::fixupDiscontinuties() tdiff *= first->first; tdiff /= diff; m_timestamp_deltas[0] = first->second - tdiff; - first_is_unreliable = 1; - eDebug("first delta is %08llx", first->second - tdiff); +// eDebug("first delta is %08llx", first->second - tdiff); } } @@ -91,25 +89,29 @@ void eMPEGStreamInformation::fixupDiscontinuties() { pts_t current = i->second - currentDelta; pts_t diff = current - lastpts_t; - if ((first_is_unreliable) || (diff > (90000*5))) // 5sec diff + + if (llabs(diff) > (90000*5)) // 5sec diff { - first_is_unreliable = 0; - eDebug("%llx < %llx, have discont. new timestamp is %llx (diff is %llx)!", current, lastpts_t, i->second, diff); +// eDebug("%llx < %llx, have discont. new timestamp is %llx (diff is %llx)!", current, lastpts_t, i->second, diff); currentDelta = i->second - lastpts_t; /* FIXME: should be the extrapolated new timestamp, based on the current rate */ - eDebug("current delta now %llx, making current to %llx", currentDelta, i->second - currentDelta); +// eDebug("current delta now %llx, making current to %llx", currentDelta, i->second - currentDelta); m_timestamp_deltas[i->first] = currentDelta; } lastpts_t = i->second - currentDelta; } - eDebug("ok, found %d disconts.", m_timestamp_deltas.size()); - - - for (off_t x=0; x < 1000000; x+= 100000) +// eDebug("ok, found %d disconts.", m_timestamp_deltas.size()); + +#if 0 + for (off_t x=0x25807E34ULL; x < 0x25B3CF70; x+= 100000) { - eDebug("%08llx -> %08llx | %08llx", x, getDelta(x), getInterpolated(x)); + off_t o = x; + pts_t p; + int r = getPTS(o, p); + eDebug("%08llx -> %08llx | %08llx, %d, %08llx %08llx", x, getDelta(x), getInterpolated(x), r, o, p); } +#endif } pts_t eMPEGStreamInformation::getDelta(off_t offset) @@ -125,11 +127,12 @@ pts_t eMPEGStreamInformation::getDelta(off_t offset) return i->second; } -pts_t eMPEGStreamInformation::fixuppts_t(off_t offset, pts_t ts) +int eMPEGStreamInformation::fixupPTS(const off_t &offset, pts_t &ts) { if (!m_timestamp_deltas.size()) - return 0; - std::map::const_iterator i = m_access_points.upper_bound(offset - 1024 * 1024), nearest = m_access_points.end(); + return -1; + + std::map::const_iterator i = m_access_points.upper_bound(offset - 4 * 1024 * 1024), nearest = m_access_points.end(); while (i != m_access_points.end()) { @@ -138,8 +141,29 @@ pts_t eMPEGStreamInformation::fixuppts_t(off_t offset, pts_t ts) ++i; } if (nearest == m_access_points.end()) - return 0; - return ts - getDelta(nearest->first); + return -1; + ts -= getDelta(nearest->first); + return 0; +} + +int eMPEGStreamInformation::getPTS(off_t &offset, pts_t &pts) +{ + std::map::iterator before = m_access_points.lower_bound(offset); + + /* usually, we prefer the AP before the given offset. however if there is none, we take any. */ + if (before != m_access_points.begin()) + --before; + + if (before == m_access_points.end()) + { + pts = 0; + return -1; + } + + offset = before->first; + pts = before->second - getDelta(offset); + + return 0; } pts_t eMPEGStreamInformation::getInterpolated(off_t offset) @@ -184,9 +208,7 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts) off_t last = 0; for (std::map::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i) { - std::map::const_iterator d = m_timestamp_deltas.find(i->first); - if (d != m_timestamp_deltas.end()) - delta = d->second; + pts_t delta = getDelta(i->first); pts_t c = i->second - delta; if (c > ts) break; @@ -195,6 +217,41 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts) return last; } +int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction) +{ + off_t offset = getAccessPoint(start); + std::map::const_iterator i = m_access_points.find(offset); + if (i == m_access_points.end()) + { + eDebug("getNextAccessPoint: initial AP not found"); + return -1; + } + while (direction) + { + if (direction > 0) + { + if (i == m_access_points.end()) + return -1; + ++i; + direction--; + } + if (direction < 0) + { + if (i == m_access_points.begin()) + { + eDebug("at start"); + return -1; + } + --i; + direction++; + } + } + ts = i->second - getDelta(i->first); + eDebug("fine, at %llx - %llx = %llx", ts, i->second, getDelta(i->first)); + eDebug("fine, at %lld - %lld = %lld", ts, i->second, getDelta(i->first)); + return 0; +} + eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0) { } @@ -202,7 +259,7 @@ eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset) { if (!wantPacket(pkt)) - printf("ne irgendwas ist da falsch\n"); + eWarning("something's wrong."); const unsigned char *end = pkt + 188; @@ -305,6 +362,30 @@ void eMPEGStreamParserTS::parseData(off_t offset, const void *data, unsigned int /* sorry for the redundant code here, but there are too many special cases... */ while (len) { + /* emergency resync. usually, this should not happen, because the data should + be sync-aligned. + + to make this code work for non-strictly-sync-aligned data, (for example, bad + files) we fix a possible resync here by skipping data until the next 0x47. + + if this is a false 0x47, the packet will be dropped by wantPacket, and the + next time, sync will be re-established. */ + int skipped = 0; + while (!m_pktptr && len) + { + if (packet[0] == 0x47) + break; + len--; + packet++; + skipped++; + } + + if (skipped) + eDebug("SYNC LOST: skipped %d bytes.", skipped); + + if (!len) + break; + if (m_pktptr) { /* skip last packet */