aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-30 01:51:19 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-30 01:51:19 +0100
commit1b50c31e8c9a2d690500feac0065fd1ace941c80 (patch)
tree2bc2f770a27dcca5fb9d17e7849178db7d8783e4
parentaf1080bf1a330ffa25e1d4e75c95fe0541656aa8 (diff)
parent0c264458b72ac77a0129c8a702d3e8dad70f0e49 (diff)
downloadenigma2-1b50c31e8c9a2d690500feac0065fd1ace941c80.tar.gz
enigma2-1b50c31e8c9a2d690500feac0065fd1ace941c80.zip
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimentalexperimental-2010.12exp-2010.12
-rw-r--r--lib/dvb/tstools.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 3dff2886..6cd855cc 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;