X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0bb92df139892968d715539387d19de4d175c8b4..2c0fdda82ac02f8436816236b4649819274d1c95:/lib/dvb/tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index b83fd50a..b6792c65 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/dvb/tstools.h>
 #include <lib/base/eerror.h>
 #include <unistd.h>
@@ -10,10 +9,12 @@ eDVBTSTools::eDVBTSTools()
 {
 	m_fd = -1;
 	m_pid = -1;
-	m_maxrange = 1*1024*1024;
+	m_maxrange = 256*1024;
 	
 	m_begin_valid = 0;
 	m_end_valid = 0;
+	
+	m_use_streaminfo = 0;
 }
 
 eDVBTSTools::~eDVBTSTools()
@@ -24,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 +58,12 @@ void eDVBTSTools::setSearchRange(int maxrange)
 	m_maxrange = maxrange;
 }
 
-int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
+	/* getPTS extracts a pts value from any PID at a given offset. */
+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;
 		
@@ -71,8 +90,11 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 		{
 			int i = 0;
 			while (i < 188)
+			{
 				if (block[i] == 0x47)
 					break;
+				++i;
+			}
 			offset = lseek(m_fd, i - 188, SEEK_CUR);
 			continue;
 		}
@@ -92,7 +114,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 		unsigned char *pes;
 		
 			/* check for adaption field */
-		if (block[3] & 0x10)
+		if (block[3] & 0x20)
 			pes = block + block[4] + 4 + 1;
 		else
 			pes = block + 4;
@@ -109,17 +131,82 @@ 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;
 		}
 	}
-
+	
 	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)	
 		return;
+
 	if (!m_begin_valid)
 	{
 		m_offset_begin = 0;
@@ -133,11 +220,29 @@ void eDVBTSTools::calcEnd()
 	if (m_fd < 0)	
 		return;
 	
-	if (!m_end_valid)
+	off_t end = lseek(m_fd, 0, SEEK_END);
+	
+	if (abs(end - m_offset_end) > 1*1024*1024)
 	{
-		m_offset_end = lseek(m_fd, 0, SEEK_END) - m_maxrange;
+		m_offset_end = end;
+		m_end_valid = 0;
+		eDebug("file size changed, recalc length");
+	}
+	
+	int maxiter = 10;
+	
+	while (!m_end_valid)
+	{
+		if (!--maxiter)
+			return;
+		
+		m_offset_end -= m_maxrange;
+		if (m_offset_end < 0)
+			m_offset_end = 0;
 		if (!getPTS(m_offset_end, m_pts_end))
 			m_end_valid = 1;
+		if (!m_offset_end)
+			return;
 	}
 }
 
@@ -147,6 +252,9 @@ int eDVBTSTools::calcLen(pts_t &len)
 	if (!(m_begin_valid && m_end_valid))
 		return -1;
 	len = m_pts_end - m_pts_begin;
+		/* wrap around? */
+	if (len < 0)
+		len += 0x200000000LL;
 	return 0;
 }
 
@@ -157,6 +265,10 @@ int eDVBTSTools::calcBitrate()
 		return -1;
 
 	pts_t len_in_pts = m_pts_end - m_pts_begin;
+
+		/* wrap around? */
+	if (len_in_pts < 0)
+		len_in_pts += 0x200000000LL;
 	off_t len_in_bytes = m_offset_end - m_offset_begin;
 	
 	if (!len_in_pts)