From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 30 Nov 2010 00:51:19 +0000 (+0100)
Subject: Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=1b50c31e8c9a2d690500feac0065fd1ace941c80;hp=af1080bf1a330ffa25e1d4e75c95fe0541656aa8

Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
---

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 3dff288..6cd855c 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -704,6 +704,7 @@ int eDVBTSTools::findFrame(off_t &_offset, size_t &len, int &direction, int fram
 	}
 	off_t start = offset;
 
+#if 0
 			/* backtrack to find the previous sequence start, in case of MPEG2 */
 	if ((data & 0xFF) == 0x00) {
 		do {
@@ -718,6 +719,8 @@ int eDVBTSTools::findFrame(off_t &_offset, size_t &len, int &direction, int fram
 			start = offset;  /* Failed to find corresponding sequence start, so never mind */
 	}
 
+#endif
+
 			/* let's find the next frame after the given offset */
 	do {
 		if (m_streaminfo.getStructureEntry(offset, data, 1))
@@ -733,9 +736,11 @@ int eDVBTSTools::findFrame(off_t &_offset, size_t &len, int &direction, int fram
 //		eDebug("%08llx@%llx (next)", data, offset);
 	} while (((data & 0xFF) != 9) && ((data & 0xFF) != 0x00)); /* next frame */
 
+#if 0
 			/* align to TS pkt start */
 	start = start - (start % 188);
 	offset = offset - (offset % 188);
+#endif
 
 	len = offset - start;
 	_offset = start;