X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c0fdda82ac02f8436816236b4649819274d1c95..d7026a3a9370970633dd938b3b5ab9b2dc0a297f:/lib/dvb/pvrparse.cpp

diff --git a/lib/dvb/pvrparse.cpp b/lib/dvb/pvrparse.cpp
index 65e599c3..c96669b0 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)
@@ -316,8 +316,16 @@ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset)
 	
 		/* advance to payload */
 	pkt += pkt[8] + 9;
-	
+
+		/* sometimes, there are zeros before the startcode. */
+	while (pkt < (end-4))
+		if (pkt[0] || pkt[1] || pkt[2])
+			break;
+		else
+			pkt++;
+
 		/* if startcode found */
+//	eDebug("%02x %02x %02x %02x", pkt[0], pkt[1], pkt[2], pkt[3]);
 	if (!(pkt[0] || pkt[1] || (pkt[2] != 1)))
 	{
 		if (pkt[3] == 0xb3) /* sequence header */
@@ -329,6 +337,16 @@ int eMPEGStreamParserTS::processPacket(const unsigned char *pkt, off_t offset)
 			} else
 				eDebug("Sequence header but no valid PTS value.");
 		}
+
+		if (pkt[3] == 0x09) /* MPEG4 AVC unit access delimiter */
+		{
+			if (ptsvalid)
+			{
+				m_streaminfo.m_access_points[offset] = pts;
+				eDebug("MPEG4 AVC UAD at %llx, pts %llx", offset, pts);
+			} else
+				eDebug("MPEG4 AVC UAD but no valid PTS value.");
+		}
 	}
 	return 0;
 }
@@ -362,6 +380,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 */