X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1026ef92d84821603bd865adb10a518238f33e0e..bef5d916c40a27638388d69f2ae3f94e41e6b0f3:/lib/dvb/tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 73ceb7e3..4ee26265 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -15,6 +15,10 @@ eDVBTSTools::eDVBTSTools()
 	
 	m_use_streaminfo = 0;
 	m_samples_taken = 0;
+	
+	m_last_filelength = 0;
+	
+	m_futile = 0;
 }
 
 eDVBTSTools::~eDVBTSTools()
@@ -38,7 +42,7 @@ int eDVBTSTools::openFile(const char *filename)
 	
 	m_samples_taken = 0;
 
-	if (m_file.open(filename) < 0)
+	if (m_file.open(filename, 1) < 0)
 		return -1;
 	return 0;
 }
@@ -64,7 +68,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
 	if (m_use_streaminfo)
 		return m_streaminfo.getPTS(offset, pts);
 	
-	if (!m_file.valid() < 0)
+	if (!m_file.valid())
 		return -1;
 
 	offset -= offset % 188;
@@ -185,36 +189,39 @@ int eDVBTSTools::getOffset(off_t &offset, pts_t &pts)
 		if (!m_samples_taken)
 			takeSamples();
 		
-		if (m_samples.empty())
-			return -1;
-		
+		if (!m_samples.empty())
+		{
 //		eDebug("ok, samples ok");
-			/* search entry before and after */
-		std::map<pts_t, off_t>::const_iterator l = m_samples.lower_bound(pts);
-		std::map<pts_t, off_t>::const_iterator u = l;
+				/* search entry before and after */
+			std::map<pts_t, off_t>::const_iterator l = m_samples.lower_bound(pts);
+			std::map<pts_t, off_t>::const_iterator u = l;
 
-		if (l != m_samples.begin())
-			--l;
+			if (l != m_samples.begin())
+				--l;
 		
-		int birate;
-		if ((u == m_samples.end()) || (l == m_samples.end()))
-			return -1;
-
-		pts_t pts_diff = u->first - l->first;
-		off_t offset_diff = u->second - l->second;
+			if ((u != m_samples.end()) && (l != m_samples.end()))
+			{
+				pts_t pts_diff = u->first - l->first;
+				off_t offset_diff = u->second - l->second;
 //		eDebug("using: %llx:%llx -> %llx:%llx", l->first, u->first, l->second, u->second);
 	
-		if (!pts_diff)
-			return -1;
-
-		int bitrate = calcBitrate(); /* in bits/s */
-		bitrate = offset_diff * 90000 * 8 / pts_diff;
-
-		if (bitrate <= 0)
-			return -1;
+				if (pts_diff)
+				{
+					int bitrate = offset_diff * 90000 * 8 / pts_diff;
+					if (bitrate > 0)
+					{
+						offset = l->second;
+						offset += ((pts - l->first) * (pts_t)bitrate) / 8ULL / 90000ULL;
+						offset -= offset % 188;
+						return 0;
+					}
+				}
+			}
+		}
 		
-		offset = l->second;
-		offset += ((pts - l->first) * (pts_t)bitrate) / 8ULL / 90000ULL;
+		eDebug("falling back");
+		int bitrate = calcBitrate();
+		offset = pts * (pts_t)bitrate / 8ULL / 90000ULL;
 		offset -= offset % 188;
 
 		return 0;
@@ -237,11 +244,13 @@ void eDVBTSTools::calcBegin()
 	if (!m_file.valid())
 		return;
 
-	if (!m_begin_valid)
+	if (!(m_begin_valid || m_futile))
 	{
 		m_offset_begin = 0;
 		if (!getPTS(m_offset_begin, m_pts_begin))
 			m_begin_valid = 1;
+		else
+			m_futile = 1;
 	}
 }
 
@@ -252,27 +261,44 @@ void eDVBTSTools::calcEnd()
 	
 	off_t end = m_file.lseek(0, SEEK_END);
 	
-	if (abs(end - m_offset_end) > 1*1024*1024)
+	if (abs(end - m_last_filelength) > 1*1024*1024)
 	{
-		m_offset_end = end;
+		m_last_filelength = end;
 		m_end_valid = 0;
+		
+		m_futile = 0;
 		eDebug("file size changed, recalc length");
 	}
 	
 	int maxiter = 10;
 	
-	while (!m_end_valid)
+	m_offset_end = m_last_filelength;
+	
+	while (!(m_end_valid || m_futile))
 	{
 		if (!--maxiter)
+		{
+			m_futile = 1;
 			return;
-		
+		}
+
 		m_offset_end -= m_maxrange;
 		if (m_offset_end < 0)
 			m_offset_end = 0;
+
+			/* restore offset if getpts fails */
+		off_t off = m_offset_end;
+
 		if (!getPTS(m_offset_end, m_pts_end))
 			m_end_valid = 1;
+		else
+			m_offset_end = off;
+
 		if (!m_offset_end)
-			return;
+		{
+			m_futile = 1;
+			break;
+		}
 	}
 }
 
@@ -322,8 +348,8 @@ void eDVBTSTools::takeSamples()
 	
 	int nr_samples = 30;
 	off_t bytes_per_sample = (m_offset_end - m_offset_begin) / (long long)nr_samples;
-	if (bytes_per_sample < 1*1024*1024)
-		bytes_per_sample = 1*1024*1024;
+	if (bytes_per_sample < 40*1024*1024)
+		bytes_per_sample = 40*1024*1024;
 	
 	bytes_per_sample -= bytes_per_sample % 188;
 	
@@ -341,3 +367,73 @@ void eDVBTSTools::takeSamples()
 	m_samples[m_pts_end] = m_offset_end;
 //	eDebug("begin, end: %llx %llx", m_offset_begin, m_offset_end); 
 }
+
+int eDVBTSTools::findPMT(int &pmt_pid, int &service_id)
+{
+		/* FIXME: this will be factored out soon! */
+	if (!m_file.valid())
+	{
+		eDebug(" file not valid");
+		return -1;
+	}
+
+	if (m_file.lseek(0, SEEK_SET) < 0)
+	{
+		eDebug("seek failed");
+		return -1;
+	}
+
+	int left = 5*1024*1024;
+	
+	while (left >= 188)
+	{
+		unsigned char block[188];
+		if (m_file.read(block, 188) != 188)
+		{
+			eDebug("read error");
+			break;
+		}
+		left -= 188;
+		
+		if (block[0] != 0x47)
+		{
+			int i = 0;
+			while (i < 188)
+			{
+				if (block[i] == 0x47)
+					break;
+				++i;
+			}
+			m_file.lseek(i - 188, SEEK_CUR);
+			continue;
+		}
+		
+		int pid = ((block[1] << 8) | block[2]) & 0x1FFF;
+		
+		int pusi = !!(block[1] & 0x40);
+		
+		if (!pusi)
+			continue;
+		
+			/* ok, now we have a PES header or section header*/
+		unsigned char *sec;
+		
+			/* check for adaption field */
+		if (block[3] & 0x20)
+			sec = block + block[4] + 4 + 1;
+		else
+			sec = block + 4;
+		
+		if (sec[0])	/* table pointer, assumed to be 0 */
+			continue;
+
+		if (sec[1] == 0x02) /* program map section */
+		{
+			pmt_pid = pid;
+			service_id = (sec[4] << 8) | sec[5];
+			return 0;
+		}
+	}
+	
+	return -1;
+}