diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6e523173..3a4c75e6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3199,6 +3199,7 @@ Eike Edener Eike Sauer for reporting a problem with channels that need more than 5 TS packets for detecting frame borders + for reporting a problem in handling the frame detection buffer length Christian Paulick for reporting a problem with frame detection in MPEG-2 streams that have "bottom fields" diff --git a/HISTORY b/HISTORY index 78cfe6cd..02206037 100644 --- a/HISTORY +++ b/HISTORY @@ -7895,3 +7895,4 @@ Video Disk Recorder Revision History - Improved PAT/PMT scanning to speed up initial tuning to encrypted channels on transponders with many PAT entries (reported by Mariusz Bialonczyk). - Fixed detecting broken video data streams when recording. +- Fixed handling frame detection buffer length (reported by Eike Sauer). diff --git a/remux.c b/remux.c index 5bf57fd8..5906d365 100644 --- a/remux.c +++ b/remux.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.c 2.75.1.2 2014/01/28 12:36:57 kls Exp $ + * $Id: remux.c 2.75.1.3 2014/02/21 14:37:51 kls Exp $ */ #include "remux.h" @@ -1153,8 +1153,7 @@ int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid) break; } if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary - || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit... - && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary + || tsPayload.Eof()) // or if we're out of data break; } return tsPayload.Used(); @@ -1305,8 +1304,7 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid) } } if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary - || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit... - && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary + || tsPayload.Eof()) // or if we're out of data break; } return tsPayload.Used();