frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Snapshot 2009-07-06

Browse Source
This commit is contained in:
Frank Schmirler 2010-12-02 09:46:57 +01:00
parent 396fc43bdd
commit 435f01649c
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,6 +1,10 @@
VDR Plugin 'streamdev' Revision History VDR Plugin 'streamdev' Revision History
--------------------------------------- ---------------------------------------
- removed redefinitions in includes - caused problems in older compilers
- fixed ts2ps.h defines
- fixed missing virtual for cTS2PESRemux destructor
- silenced format mismatch warning on 64bit OS
- added XBMC support by extending VTP capabilities (thanks to Alwin Esch) - added XBMC support by extending VTP capabilities (thanks to Alwin Esch)
- now there's a common baseclass for all remuxers, make use of it - now there's a common baseclass for all remuxers, make use of it
- added cDevice::NumProvidedSystems() which was introduced in VDR 1.7.0 - added cDevice::NumProvidedSystems() which was introduced in VDR 1.7.0

2
common.c
View File

@ -10,7 +10,7 @@
using namespace std; using namespace std;
const char *VERSION = "0.5.0-pre-20090702"; const char *VERSION = "0.5.0-pre-20090706";
const char *StreamTypes[st_Count] = { const char *StreamTypes[st_Count] = {
"TS", "TS",

4
remux/ts2pes.h
View File

@ -4,7 +4,7 @@
* This file is based on a copy of remux.h from Klaus Schmidinger's * This file is based on a copy of remux.h from Klaus Schmidinger's
* VDR, version 1.6.0. * VDR, version 1.6.0.
* *
* $Id: ts2pes.h,v 1.3 2009/06/30 06:04:33 schmirl Exp $ * $Id: ts2pes.h,v 1.4 2009/07/06 06:11:11 schmirl Exp $
*/ */
#ifndef VDR_STREAMDEV_TS2PES_H #ifndef VDR_STREAMDEV_TS2PES_H
@ -34,7 +34,7 @@ public:
///< APids, DPids and SPids are pointers to zero terminated lists of audio, ///< APids, DPids and SPids are pointers to zero terminated lists of audio,
///< dolby and subtitle PIDs (the pointers may be NULL if there is no such ///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
///< PID). ///< PID).
~cTS2PESRemux(); virtual ~cTS2PESRemux();
int Put(const uchar *Data, int Count); int Put(const uchar *Data, int Count);
///< Puts at most Count bytes of Data into the remuxer. ///< Puts at most Count bytes of Data into the remuxer.
///< \return Returns the number of bytes actually consumed from Data. ///< \return Returns the number of bytes actually consumed from Data.

6
remux/ts2ps.h
View File

@ -1,5 +1,5 @@
#ifndef VDR_STREAMDEV_TS2PESREMUX_H #ifndef VDR_STREAMDEV_TS2PSREMUX_H
#define VDR_STREAMDEV_TS2PESREMUX_H #define VDR_STREAMDEV_TS2PSREMUX_H
#include "remux/tsremux.h" #include "remux/tsremux.h"
#include "server/streamer.h" #include "server/streamer.h"
@ -33,4 +33,4 @@ public:
} // namespace Streamdev } // namespace Streamdev
#endif // VDR_STREAMDEV_TS2PESREMUX_H #endif // VDR_STREAMDEV_TS2PSREMUX_H

3
remux/tsremux.h
View File

@ -6,9 +6,6 @@
// Picture types: // Picture types:
#define NO_PICTURE 0 #define NO_PICTURE 0
#define I_FRAME 1
#define P_FRAME 2
#define B_FRAME 3
namespace Streamdev { namespace Streamdev {

4
server/componentIGMP.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: componentIGMP.c,v 1.1 2009/02/13 10:39:22 schmirl Exp $ * $Id: componentIGMP.c,v 1.2 2009/07/03 21:44:19 schmirl Exp $
*/ */
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/igmp.h> #include <netinet/igmp.h>
@ -209,7 +209,7 @@ cServerConnection* cComponentIGMP::Accept(void)
igmp->igmp_cksum = 0; igmp->igmp_cksum = 0;
if (chksum != inetChecksum((uint16_t *)igmp, ip_datalen)) if (chksum != inetChecksum((uint16_t *)igmp, ip_datalen))
{ {
esyslog("INVALID CHECKSUM %d %d %d %d 0x%x 0x%x", ntohs(ip->ip_len), ip_hdrlen, ip_datalen, recv_len, chksum, inetChecksum((uint16_t *)igmp, ip_datalen)); esyslog("INVALID CHECKSUM %d %d %d %lu 0x%x 0x%x", (int) ntohs(ip->ip_len), ip_hdrlen, ip_datalen, (unsigned long int) recv_len, chksum, inetChecksum((uint16_t *)igmp, ip_datalen));
return NULL; return NULL;
} }
logIGMP(igmp->igmp_type, ip->ip_src, ip->ip_dst, igmp->igmp_group); logIGMP(igmp->igmp_type, ip->ip_src, ip->ip_dst, igmp->igmp_group);

1
server/livestreamer.h
View File

@ -5,7 +5,6 @@
#include <vdr/receiver.h> #include <vdr/receiver.h>
#include "server/streamer.h" #include "server/streamer.h"
#include "remux/tsremux.h"
#include "common.h" #include "common.h"
namespace Streamdev { namespace Streamdev {