X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e2533724e8916f949402182731d30b86b8fdb9b3..fbefcdd764d2b41d6f80f1e17e64bd72c79fa31d:/lib/dvb/tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index bec17a56..b6792c65 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -13,6 +13,8 @@ eDVBTSTools::eDVBTSTools()
 	
 	m_begin_valid = 0;
 	m_end_valid = 0;
+	
+	m_use_streaminfo = 0;
 }
 
 eDVBTSTools::~eDVBTSTools()
@@ -23,6 +25,17 @@ eDVBTSTools::~eDVBTSTools()
 int eDVBTSTools::openFile(const char *filename)
 {
 	closeFile();
+	
+	m_streaminfo.load((std::string(filename) + ".ap").c_str());
+	
+	if (!m_streaminfo.empty())
+		m_use_streaminfo = 1;
+	else
+	{
+		eDebug("no recorded stream information available");
+		m_use_streaminfo = 0;
+	}
+
 	m_fd = ::open(filename, O_RDONLY);
 	if (m_fd < 0)
 		return -1;
@@ -46,8 +59,11 @@ void eDVBTSTools::setSearchRange(int maxrange)
 }
 
 	/* getPTS extracts a pts value from any PID at a given offset. */
-int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
+int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
 {
+	if (m_use_streaminfo)
+		return m_streaminfo.getPTS(offset, pts);
+	
 	if (m_fd < 0)
 		return -1;
 
@@ -63,7 +79,10 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 	{
 		unsigned char block[188];
 		if (read(m_fd, block, 188) != 188)
+		{
+			eDebug("read error");
 			break;
+		}
 		left -= 188;
 		offset += 188;
 		
@@ -112,6 +131,10 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 			pts |= ((unsigned long long)(pes[12]&0xFF)) << 7;
 			pts |= ((unsigned long long)(pes[13]&0xFE)) >> 1;
 			offset -= 188;
+			
+				/* convert to zero-based */
+			if (fixed)
+				fixupPTS(offset, pts);
 			return 0;
 		}
 	}
@@ -119,6 +142,66 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 	return -1;
 }
 
+int eDVBTSTools::fixupPTS(const off_t &offset, pts_t &now)
+{
+	if (m_use_streaminfo)
+	{
+		return m_streaminfo.fixupPTS(offset, now);
+	} else
+	{
+			/* for the simple case, we assume one epoch, with up to one wrap around in the middle. */
+		calcBegin();
+		if (!m_begin_valid)
+		{	
+			eDebug("begin not valid, can't fixup");
+			return -1;
+		}
+		
+		pts_t pos = m_pts_begin;
+		if ((now < pos) && ((pos - now) < 90000 * 10))
+		{	
+			pos = 0;
+			return 0;
+		}
+		
+		if (now < pos) /* wrap around */
+			now = now + 0x200000000LL - pos;
+		else
+			now -= pos;
+		return 0;
+	}
+}
+
+int eDVBTSTools::getOffset(off_t &offset, pts_t &pts)
+{
+	if (m_use_streaminfo)
+	{
+		offset = m_streaminfo.getAccessPoint(pts);
+		return 0;
+	} else
+	{
+		int bitrate = calcBitrate(); /* in bits/s */
+		if (bitrate <= 0)
+			return -1;
+		
+		offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
+		offset -= offset % 188;
+
+		return 0;
+	}
+}
+
+int eDVBTSTools::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
+{
+	if (m_use_streaminfo)
+		return m_streaminfo.getNextAccessPoint(ts, start, direction);
+	else
+	{
+		eDebug("can't get next access point without streaminfo");
+		return -1;
+	}
+}
+
 void eDVBTSTools::calcBegin()
 {
 	if (m_fd < 0)