closeFile();
if (!nostreaminfo)
- m_streaminfo.load((std::string(filename) + ".ap").c_str());
+ {
+ eDebug("loading streaminfo for %s", filename);
+ m_streaminfo.load(filename);
+ }
if (!m_streaminfo.empty())
m_use_streaminfo = 1;
int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
{
if (m_use_streaminfo)
- return m_streaminfo.getPTS(offset, pts);
+ if (!m_streaminfo.getPTS(offset, pts))
+ return 0;
if (!m_file.valid())
return -1;
pts |= ((unsigned long long)(packet[ 9]&0xFF)) << 1;
pts |= ((unsigned long long)(packet[10]&0x80)) >> 7;
offset -= 188;
- eDebug("PCR found at %llx: %16llx", offset, pts);
+ eDebug("PCR %16llx found at %lld pid %02x (%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x)", pts, offset, pid, packet[0], packet[1], packet[2], packet[3], packet[4], packet[5], packet[6], packet[7], packet[8], packet[9], packet[10]);
if (fixed && fixupPTS(offset, pts))
return -1;
return 0;
payload = packet + 4;
- if (m_pid >= 0)
+/* if (m_pid >= 0)
if (pid != m_pid)
- continue;
+ continue; */
if (!pusi)
continue;
pts |= ((unsigned long long)(payload[13]&0xFE)) >> 1;
offset -= 188;
-// eDebug("found pts %08llx at %08llx pid %02x stream: %02x", pts, offset, pid, payload[3]);
-
+ eDebug("PTS %16llx found at %lld pid %02x stream: %02x", pts, offset, pid, payload[3]);
+
/* convert to zero-based */
if (fixed && fixupPTS(offset, pts))
- return -1;
+ return -1;
return 0;
}
}
{
if (m_use_streaminfo)
{
- return m_streaminfo.fixupPTS(offset, now);
+ if (!m_streaminfo.fixupPTS(offset, now))
+ return 0;
} else
{
/* for the simple case, we assume one epoch, with up to one wrap around in the middle. */
now -= pos;
return 0;
}
+ eDebug("eDVBTSTools::fixupPTS failed!");
+ return -1;
}
-int eDVBTSTools::getOffset(off_t &offset, pts_t &pts)
+int eDVBTSTools::getOffset(off_t &offset, pts_t &pts, int marg)
{
+ eDebug("getOffset for pts 0x%llx", pts);
if (m_use_streaminfo)
{
- offset = m_streaminfo.getAccessPoint(pts);
+ if (pts >= m_pts_end && marg > 0 && m_end_valid)
+ offset = m_offset_end;
+ else
+ offset = m_streaminfo.getAccessPoint(pts, marg);
return 0;
} else
{
m_samples_taken = 1;
m_samples.clear();
pts_t dummy;
+ int retries=2;
+
if (calcLen(dummy) == -1)
return;
bytes_per_sample = 40*1024*1024;
bytes_per_sample -= bytes_per_sample % 188;
-
- for (off_t offset = m_offset_begin; offset < m_offset_end; offset += bytes_per_sample)
+
+ eDebug("samples step %lld, pts begin %llx, pts end %llx, offs begin %lld, offs end %lld:",
+ bytes_per_sample, m_pts_begin, m_pts_end, m_offset_begin, m_offset_end);
+
+ for (off_t offset = m_offset_begin; offset < m_offset_end;)
{
pts_t p;
- takeSample(offset, p);
+ if (takeSample(offset, p) && retries--)
+ continue;
+ retries = 2;
+ offset += bytes_per_sample;
}
m_samples[0] = m_offset_begin;
m_samples[m_pts_end - m_pts_begin] = m_offset_end;
-
-// eDebug("begin, end: %llx %llx", m_offset_begin, m_offset_end);
}
/* returns 0 when a sample was taken. */
int eDVBTSTools::takeSample(off_t off, pts_t &p)
{
+ off_t offset_org = off;
+
if (!eDVBTSTools::getPTS(off, p, 1))
{
/* as we are happily mixing PTS and PCR values (no comment, please), we might
{
if ((l->second > off) || (u->second < off))
{
- eDebug("ignoring sample %llx %llx %llx (%lld %lld %lld)",
+ eDebug("ignoring sample %lld %lld %lld (%llx %llx %llx)",
l->second, off, u->second, l->first, p, u->first);
return 1;
}
}
}
-
+ eDebug("adding sample %lld: pts 0x%llx -> pos %lld (diff %lld bytes)", offset_org, p, off, off-offset_org);
m_samples[p] = off;
return 0;
}
- return 1;
+ return -1;
}
int eDVBTSTools::findPMT(int &pmt_pid, int &service_id)
return -1;
}
+
+int eDVBTSTools::findFrame(off_t &_offset, size_t &len, int &direction, int frame_types)
+{
+ off_t offset = _offset;
+ int nr_frames = 0;
+// eDebug("trying to find iFrame at %llx", offset);
+
+ if (!m_use_streaminfo)
+ {
+// eDebug("can't get next iframe without streaminfo");
+ return -1;
+ }
+
+ /* let's find the iframe before the given offset */
+ unsigned long long data;
+
+ if (direction < 0)
+ offset--;
+
+ while (1)
+ {
+ if (m_streaminfo.getStructureEntry(offset, data, (direction == 0) ? 1 : 0))
+ {
+ eDebug("getting structure info for origin offset failed.");
+ return -1;
+ }
+ if (offset == 0x7fffffffffffffffLL) /* eof */
+ {
+ eDebug("reached eof");
+ return -1;
+ }
+ /* data is usually the start code in the lower 8 bit, and the next byte <<8. we extract the picture type from there */
+ /* we know that we aren't recording startcode 0x09 for mpeg2, so this is safe */
+ /* TODO: check frame_types */
+ int is_start = (data & 0xE0FF) == 0x0009; /* H.264 NAL unit access delimiter with I-frame*/
+ is_start |= (data & 0x3800FF) == 0x080000; /* MPEG2 picture start code with I-frame */
+
+ int is_frame = ((data & 0xFF) == 0x0009) || ((data & 0xFF) == 0x00); /* H.264 UAD or MPEG2 start code */
+
+ if (is_frame)
+ {
+ if (direction < 0)
+ --nr_frames;
+ else
+ ++nr_frames;
+ }
+// eDebug("%08llx@%llx -> %d, %d", data, offset, is_start, nr_frames);
+ if (is_start)
+ break;
+
+ if (direction == -1)
+ --offset; /* move to previous entry */
+ else if (direction == +1)
+ direction = 0;
+ }
+ /* let's find the next frame after the given offset */
+ off_t start = offset;
+
+ do {
+ if (m_streaminfo.getStructureEntry(offset, data, 1))
+ {
+ eDebug("get next failed");
+ return -1;
+ }
+ if (offset == 0x7fffffffffffffffLL) /* eof */
+ {
+ eDebug("reached eof (while looking for end of iframe)");
+ return -1;
+ }
+// eDebug("%08llx@%llx (next)", data, offset);
+ } while (((data & 0xFF) != 9) && ((data & 0xFF) != 0x00)); /* next frame */
+
+ /* align to TS pkt start */
+// start = start - (start % 188);
+// offset = offset - (offset % 188);
+
+ len = offset - start;
+ _offset = start;
+ direction = nr_frames;
+// eDebug("result: offset=%llx, len: %ld", offset, (int)len);
+ return 0;
+}
+
+int eDVBTSTools::findNextPicture(off_t &offset, size_t &len, int &distance, int frame_types)
+{
+ int nr_frames = 0;
+// eDebug("trying to move %d frames at %llx", distance, offset);
+
+ frame_types = frametypeI; /* TODO: intelligent "allow IP frames when not crossing an I-Frame */
+
+ int direction = distance > 0 ? 0 : -1;
+ distance = abs(distance);
+
+ off_t new_offset = offset;
+ size_t new_len = len;
+ int first = 1;
+
+ while (distance > 0)
+ {
+ int dir = direction;
+ if (findFrame(new_offset, new_len, dir, frame_types))
+ {
+// eDebug("findFrame failed!\n");
+ return -1;
+ }
+
+ distance -= abs(dir);
+
+// eDebug("we moved %d, %d to go frames (now at %llx)", dir, distance, new_offset);
+
+ if (distance >= 0 || first)
+ {
+ first = 0;
+ offset = new_offset;
+ len = new_len;
+ nr_frames += abs(dir);
+ }
+ }
+
+ distance = (direction < 0) ? -nr_frames : nr_frames;
+// eDebug("in total, we moved %d frames", nr_frames);
+
+ return 0;
+}
git.cweiske.de / enigma2.git / blobdiff