diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2014-02-21 15:14:14 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2014-02-21 15:14:14 +0100 |
| commit | 4cd251fc48043f1aa56d58da8de34ceb99536dfc (patch) | |
| tree | f5e2611d04533a85c81de8c5d8c1663321c1921f | |
| parent | 6d59e2866b91b5787dbe4d46955df70bd5a1e8fe (diff) | |
| download | vdr-4cd251fc48043f1aa56d58da8de34ceb99536dfc.tar.gz vdr-4cd251fc48043f1aa56d58da8de34ceb99536dfc.tar.bz2 | |
Fixed handling frame detection buffer length
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | remux.c | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9721f831..5f2087c7 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3254,6 +3254,7 @@ Thomas Reufer <thomas@reufer.ch> Eike Sauer <EikeSauer@t-online.de> 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 <cpaulick@xeatre.tv> for reporting a problem with frame detection in MPEG-2 streams that have "bottom fields" @@ -8201,3 +8201,4 @@ Video Disk Recorder Revision History transponders with many PAT entries (reported by Mariusz Bialonczyk). - Fixed the replay progress display for very long recordings. - Fixed detecting broken video data streams when recording. +- Fixed handling frame detection buffer length (reported by Eike Sauer). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.c 3.2 2014/01/28 11:07:59 kls Exp $ + * $Id: remux.c 3.3 2014/02/21 11:51:55 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(); |