if (!m_access_points.size())
return;
- int first_is_unreliable = 0;
eDebug("Fixing discontinuities ...");
/* if we have no delta at the beginning, extrapolate it */
tdiff *= first->first;
tdiff /= diff;
m_timestamp_deltas[0] = first->second - tdiff;
- first_is_unreliable = 1;
eDebug("first delta is %08llx", first->second - tdiff);
}
}
{
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);
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("ok, found %d disconts.", m_timestamp_deltas.size());
-
-
- for (off_t x=0; x < 1000000; x+= 100000)
+
+#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)
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<off_t, pts_t>::const_iterator i = m_access_points.upper_bound(offset - 1024 * 1024), nearest = m_access_points.end();
+ return -1;
+
+ std::map<off_t, pts_t>::const_iterator i = m_access_points.upper_bound(offset - 4 * 1024 * 1024), nearest = m_access_points.end();
while (i != m_access_points.end())
{
++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<off_t,pts_t>::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)
off_t last = 0;
for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
{
- std::map<off_t, pts_t>::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;
return last;
}
+int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
+{
+ off_t offset = getAccessPoint(start);
+ std::map<off_t, pts_t>::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)
{
}
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;
/* 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 */