X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ftstools.cpp;h=2e5c5665d9e7a01bb15508078dbc2c5264e55ca6;hp=fa65a6d456739b89721b9ce50e7e3fa6a363526d;hb=ba844ce3b7d36486490e15066cf187e9e5f8e39c;hpb=033fe30e922c92d4b8e5804814ab88bca523b42b diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp index fa65a6d..2e5c566 100644 --- a/lib/dvb/tstools.cpp +++ b/lib/dvb/tstools.cpp @@ -32,7 +32,10 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo) 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; @@ -68,7 +71,8 @@ void eDVBTSTools::setSearchRange(int maxrange) 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; @@ -141,9 +145,9 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed) payload = packet + 4; - if (m_pid >= 0) +/* if (m_pid >= 0) if (pid != m_pid) - continue; + continue; */ if (!pusi) continue; @@ -183,7 +187,8 @@ int eDVBTSTools::fixupPTS(const off_t &offset, pts_t &now) { 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. */ @@ -209,11 +214,14 @@ int eDVBTSTools::fixupPTS(const off_t &offset, pts_t &now) } } -int eDVBTSTools::getOffset(off_t &offset, pts_t &pts) +int eDVBTSTools::getOffset(off_t &offset, pts_t &pts, int marg) { 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 { @@ -258,6 +266,14 @@ int eDVBTSTools::getOffset(off_t &offset, pts_t &pts) pts_t pts_diff = u->first - l->first; off_t offset_diff = u->second - l->second; + + if (offset_diff < 0) + { + eDebug("something went wrong when taking samples."); + m_samples.clear(); + takeSamples(); + continue; + } eDebug("using: %llx:%llx -> %llx:%llx", l->first, u->first, l->second, u->second); @@ -295,12 +311,14 @@ int eDVBTSTools::getOffset(off_t &offset, pts_t &pts) if (p != -1) { pts = p; + eDebug("aborting. Taking %llx as offset for %lld", offset, pts); return 0; } } int bitrate = calcBitrate(); offset = pts * (pts_t)bitrate / 8ULL / 90000ULL; + eDebug("fallback, bitrate=%d, results in %016llx", bitrate, offset); offset -= offset % 188; return 0; @@ -448,6 +466,29 @@ int eDVBTSTools::takeSample(off_t off, pts_t &p) { if (!eDVBTSTools::getPTS(off, p, 1)) { + /* as we are happily mixing PTS and PCR values (no comment, please), we might + end up with some "negative" segments. + + so check if this new sample is between the previous and the next field*/ + + std::map::const_iterator l = m_samples.lower_bound(p); + std::map::const_iterator u = l; + + if (l != m_samples.begin()) + { + --l; + if (u != m_samples.end()) + { + if ((l->second > off) || (u->second < off)) + { + eDebug("ignoring sample %llx %llx %llx (%lld %lld %lld)", + l->second, off, u->second, l->first, p, u->first); + return 1; + } + } + } + + m_samples[p] = off; return 0; } @@ -526,3 +567,138 @@ 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, direction; +// eDebug("trying to move %d frames at %llx", distance, offset); + + frame_types = frametypeI; /* TODO: intelligent "allow IP frames when not crossing an I-Frame */ + + off_t new_offset = offset; + size_t new_len = len; + int first = 1; + + if (distance > 0) { + direction = 0; + nr_frames = 0; + } else { + direction = -1; + nr_frames = -1; + distance = -distance+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 || direction == 0) + { + first = 0; + offset = new_offset; + len = new_len; + nr_frames += abs(dir); + } + else if (first) { + first = 0; + offset = new_offset; + len = new_len; + nr_frames += abs(dir) + distance; // never jump forward during rewind + } + } + + distance = (direction < 0) ? -nr_frames : nr_frames; +// eDebug("in total, we moved %d frames", nr_frames); + + return 0; +}