jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1511 from CvH/vdr_bump_8

Browse Source 
backport of #1510
This commit is contained in:
Christian Hewitt 2017-05-14 19:18:14 +04:00 committed by GitHub
commit 12b1e672a9
6 changed files with 165 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="vdr-plugin-dvbapi"
PKG_VERSION="7a42b22"
PKG_VERSION="d7c7587"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"

2
packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="vdr-plugin-satip"
PKG_VERSION="6573c38"
PKG_VERSION="ed99cfb"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"

2
packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="vdr-plugin-vnsiserver"
PKG_VERSION="d6847c3"
PKG_VERSION="615a077"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"

153
packages/addons/addon-depends/vdr/patches/vdr-40_caid-buffer-v3.patch Normal file
View File

@ -0,0 +1,153 @@
Description: dynamically resize buffer for caids
Forwarded: yes
Author: Lars Hanisch <dvb@flensrocker.de>
diff --git a/ci.c b/ci.c
index ffc7ff7..8bfae23 100644
--- a/ci.c
+++ b/ci.c
@@ -25,6 +25,8 @@
#include "skins.h"
#include "tools.h"
+#define CAID_BUFSIZE 1024
+
// Set these to 'true' for debug output:
static bool DumpTPDUDataTransfer = false;
static bool DebugProtocol = false;
@@ -763,9 +765,12 @@ private:
int transponder;
int programNumber;
int caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
+ uint8_t *caDescriptors;
+ int caBufSize;
void AddCaDescriptors(int Length, const uint8_t *Data);
public:
cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
+ ~cCiCaPmt(void);
uint8_t CmdId(void) { return cmdId; }
void SetListManagement(uint8_t ListManagement);
uint8_t ListManagement(void) { return capmt[0]; }
@@ -784,8 +789,15 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
caSystemIds[i] = CaSystemIds[i];
}
caSystemIds[i] = 0;
- uint8_t caDescriptors[512];
- int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, 0);
+ caBufSize = CAID_BUFSIZE;
+ caDescriptors = new uint8_t[caBufSize];
+ int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, 0);
+ if (caDescriptorsLength < 0) {
+ delete [] caDescriptors;
+ caBufSize = -caDescriptorsLength + 8;
+ caDescriptors = new uint8_t[caBufSize];
+ caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, 0);
+ }
length = 0;
capmt[length++] = CPLM_ONLY;
capmt[length++] = (ProgramNumber >> 8) & 0xFF;
@@ -797,6 +809,11 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
AddCaDescriptors(caDescriptorsLength, caDescriptors);
}
+cCiCaPmt::~cCiCaPmt(void)
+{
+ delete [] caDescriptors;
+}
+
void cCiCaPmt::SetListManagement(uint8_t ListManagement)
{
capmt[0] = ListManagement;
@@ -805,21 +822,34 @@ void cCiCaPmt::SetListManagement(uint8_t ListManagement)
void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
{
if (Pid) {
- uint8_t caDescriptors[512];
- int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, Pid);
- //XXX buffer overflow check???
- capmt[length++] = StreamType;
- capmt[length++] = (Pid >> 8) & 0xFF;
- capmt[length++] = Pid & 0xFF;
- esInfoLengthPos = length;
- capmt[length++] = 0x00; // ES_info_length H (at ES level)
- capmt[length++] = 0x00; // ES_info_length L
- AddCaDescriptors(caDescriptorsLength, caDescriptors);
+ int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, Pid);
+ if (caDescriptorsLength < 0) {
+ delete [] caDescriptors;
+ caBufSize = -caDescriptorsLength + 8;
+ caDescriptors = new uint8_t[caBufSize];
+ caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, Pid);
+ }
+ if (length + 5 < int(sizeof(capmt))) {
+ capmt[length++] = StreamType;
+ capmt[length++] = (Pid >> 8) & 0xFF;
+ capmt[length++] = Pid & 0xFF;
+ esInfoLengthPos = length;
+ capmt[length++] = 0x00; // ES_info_length H (at ES level)
+ capmt[length++] = 0x00; // ES_info_length L
+ AddCaDescriptors(caDescriptorsLength, caDescriptors);
+ }
+ else
+ esyslog("ERROR: buffer overflow in CA descriptor");
}
}
void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
{
+ if (Length < 0) {
+ dsyslog("DEBUG: calling AddCaDescriptors with Length %d", Length);
+ return;
+ }
+
if (esInfoLengthPos) {
if (length + Length < int(sizeof(capmt))) {
if (Length || cmdId == CPCI_QUERY) {
diff --git a/pat.c b/pat.c
index 98d306e..9dfbc62 100644
--- a/pat.c
+++ b/pat.c
@@ -165,21 +165,25 @@ int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar
return 0;
if (BufSize > 0 && Data) {
int length = 0;
+ bool tooSmall = false;
for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
if (EsPid < 0 || d->EsPid() == EsPid) {
const int *caids = CaSystemIds;
do {
if (*caids == 0xFFFF || d->CaSystem() == *caids) {
- if (length + d->Length() <= BufSize) {
+ if (length + d->Length() <= BufSize)
memcpy(Data + length, d->Data(), d->Length());
- length += d->Length();
- }
else
- return -1;
+ tooSmall = true;
+ length += d->Length();
}
} while (*++caids);
}
}
+ if (tooSmall) {
+ dsyslog("DEBUG: buffer for ca-descriptors too small (%d, needed %d)", BufSize, length);
+ return -length;
+ }
return length;
}
return -1;
diff --git a/pat.h b/pat.h
index 19e60dc..8bf0738 100644
--- a/pat.h
+++ b/pat.h
@@ -45,7 +45,7 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
///< are copied that match one of the given CA system IDs (or all of them, if CaSystemIds
///< is 0xFFFF).
///< Returns the number of bytes copied into Data (0 if no CA descriptors are
- ///< available), or -1 if BufSize was too small to hold all CA descriptors.
+ ///< available), or -(NeededBufSize) if BufSize was too small to hold all CA descriptors.
int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
///< Gets all CA pids for a given channel.

6
packages/addons/service/vdr-addon/changelog.txt
View File

@ -1,3 +1,9 @@
105
- fix for some scrambled channels
- update dvbapi to d7c7587
- update Sat>IP plugin to ed99cfb
- update VNSI to 615a077
104
- encode special characters in directory names to be accesible via smb
- update VNSI to d6847c3

6
packages/addons/service/vdr-addon/package.mk
View File

@ -18,11 +18,11 @@
################################################################################
PKG_NAME="vdr-addon"
PKG_VERSION="8.0"
PKG_REV="104"
PKG_VERSION="2.2"
PKG_REV="105"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_SITE="https://libreelec.tv"
PKG_URL=""
PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-dummydevice vdr-plugin-dvbapi vdr-plugin-eepg vdr-plugin-epgfixer vdr-plugin-epgsearch vdr-plugin-iptv vdr-plugin-live vdr-plugin-restfulapi vdr-plugin-satip vdr-plugin-streamdev vdr-plugin-vnsiserver vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-xmltv2vdr"
PKG_SECTION="service.multimedia"