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

Fixed assembling PS1 packets in cTS2PES::instant_repack()

Browse Source
This commit is contained in:
Klaus Schmidinger 2007-11-10 13:40:51 +01:00
parent c568200d2e
commit 5793a99d3d
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1149,6 +1149,7 @@ Reinhard Nissl <rnissl@gmx.de>
for adding a debug error message to cReceiver::~cReceiver() in case it is still for adding a debug error message to cReceiver::~cReceiver() in case it is still
attached to a device attached to a device
for reporting a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice() for reporting a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice()
for fixing assembling PS1 packets in cTS2PES::instant_repack()
Richard Robson <richard_robson@beeb.net> Richard Robson <richard_robson@beeb.net>
for reporting freezing replay if a timer starts while in Transfer Mode from the for reporting freezing replay if a timer starts while in Transfer Mode from the

5
HISTORY
View File

@ -5518,3 +5518,8 @@ Video Disk Recorder Revision History
Kirchgatterer). Kirchgatterer).
- Fixed decoding filename characters in case there are not two hex digits after - Fixed decoding filename characters in case there are not two hex digits after
the '#' (reported by Helmut Auer). the '#' (reported by Helmut Auer).
2007-11-10: Version 1.5.12
- Fixed assembling PS1 packets in cTS2PES::instant_repack() (thanks to Reinhard
Nissl).

10
config.h
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: config.h 1.300 2007/10/17 18:34:17 kls Exp $ * $Id: config.h 1.301 2007/11/10 13:38:19 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.5.11" #define VDRVERSION "1.5.12"
#define VDRVERSNUM 10511 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10512 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "1.5.11" #define APIVERSION "1.5.12"
#define APIVERSNUM 10511 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10512 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to

6
remux.c
View File

@ -11,7 +11,7 @@
* The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>, * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
* and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de. * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
* *
* $Id: remux.c 1.60 2007/11/03 14:36:07 kls Exp $ * $Id: remux.c 1.61 2007/11/10 13:36:47 kls Exp $
*/ */
#include "remux.h" #include "remux.h"
@ -1750,13 +1750,13 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
case VIDEO_STREAM_S ... VIDEO_STREAM_E: case VIDEO_STREAM_S ... VIDEO_STREAM_E:
case PRIVATE_STREAM1: case PRIVATE_STREAM1:
if (mpeg == 2 && found == 9) { if (mpeg == 2 && found == 9 && count < found) { // make sure to not write the data twice by looking at count
write_ipack(&flag1, 1); write_ipack(&flag1, 1);
write_ipack(&flag2, 1); write_ipack(&flag2, 1);
write_ipack(&hlength, 1); write_ipack(&hlength, 1);
} }
if (mpeg == 1 && found == mpeg1_required) { if (mpeg == 1 && found == mpeg1_required && count < found) { // make sure to not write the data twice by looking at count
write_ipack(&flag1, 1); write_ipack(&flag1, 1);
if (mpeg1_required > 7) { if (mpeg1_required > 7) {
write_ipack(&flag2, 1); write_ipack(&flag2, 1);