summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-04-13 13:50:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2014-04-13 13:50:04 +0200
commit57222002b2b48baa9f5c8d0f253184801ba7200a (patch)
treef2a36b475a2d623bf0c43084315eb25f641281d7
parent4fc810191027ffc295b5775e0ff05d3ad60727bd (diff)
downloadvdr-57222002b2b48baa9f5c8d0f253184801ba7200a.tar.gz
vdr-57222002b2b48baa9f5c8d0f253184801ba7200a.tar.bz2
Fixed a possible division by zero in frame rate detection
-rw-r--r--HISTORY3
-rw-r--r--remux.c9
2 files changed, 9 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 2f0ba074..13fdb90c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8261,7 +8261,7 @@ Video Disk Recorder Revision History
- Added support for systemd (thanks to Christopher Reimer). To activate this you
need to add "SDNOTIFY=1" to the 'make' call.
-2014-04-06: Version 2.1.7
+2014-04-13: Version 2.1.7
- No longer logging an error message in DirSizeMB() if the given directory doesn't
exist. This avoids lots of log entries in case several VDRs use the same video
@@ -8270,3 +8270,4 @@ Video Disk Recorder Revision History
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- A cCamSlot that has WantsTsData set to true in its constructor now also gets
the CAT and EMM PIDs data.
+- Fixed a possible division by zero in frame rate detection.
diff --git a/remux.c b/remux.c
index c057af21..ae5feefe 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 3.6 2014/04/13 11:49:40 kls Exp $
+ * $Id: remux.c 3.7 2014/04/13 13:48:35 kls Exp $
*/
#include "remux.h"
@@ -1511,7 +1511,12 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
for (int i = 0; i < numPtsValues; i++)
ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
- uint32_t Delta = ptsValues[0] / (framesPerPayloadUnit + parser->IFrameTemporalReferenceOffset());
+ int Div = framesPerPayloadUnit;
+ if (framesPerPayloadUnit > 1)
+ Div += parser->IFrameTemporalReferenceOffset();
+ if (Div <= 0)
+ Div = 1;
+ uint32_t Delta = ptsValues[0] / Div;
// determine frame info:
if (isVideo) {
if (abs(Delta - 3600) <= 1)