if (!f)
return -1;
m_access_points.clear();
+ m_pts_to_offset.clear();
+ pts_t last = -(1LL<<62);
+ int loaded = 0, skipped = 0;
while (1)
{
unsigned long long d[2];
d[0] = bswap_64(d[0]);
d[1] = bswap_64(d[1]);
#endif
- m_access_points[d[0]] = d[1];
+ if ((d[1] - last) > 90000/2)
+ {
+ m_access_points[d[0]] = d[1];
+ m_pts_to_offset.insert(std::pair<pts_t,off_t>(d[1], d[0]));
+ last = d[1];
+ loaded++;
+ } else
+ skipped++;
}
+ eDebug("loaded %d, skipped %d", loaded, skipped);
fclose(f);
fixupDiscontinuties();
return 0;
/* i can be the first when you query for something before the first PTS */
if (i != m_timestamp_deltas.begin())
--i;
-
+
return i->second;
}
if (!m_timestamp_deltas.size())
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())
+ std::multimap<pts_t, off_t>::const_iterator
+ l = m_pts_to_offset.upper_bound(ts - 60 * 90000),
+ u = m_pts_to_offset.upper_bound(ts + 60 * 90000),
+ nearest = m_pts_to_offset.end();
+
+ while (l != u)
{
- if ((nearest == m_access_points.end()) || (llabs(i->second - ts) < llabs(nearest->second - ts)))
- nearest = i;
- ++i;
+ if ((nearest == m_pts_to_offset.end()) || (llabs(l->first - ts) < llabs(nearest->first - ts)))
+ nearest = l;
+ ++l;
}
- if (nearest == m_access_points.end())
- return -1;
- ts -= getDelta(nearest->first);
+ if (nearest == m_pts_to_offset.end())
+ return 1;
+
+ ts -= getDelta(nearest->second);
+
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;
{
/* get the PTS values before and after the offset. */
std::map<off_t,pts_t>::iterator before, after;
-
after = m_access_points.upper_bound(offset);
before = after;
off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
{
/* FIXME: more efficient implementation */
- pts_t delta = 0;
off_t last = 0;
for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
{
return 0;
}
-eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0)
+eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0), m_last_pts_valid(0)
{
}
pts |= ((unsigned long long)(pkt[12]&0xFF)) << 7;
pts |= ((unsigned long long)(pkt[13]&0xFE)) >> 1;
ptsvalid = 1;
+
+ m_last_pts = pts;
+ m_last_pts_valid = 1;
#if 0
int sec = pts / 90000;
if (ptsvalid)
{
m_streaminfo.m_access_points[offset] = pts;
- eDebug("Sequence header at %llx, pts %llx", offset, pts);
+// eDebug("Sequence header at %llx, pts %llx", offset, pts);
} else
- eDebug("Sequence header but no valid PTS value.");
+ /*eDebug("Sequence header but no valid PTS value.")*/;
}
if (pkt[3] == 0x09) /* MPEG4 AVC unit access delimiter */
if (ptsvalid)
{
m_streaminfo.m_access_points[offset] = pts;
- eDebug("MPEG4 AVC UAD at %llx, pts %llx", offset, pts);
+// eDebug("MPEG4 AVC UAD at %llx, pts %llx", offset, pts);
} else
- eDebug("MPEG4 AVC UAD but no valid PTS value.");
+ /*eDebug("MPEG4 AVC UAD but no valid PTS value.")*/;
}
}
return 0;
m_pktptr = 0;
m_pid = _pid;
}
+
+int eMPEGStreamParserTS::getLastPTS(pts_t &last_pts)
+{
+ if (!m_last_pts_valid)
+ {
+ last_pts = 0;
+ return -1;
+ }
+ last_pts = m_last_pts;
+ return 0;
+}
+