mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

test c**

Browse Source
This commit is contained in:
max10
2015-11-15 20:29:20 +01:00
parent 43ded09d01
commit ca27972f16
5 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/ca_ci.cpp
View File

@@ -570,6 +570,7 @@ void cCA::ModuleReset(enum CA_SLOT_TYPE, uint32_t slot)
(*it)->DataLast = false;
(*it)->DataRCV = false;
(*it)->SidBlackListed = false;
(*it)->counter = 0;
(*it)->init = false;
@@ -669,10 +670,13 @@ SlotIt cCA::FindFreeSlot(ca_map_t camap, unsigned char scrambled)
/* erstmal den capmt wie er von Neutrino kommt in den Slot puffern */
bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char * cabuf, u32 calen, const unsigned char * /*rawpmt*/, u32 /*rawlen*/, enum CA_SLOT_TYPE /*SlotType*/, unsigned char scrambled, ca_map_t cm, int mode, bool enabled)
{
u16 SID = (u16)(tpid & 0x000000000000FFFF);
unsigned int i = 0;
printf("%s -> %s\n", FILENAME, __func__);
if (!num_slots) return true; /* stb's without ci-slots */
#if x_debug
printf("TPID: %llX\n", tpid);
printf("SID: %04X\n", SID);
printf("SOURCE_DEMUX: %X\n", source_demux);
printf("CA_MASK: %X\n", camask);
printf("CALEN: %d\n", calen);
@@ -700,11 +704,17 @@ bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char *
(*It)->tpid = tpid;
(*It)->source = source_demux;
(*It)->pmtlen = calen;
for (unsigned int i = 0; i < calen; i++)
for (i = 0; i < calen; i++)
(*It)->pmtdata[i] = cabuf[i];
(*It)->newCapmt = true;
}
if (mode && scrambled && enabled)
if ((*It)->bsids.size())
{
for (i = 0; i < (*It)->bsids.size(); i++)
if ((*It)->bsids[i] == SID) {(*It)->SidBlackListed = true; break;}
if (i == (*It)->bsids.size()) {(*It)->SidBlackListed = false;}
}
if (mode && scrambled && enabled && !(*It)->SidBlackListed)
(*It)->inUse = true;
}
}
@@ -774,6 +784,7 @@ cCA::cCA(int Slots)
slot->DataLast = false;
slot->DataRCV = false;
slot->SidBlackListed = false;
slot->counter = 0;
slot->init = false;
@@ -1068,6 +1079,7 @@ void cCA::slot_pollthread(void *c)
slot->DataLast = false;
slot->DataRCV = false;
slot->SidBlackListed = false;
slot->counter = 0;
slot->pollConnection = false;
@@ -1138,7 +1150,7 @@ void cCA::slot_pollthread(void *c)
/* not necessary: the arrived capmt will be automaticly send */
//SendCaPMT(slot);
}
if (slot->hasCAManager && slot->hasAppManager && slot->newCapmt)
if (slot->hasCAManager && slot->hasAppManager && slot->newCapmt && !slot->SidBlackListed)
{
SendCaPMT(slot);
slot->newCapmt = false;

4
common/ca_ci.h
View File

@@ -103,6 +103,8 @@ typedef struct CA_MESSAGE {
typedef std::set<int> ca_map_t;
typedef ca_map_t::iterator ca_map_iterator_t;
typedef std::vector<u16> bSIDVector;
typedef std::vector<u16> CaIdVector;
typedef std::vector<u16>::iterator CaIdVectorIterator;
typedef std::vector<u16>::const_iterator CaIdVectorConstIterator;
@@ -203,11 +205,13 @@ typedef struct
CaIdVector cam_caids;
std::priority_queue<queueData> sendqueue;
bSIDVector bsids;
unsigned char lastKey[32];
unsigned char scrambled;
u8 lastParity;
bool DataLast;
bool DataRCV;
bool SidBlackListed;
/* private data */
void *private_data;