X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d375f3ea3ead88dcc4f41c6e5c551370cd305755..8e13d1b1a0fb7309f6727b712a61f47dbd90a52c:/lib/dvb/tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 5d1c7e35..20eb3ce6 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -1,4 +1,6 @@
+#include <config.h>
 #include <lib/dvb/tstools.h>
+#include <lib/base/eerror.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -8,7 +10,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;
@@ -48,8 +50,6 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 {
 	if (m_fd < 0)
 		return -1;
-	if (m_pid < 0)
-		return -1;
 
 	offset -= offset % 188;
 	
@@ -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;
 		}
@@ -82,8 +85,9 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 		
 //		printf("PID %04x, PUSI %d\n", pid, pusi);
 		
-		if (pid != m_pid)
-			continue;
+		if (m_pid >= 0)
+			if (pid != m_pid)
+				continue;
 		if (!pusi)
 			continue;
 		
@@ -91,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;
@@ -111,7 +115,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 			return 0;
 		}
 	}
-
+	
 	return -1;
 }
 
@@ -119,6 +123,7 @@ void eDVBTSTools::calcBegin()
 {
 	if (m_fd < 0)	
 		return;
+
 	if (!m_begin_valid)
 	{
 		m_offset_begin = 0;
@@ -132,11 +137,22 @@ void eDVBTSTools::calcEnd()
 	if (m_fd < 0)	
 		return;
 	
-	if (!m_end_valid)
+	m_offset_end = lseek(m_fd, 0, SEEK_END);
+	
+	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;
 	}
 }
 
@@ -149,3 +165,21 @@ int eDVBTSTools::calcLen(pts_t &len)
 	return 0;
 }
 
+int eDVBTSTools::calcBitrate()
+{
+	calcBegin(); calcEnd();
+	if (!(m_begin_valid && m_end_valid))
+		return -1;
+
+	pts_t len_in_pts = m_pts_end - m_pts_begin;
+	off_t len_in_bytes = m_offset_end - m_offset_begin;
+	
+	if (!len_in_pts)
+		return -1;
+	
+	unsigned long long bitrate = len_in_bytes * 90000 * 8 / len_in_pts;
+	if ((bitrate < 10000) || (bitrate > 100000000))
+		return -1;
+	
+	return bitrate;
+}