X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=f0186de70b24a84c529b8aaa6e86ad63f5f3d99a;hp=246094386ae834378a9b329fd0ab333c4a2303d6;hb=7882dec4e8e3e87cee0cf4eeb781119c196ba725;hpb=87b5fc099dcc08b9af41122b11fb9ba99a4119d3

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 2460943..f0186de 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 /* not yet */
+#if 0
 	if (!m_iframe_search)
 		return len;
 
@@ -990,9 +990,9 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 		unsigned char *ts = data + ts_offset;
 		int pid = ((ts[1] << 8) | ts[2]) & 0x1FFF;
 
-		if ((d[3] == 0) && (m_pid == pid))  /* picture start */
+		if ((d[3] == 0 || d[3] == 0x09 && d[-1] == 0 && (ts[1] & 0x40)) && (m_pid == pid))  /* picture start */
 		{
-			int picture_type = (d[5] >> 3) & 7;
+			int picture_type = (d[3]==0 ? (d[5] >> 3) & 7 : (d[4] >> 5) + 1);
 			d += 4;
 
 //			eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
@@ -1026,26 +1026,30 @@ 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;
 			}
 		} else if ((d[3] & 0xF0) == 0xE0) /* video stream */
 		{
-			if (m_pid != pid)
+				/* verify that this is actually a PES header, not just some ES data */
+			if (ts[1] & 0x40) /* PUSI set */
 			{
-				eDebug("now locked to pid %04x", pid);
-				m_pid = pid;
+				int payload_start = 4;
+				if (ts[3] & 0x20) /* adaptation field present */
+					payload_start += ts[4] + 1; /* skip AF */
+				if (payload_start == (offset%188)) /* the 00 00 01 should be directly at the payload start, otherwise it's not a PES header */
+				{
+					if (m_pid != pid)
+					{
+						eDebug("now locked to pid %04x (%02x %02x %02x %02x)", pid, ts[0], ts[1], ts[2], ts[3]);
+						m_pid = pid;
+					}
+				}
 			}
 //			m_pid = 0x6e;
 			d += 4;
 		} else
 			d += 4; /* ignore */
-
 	}
 
 	if (m_iframe_state == 1)
@@ -1065,7 +1069,7 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte
 
 	m_pvr_thread = 0;
 
-	m_skipmode_n = m_skipmode_m = 0;
+	m_skipmode_n = m_skipmode_m = m_skipmode_frames = 0;
 
 	if (m_frontend)
 		m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged);
@@ -1166,6 +1170,8 @@ void eDVBChannel::cueSheetEvent(int event)
 						/* i agree that this might look a bit like black magic. */
 				m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
 				m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio / 8;
+				m_skipmode_frames = m_cue->m_skipmode_ratio / 90000;
+				m_skipmode_frames_remainder = 0;
 
 				if (m_cue->m_skipmode_ratio < 0)
 					m_skipmode_m -= m_skipmode_n;
@@ -1175,12 +1181,12 @@ void eDVBChannel::cueSheetEvent(int event)
 				if (abs(m_skipmode_m) < abs(m_skipmode_n))
 				{
 					eWarning("something is wrong with this calculation");
-					m_skipmode_n = m_skipmode_m = 0;
+					m_skipmode_frames = m_skipmode_n = m_skipmode_m = 0;
 				}
 			} else
 			{
 				eDebug("skipmode ratio is 0, normal play");
-				m_skipmode_n = m_skipmode_m = 0;
+				m_skipmode_frames = m_skipmode_n = m_skipmode_m = 0;
 			}
 		}
 		m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
