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

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index b83fd50a..bec17a56 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,7 +9,7 @@ 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;
@@ -46,6 +45,7 @@ void eDVBTSTools::setSearchRange(int maxrange)
 	m_maxrange = maxrange;
 }
 
+	/* getPTS extracts a pts value from any PID at a given offset. */
 int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 {
 	if (m_fd < 0)
@@ -71,8 +71,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 +95,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;
@@ -112,7 +115,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 			return 0;
 		}
 	}
-
+	
 	return -1;
 }
 
@@ -120,6 +123,7 @@ void eDVBTSTools::calcBegin()
 {
 	if (m_fd < 0)	
 		return;
+
 	if (!m_begin_valid)
 	{
 		m_offset_begin = 0;
@@ -133,11 +137,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 = end;
+		m_end_valid = 0;
+		eDebug("file size changed, recalc length");
+	}
+	
+	int maxiter = 10;
+	
+	while (!m_end_valid)
 	{
-		m_offset_end = lseek(m_fd, 0, SEEK_END) - m_maxrange;
+		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 +169,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 +182,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)