X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ca329d3e86a98aacb0597d8581f5354cc99542e4..f9aafeeb6715c4d5970bdad0f77fd0a7c9003163:/lib/dvb/pvrparse.cpp

diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp
index 58b215ba..a6113329 100644
--- a/lib/dvb/pvrparse.cpp
+++ b/lib/dvb/pvrparse.cpp
@@ -63,7 +63,7 @@ void eMPEGStreamInformation::fixupDiscontinuties()
 	if (!m_access_points.size())
 		return;
 		
-	eDebug("Fixing discontinuities ...");
+//	eDebug("Fixing discontinuities ...");
 
 			/* if we have no delta at the beginning, extrapolate it */
 	if ((m_access_points.find(0) == m_access_points.end()) && (m_access_points.size() > 1))
@@ -77,7 +77,7 @@ void eMPEGStreamInformation::fixupDiscontinuties()
 			tdiff *= first->first;
 			tdiff /= diff;
 			m_timestamp_deltas[0] = first->second - tdiff;
-			eDebug("first delta is %08llx", first->second - tdiff);
+//			eDebug("first delta is %08llx", first->second - tdiff);
 		}
 	}
 
@@ -92,16 +92,16 @@ void eMPEGStreamInformation::fixupDiscontinuties()
 		
 		if (llabs(diff) > (90000*5)) // 5sec diff
 		{
-			eDebug("%llx < %llx, have discont. new timestamp is %llx (diff is %llx)!", current, lastpts_t, i->second, diff);
+//			eDebug("%llx < %llx, have discont. new timestamp is %llx (diff is %llx)!", current, lastpts_t, i->second, diff);
 			currentDelta = i->second - lastpts_t; /* FIXME: should be the extrapolated new timestamp, based on the current rate */
-			eDebug("current delta now %llx, making current to %llx", currentDelta, i->second - currentDelta);
+//			eDebug("current delta now %llx, making current to %llx", currentDelta, i->second - currentDelta);
 			m_timestamp_deltas[i->first] = currentDelta;
 		}
 		lastpts_t = i->second - currentDelta;
 	}
 	
 	
-	eDebug("ok, found %d disconts.", m_timestamp_deltas.size());
+//	eDebug("ok, found %d disconts.", m_timestamp_deltas.size());
 
 #if 0	
 	for (off_t x=0x25807E34ULL; x < 0x25B3CF70; x+= 100000)
@@ -208,9 +208,7 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
 	off_t last = 0;
 	for (std::map<off_t, pts_t>::const_iterator i(m_access_points.begin()); i != m_access_points.end(); ++i)
 	{
-		std::map<off_t, pts_t>::const_iterator d = m_timestamp_deltas.find(i->first);
-		if (d != m_timestamp_deltas.end())
-			delta = d->second;
+		pts_t delta = getDelta(i->first);
 		pts_t c = i->second - delta;
 		if (c > ts)
 			break;
@@ -219,6 +217,41 @@ off_t eMPEGStreamInformation::getAccessPoint(pts_t ts)
 	return last;
 }
 
+int eMPEGStreamInformation::getNextAccessPoint(pts_t &ts, const pts_t &start, int direction)
+{
+	off_t offset = getAccessPoint(start);
+	std::map<off_t, pts_t>::const_iterator i = m_access_points.find(offset);
+	if (i == m_access_points.end())
+	{
+		eDebug("getNextAccessPoint: initial AP not found");
+		return -1;
+	}
+	while (direction)
+	{
+		if (direction > 0)
+		{
+			if (i == m_access_points.end())
+				return -1;
+			++i;
+			direction--;
+		}
+		if (direction < 0)
+		{
+			if (i == m_access_points.begin())
+			{
+				eDebug("at start");
+				return -1;
+			}
+			--i;
+			direction++;
+		}
+	}
+	ts = i->second - getDelta(i->first);
+	eDebug("fine, at %llx - %llx = %llx", ts, i->second, getDelta(i->first));
+	eDebug("fine, at %lld - %lld = %lld", ts, i->second, getDelta(i->first));
+	return 0;
+}
+
 eMPEGStreamParserTS::eMPEGStreamParserTS(eMPEGStreamInformation &streaminfo): m_streaminfo(streaminfo), m_pktptr(0), m_pid(-1), m_need_next_packet(0), m_skip(0)
 {
 }
@@ -329,6 +362,30 @@ void eMPEGStreamParserTS::parseData(off_t offset, const void *data, unsigned int
 			/* sorry for the redundant code here, but there are too many special cases... */
 	while (len)
 	{
+			/* emergency resync. usually, this should not happen, because the data should 
+			   be sync-aligned.
+			   
+			   to make this code work for non-strictly-sync-aligned data, (for example, bad 
+			   files) we fix a possible resync here by skipping data until the next 0x47.
+			   
+			   if this is a false 0x47, the packet will be dropped by wantPacket, and the
+			   next time, sync will be re-established. */
+		int skipped = 0;
+		while (!m_pktptr && len)
+		{
+			if (packet[0] == 0x47)
+				break;
+			len--;
+			packet++;
+			skipped++;
+		}
+		
+		if (skipped)
+			eDebug("SYNC LOST: skipped %d bytes.", skipped);
+		
+		if (!len)
+			break;
+		
 		if (m_pktptr)
 		{
 				/* skip last packet */