summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-04-13 11:08:05 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2009-04-13 11:08:05 +0200
commit3628bbbfa16288d548a4b64a67c163699c08d06f (patch)
tree796c015d55d2c12ebaf504ace3dcc9839e6fe59d
parent1d829aaf6d263725379a5940adefbafa88af398d (diff)
downloadvdr-3628bbbfa16288d548a4b64a67c163699c08d06f.tar.gz
vdr-3628bbbfa16288d548a4b64a67c163699c08d06f.tar.bz2
cDevice::PlayTs() now syncs on the TS packet sync bytes
-rw-r--r--HISTORY3
-rw-r--r--device.c13
2 files changed, 14 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index d5712866..a217064a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6031,7 +6031,8 @@ Video Disk Recorder Revision History
Oliver Endriss for reporting this).
- Improved efficiency of cEIT::cEIT() (thanks to Tobias Bratfisch).
-2009-04-12: Version 1.7.6
+2009-04-13: Version 1.7.6
- No longer checking for deleted recordings to be removed from the foreground
thread, to avoid blocking the main loop for too long (thanks to Rolf Ahrenberg).
+- cDevice::PlayTs() now syncs on the TS packet sync bytes.
diff --git a/device.c b/device.c
index ccf176c4..f5a908de 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 2.13 2009/04/05 12:15:41 kls Exp $
+ * $Id: device.c 2.14 2009/04/13 11:08:05 kls Exp $
*/
#include "device.h"
@@ -1322,9 +1322,20 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
tsToPesAudio.Reset();
tsToPesSubtitle.Reset();
}
+ else if (Length < TS_SIZE) {
+ esyslog("ERROR: skipped %d bytes of TS fragment", Length);
+ return Length;
+ }
else {
cMutexLock MutexLock(&mutexCurrentAudioTrack);
while (Length >= TS_SIZE) {
+ if (Data[0] != TS_SYNC_BYTE) {
+ int Skipped = 1;
+ while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
+ Skipped++;
+ esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
+ return Played + Skipped;
+ }
if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
int PayloadOffset = TsPayloadOffset(Data);
if (PayloadOffset < TS_SIZE) {