@@ -1200,7 +1206,7 @@ void eDVBChannel::cueSheetEvent(int event)
 		{
 			off_t offset_in, offset_out;
 			pts_t pts_in = i->first, pts_out = i->second;
-			if (m_tstools.getOffset(offset_in, pts_in) || m_tstools.getOffset(offset_out, pts_out))
+			if (m_tstools.getOffset(offset_in, pts_in, -1) || m_tstools.getOffset(offset_out, pts_out, 1))
 			{
 				eDebug("span translation failed.\n");
 				continue;
@@ -1229,6 +1235,23 @@ static inline long long align(long long x, int align)
 	return x;
 }
 
+	/* align toward zero */
+static inline long long align_with_len(long long x, int align, size_t &len)
+{
+	int sign = x < 0;
+
+	if (sign)
+		x = -x;
+
+	x -= x % align;
+	len += x % align;
+
+	if (sign)
+		x = -x;
+
+	return x;
+}
+
 	/* remember, this gets called from another thread. */
 void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size)
 {
@@ -1256,13 +1279,55 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 
 	if (m_skipmode_n)
 	{
-		eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n);
+		eDebug("skipmode %d:%d (x%d)", m_skipmode_m, m_skipmode_n, m_skipmode_frames);
 		max = align(m_skipmode_n, blocksize);
 	}
 
 	eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
+	
+	int frame_skip_success = 0;
 
-	current_offset += align(m_skipmode_m, blocksize);
+	if (m_skipmode_m)
+	{
+		int frames_to_skip = m_skipmode_frames + m_skipmode_frames_remainder;
+		eDebug("we are at %llx, and we try to skip %d+%d frames from here", current_offset, m_skipmode_frames, m_skipmode_frames_remainder);
+		size_t iframe_len;
+		off_t iframe_start = current_offset;
+		int frames_skipped = frames_to_skip;
+		if (!m_tstools.findNextPicture(iframe_start, iframe_len, frames_skipped))
+		{
+			m_skipmode_frames_remainder = frames_to_skip - frames_skipped;
+			eDebug("successfully skipped %d (out of %d, rem now %d) frames.", frames_skipped, frames_to_skip, m_skipmode_frames_remainder);
+			current_offset = align_with_len(iframe_start, blocksize, iframe_len);
+			max = align(iframe_len + 187, blocksize);
+			frame_skip_success = 1;
+		} else
+		{
+			m_skipmode_frames_remainder = 0;
+			eDebug("frame skipping failed, reverting to byte-skipping");
+		}
+	}
+	
+	if (!frame_skip_success)
+	{
+		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;
+			
+			int direction = (m_skipmode_m < 0) ? -1 : +1;
+			if (m_tstools.findFrame(iframe_start, iframe_len, direction))
+				eDebug("failed");
+			else
+			{
+				current_offset = align_with_len(iframe_start, blocksize, iframe_len);
+				max = align(iframe_len, blocksize);
+			}
+		}
+	}
 
 	while (!m_cue->m_seek_requests.empty())
 	{
@@ -1328,19 +1393,24 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				eDebug("AP relative seeking failed!");
 			} else
 			{
-				eDebug("next ap is %llx\n", pts);
 				pts = nextap;
+				eDebug("next ap is %llx\n", pts);
 			}
 		}
 
 		off_t offset = 0;
-		if (m_tstools.getOffset(offset, pts))
+		if (m_tstools.getOffset(offset, pts, -1))
 		{
 			eDebug("get offset for pts=%lld failed!", pts);
 			continue;
 		}
+		
+		size_t iframe_len;
+			/* try to align to iframe */
+		int direction = pts < 0 ? -1 : 1;
+		m_tstools.findFrame(offset, iframe_len, direction);
 
-		eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
+		eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx (skipped additional %d frames due to iframe re-align)", relative, pts, offset, direction);
 		current_offset = align(offset, blocksize); /* in case tstools return non-aligned offset */
 	}
 
@@ -1415,10 +1485,16 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		m_pvr_thread->sendEvent(eFilePushThread::evtUser);
 	}
 
-	start = current_offset;
-	size = max;
-
-	eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
+	if (m_source_span.empty())
+	{
+		start = current_offset;
+		size = max;
+		eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+	} else
+	{
+		start = current_offset;
+		size = 0;
+	}
 	return;
 }