frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added detection of 24fps

Browse Source
This commit is contained in:
Klaus Schmidinger 2015-03-11 09:57:21 +01:00
parent cc306290da
commit 371e60238a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3313,6 +3313,7 @@ Thomas Reufer <thomas@reufer.ch>
skipping" skipping"
for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory
to cPixmap to cPixmap
for adding detection of 24fps
Eike Sauer <EikeSauer@t-online.de> Eike Sauer <EikeSauer@t-online.de>
for reporting a problem with channels that need more than 5 TS packets for detecting for reporting a problem with channels that need more than 5 TS packets for detecting

3
HISTORY
View File

@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.2.0. - Bumped all version numbers to 2.2.0.
- Official release. - Official release.
2015-03-09: Version 2.3.1 2015-03-11: Version 2.3.1
- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
a cPixmap may have on the current OSD. The 'osddemo' example has been modified a cPixmap may have on the current OSD. The 'osddemo' example has been modified
@ -8605,3 +8605,4 @@ Video Disk Recorder Revision History
to 2048x2048 pixel. to 2048x2048 pixel.
- The Setup/CAM menu now displays which device an individual CAM is currently - The Setup/CAM menu now displays which device an individual CAM is currently
assigned to (suggested by Frank Neumann). assigned to (suggested by Frank Neumann).
- Added detection of 24fps (thanks to Thomas Reufer).

6
remux.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: remux.c 3.9 2015/01/14 09:57:09 kls Exp $ * $Id: remux.c 4.1 2015/03/11 09:49:38 kls Exp $
*/ */
#include "remux.h" #include "remux.h"
@ -1552,7 +1552,9 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
uint32_t Delta = ptsValues[0] / Div; uint32_t Delta = ptsValues[0] / Div;
// determine frame info: // determine frame info:
if (isVideo) { if (isVideo) {
if (abs(Delta - 3600) <= 1) if (Delta == 3753)
framesPerSecond = 24.0 / 1.001;
else if (abs(Delta - 3600) <= 1)
framesPerSecond = 25.0; framesPerSecond = 25.0;
else if (Delta % 3003 == 0) else if (Delta % 3003 == 0)
framesPerSecond = 30.0 / 1.001; framesPerSecond = 30.0 / 1.001;