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

Improved cDvbDevice::StillPicture()

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-10-19 11:43:07 +02:00
parent f1a4d067be
commit 262c266637
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -2433,3 +2433,7 @@ Video Disk Recorder Revision History
full (suggested by Emil Naepflein). full (suggested by Emil Naepflein).
- Channel IDs are now checked when reading 'channels.conf' to avoid later - Channel IDs are now checked when reading 'channels.conf' to avoid later
problems with timers. problems with timers.
2003-10-19: Version 1.2.6pre2
- Improved cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).

4
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.176 2003/10/17 12:35:23 kls Exp $ * $Id: config.h 1.176.1.1 2003/10/19 11:43:07 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.2.6pre1" #define VDRVERSION "1.2.6pre2"
#define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99

14
dvbdevice.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: dvbdevice.c 1.67 2003/10/17 15:36:13 kls Exp $ * $Id: dvbdevice.c 1.67.1.1 2003/10/19 11:41:07 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -957,10 +957,14 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
// skip header extension // skip header extension
if ((Data[i + 6] & 0xC0) == 0x80) { if ((Data[i + 6] & 0xC0) == 0x80) {
// MPEG-2 PES header // MPEG-2 PES header
if (Data[i + 8] >= Length)
break;
offs += 3; offs += 3;
offs += Data[i + 8]; offs += Data[i + 8];
len -= 3; len -= 3;
len -= Data[i + 8]; len -= Data[i + 8];
if (len < 0 || offs + len >= Length)
break;
} }
else { else {
// MPEG-1 PES header // MPEG-1 PES header
@ -968,19 +972,19 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
offs++; offs++;
len--; len--;
} }
if ((Data[offs] & 0xC0) == 0x40) { if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
offs += 2; offs += 2;
len -= 2; len -= 2;
} }
if ((Data[offs] & 0xF0) == 0x20) { if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
offs += 5; offs += 5;
len -= 5; len -= 5;
} }
else if ((Data[offs] & 0xF0) == 0x30) { else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
offs += 10; offs += 10;
len -= 10; len -= 10;
} }
else if (Data[offs] == 0x0F) { else if (offs < Length && len > 0) {
offs++; offs++;
len--; len--;
} }