frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed detecting frames for channels that split frames into several payloads

This commit is contained in:
Klaus Schmidinger 2011-08-20 09:07:26 +02:00
parent f4007c7ff3
commit 3a19051c76
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2593,6 +2593,8 @@ Derek Kelly (user.vdr@gmail.com)
for reporting a problem with the fps value in the info file of a recording being
overwritten in case a recording was interrupted and resumed, and the fps value
could not be determined after resuming recording
for reporting a problem with detecting frames for channels that split frames into
several payloads
Marcel Unbehaun <frostworks@gmx.de>
for adding cRecordingInfo::GetEvent()

5
HISTORY
View File

@ -6698,3 +6698,8 @@ Video Disk Recorder Revision History
- cTimeMs is no longer initialized to the current time if the value given to the
constructor is negative (avoids the "cTimeMs: using monotonic clock..." log message
before VDR's starting log message).
2011-08-20: Version 1.7.21
- Fixed detecting frames for channels that split frames into several payloads
(reported by Derek Kelly).

10
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 2.33 2011/06/21 21:43:01 kls Exp $
* $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number:
#define VDRVERSION "1.7.20"
#define VDRVERSNUM 10720 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.7.21"
#define VDRVERSNUM 10721 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "1.7.20"
#define APIVERSNUM 10720 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.7.21"
#define APIVERSNUM 10721 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to

6
remux.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: remux.c 2.58 2011/08/15 09:50:14 kls Exp $
* $Id: remux.c 2.59 2011/08/20 09:07:26 kls Exp $
*/
#include "remux.h"
@ -974,8 +974,10 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
if (payloadUnitOfFrame != 0 && independentFrame)
payloadUnitOfFrame = 0;
if (payloadUnitOfFrame)
if (payloadUnitOfFrame) {
newPayload = false;
newFrame = false;
}
}
if (framesPerPayloadUnit <= 1)
scanning = false;