if (!f)
return -1;
m_access_points.clear();
+ m_pts_to_offset.clear();
while (1)
{
unsigned long long d[2];
d[1] = bswap_64(d[1]);
#endif
m_access_points[d[0]] = d[1];
+ m_pts_to_offset.insert(std::pair<pts_t,off_t>(d[1], d[0]));
}
fclose(f);
fixupDiscontinuties();
/* 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;
return before_ts + diff;
}
-off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
+off_t eMPEGStreamInformation::getAccessPoint(pts_t ts, int marg)
{
/* FIXME: more efficient implementation */
- pts_t delta = 0;
off_t last = 0;
+ off_t last2 = 0;
+ pts_t lastc = 0;
for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
{
pts_t delta = getDelta(i->first);
pts_t c = i->second - delta;
- if (c > ts)
- break;
+ if (c > ts) {
+ if (marg > 0)
+ return (last + i->first)/376*188;
+ else if (marg < 0)
+ return (last + last2)/376*188;
+ else
+ return last;
+ }
+ lastc = c;
+ last2 = last;
last = i->first;
}
- return last;
+ if (marg < 0)
+ return (last + last2)/376*188;
+ else
+ return last;
}
int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
{
off_t offset = getAccessPoint(start);
+ pts_t c1, c2;
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;
}
+ c1 = i->second - getDelta(i->first);
while (direction)
{
if (direction > 0)
if (i == m_access_points.end())
return -1;
++i;
+ c2 = i->second - getDelta(i->first);
+ if (c1 == c2) { // Discontinuity
+ ++i;
+ c2 = i->second - getDelta(i->first);
+ }
+ c1 = c2;
direction--;
}
if (direction < 0)
return -1;
}
--i;
+ c2 = i->second - getDelta(i->first);
+ if (c1 == c2) { // Discontinuity
+ --i;
+ c2 = i->second - getDelta(i->first);
+ }
+ c1 = c2;
direction++;
}
}
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 (pkt[3] == 0x09 && /* MPEG4 AVC unit access delimiter */
+ (pkt[4] >> 5) == 0) /* and I-frame */
{
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;