X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=1c4eef8aa92bf2b065e8d853c87a7cf5bf5b8e46;hp=c320fc7871199e6decf11733ee0409a2e54db1e1;hb=bce53d4a67d1655a496eebe5912c8573e880114e;hpb=2728b4ae124c0cde02d5a55a6ee52c19e4c2b822

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c320fc7..1c4eef8 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -974,7 +974,7 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 	}
 #endif
 
-#if 1 /* This codepath is required on Broadcom-based Dreamboxes (DM800, DM8000) and strips away non-I-frames. */
+#if 0
 	if (!m_iframe_search)
 		return len;
 
@@ -1026,11 +1026,6 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 
 					fts += 188;
 				}
-						/* force payload only */
-				ts[3] &= ~0x30;
-				ts[3] |=  0x10;
-
-//				memset(ts + 4, 0xFF, (offset % 188) - 4);
 
 				m_iframe_state = 1;
 			}
@@ -1272,6 +1267,21 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
 
 	current_offset += align(m_skipmode_m, blocksize);
+	
+	if (m_skipmode_m)
+	{
+		eDebug("we are at %llx, and we try to find the iframe here:", current_offset);
+		size_t iframe_len;
+		off_t iframe_start = current_offset;
+		
+		if (m_tstools.findIFrame(iframe_start, iframe_len, (m_skipmode_m < 0) ? -1 : +1))
+			eDebug("failed");
+		else
+		{
+			current_offset = align(iframe_start, blocksize);
+			max = align(iframe_len, blocksize);
+		}
+	}
 
 	while (!m_cue->m_seek_requests.empty())
 	{
@@ -1348,6 +1358,10 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 			eDebug("get offset for pts=%lld failed!", pts);
 			continue;
 		}
+		
+		size_t iframe_len;
+			/* try to align to iframe */
+		m_tstools.findIFrame(offset, iframe_len, pts < 0 ? -1 : 1);
 
 		eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
 		current_offset = align(offset, blocksize); /* in case tstools return non-aligned offset */
@@ -1417,30 +1431,23 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		}
 	}
 
-	if (m_source_span.empty()) {
-		if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
-		{
-			eDebug("reached SOF");
-			m_skipmode_m = 0;
-			m_pvr_thread->sendEvent(eFilePushThread::evtUser);
-		}
+	if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
+	{
+		eDebug("reached SOF");
+		m_skipmode_m = 0;
+		m_pvr_thread->sendEvent(eFilePushThread::evtUser);
+	}
+
+	if (m_source_span.empty())
+	{
 		start = current_offset;
 		size = max;
-	} else {
-		off_t tmp2, tmp = align(m_source_span.rbegin()->second, blocksize);
-		pts_t len;
-		getLength(len);
-		m_tstools.getOffset(tmp2, len, 1);
-		if (current_offset == tmp || current_offset == tmp2) {
-			start = tmp2;
-			size = max;
-		} else {
-			start = tmp - align(512*1024, blocksize);
-			size = align(512*1024, blocksize);
-		}
+		eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+	} else
+	{
+		start = current_offset;
+		size = 0;
 	}
-
-	eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
 	return;
 }