mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-04 12:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary use of linux dvb api in sectionsd

Browse Source 
the variable types are not really used as intended, so we can
as well avoid using them at all to make it easier to port to
other platforms

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@761 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4165dc5755
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-09-12 (Sun, 12 Sep 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-09-12 14:42:35 +00:00
parent c198a78810
commit 5dde3975e4
2 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sectionsd/dmxapi.cpp
View File

@@ -32,6 +32,7 @@
#include <dmx_cs.h>
#ifndef DO_NOT_INCLUDE_STUFF_NOT_NEEDED_FOR_SECTIONSD
bool setfilter(const int fd, const uint16_t pid, const uint8_t filter, const uint8_t mask, const uint32_t flags)
{
struct dmx_sct_filter_params flt;
@@ -51,6 +52,7 @@ bool setfilter(const int fd, const uint16_t pid, const uint8_t filter, const uin
}
return true;
}
#endif
struct SI_section_TOT_header
{
@@ -80,7 +82,9 @@ __attribute__ ((packed)); /* 8 bytes */
cDemux * dmxUTC;
bool getUTC(UTC_t * const UTC, const bool TDT)
{
struct dmx_sct_filter_params flt;
unsigned char filter[DMX_FILTER_SIZE];
unsigned char mask[DMX_FILTER_SIZE];
int timeout;
struct SI_section_TDT_header tdt_tot_header;
char cUTC[5];
bool ret = true;
@@ -90,15 +94,15 @@ bool getUTC(UTC_t * const UTC, const bool TDT)
dmxUTC->Open(DMX_PSI_CHANNEL);
}
memset(&flt, 0, sizeof(struct dmx_sct_filter_params));
memset(&filter, 0, DMX_FILTER_SIZE);
memset(&mask, 0, DMX_FILTER_SIZE);
flt.pid = 0x0014;
flt.filter.filter[0] = TDT ? 0x70 : 0x73;
flt.filter.mask [0] = 0xFF;
flt.timeout = 31000;
flt.flags = TDT ? (DMX_ONESHOT | DMX_IMMEDIATE_START) : (DMX_ONESHOT | DMX_CHECK_CRC | DMX_IMMEDIATE_START);
filter[0] = TDT ? 0x70 : 0x73;
mask [0] = 0xFF;
timeout = 31000;
// flags = TDT ? (DMX_ONESHOT | DMX_IMMEDIATE_START) : (DMX_ONESHOT | DMX_CHECK_CRC | DMX_IMMEDIATE_START);
dmxUTC->sectionFilter(flt.pid, flt.filter.filter, flt.filter.mask, 5, flt.timeout);
dmxUTC->sectionFilter(0x0014, filter, mask, 5, timeout);
if(dmxUTC->Read((unsigned char *) &tdt_tot_header, sizeof(tdt_tot_header)) != sizeof(tdt_tot_header)) {
perror("[sectionsd] getUTC: read");

41
src/sectionsd/sectionsd.cpp
View File

@@ -6861,11 +6861,7 @@ static void *timeThread(void *)
static cDemux * eitDmx;
int eit_set_update_filter(int *fd)
{
struct dmx_sct_filter_params dsfp;
memset((void*)&dsfp, 0, sizeof(dsfp));
dprintf("eit_set_update_filter\n");
bzero(&dsfp, sizeof(struct dmx_sct_filter_params));
unsigned char cur_eit = dmxCN.get_eit_version();
/* tone down to dprintf later */
@@ -6886,26 +6882,31 @@ int eit_set_update_filter(int *fd)
eitDmx->Open(DMX_PSI_CHANNEL);
}
dsfp.filter.filter[0] = 0x4e; /* table_id */
dsfp.filter.filter[1] = (unsigned char)(messaging_current_servicekey >> 8);
dsfp.filter.filter[2] = (unsigned char)messaging_current_servicekey;
unsigned char filter[DMX_FILTER_SIZE];
unsigned char mask[DMX_FILTER_SIZE];
unsigned char mode[DMX_FILTER_SIZE];
memset(&filter, 0, DMX_FILTER_SIZE);
memset(&mask, 0, DMX_FILTER_SIZE);
memset(&mode, 0, DMX_FILTER_SIZE);
dsfp.filter.mask[0] = 0xFF;
dsfp.filter.mask[1] = 0xFF;
dsfp.filter.mask[2] = 0xFF;
filter[0] = 0x4e; /* table_id */
filter[1] = (unsigned char)(messaging_current_servicekey >> 8);
filter[2] = (unsigned char)messaging_current_servicekey;
dsfp.flags = DMX_CHECK_CRC | DMX_IMMEDIATE_START;
dsfp.pid = 0x12;
dsfp.timeout = 0;
mask[0] = 0xFF;
mask[1] = 0xFF;
mask[2] = 0xFF;
int timeout = 0;
#if 0
dsfp.filter.filter[3] = (cur_eit << 1) | 0x01;
dsfp.filter.mask[3] = (0x1F << 1) | 0x01;
dsfp.filter.mode[3] = 0x1F << 1;
eitDmx->sectionFilter(dsfp.pid, dsfp.filter.filter, dsfp.filter.mask, 4, dsfp.timeout, dsfp.filter.mode);
filter[3] = (cur_eit << 1) | 0x01;
mask[3] = (0x1F << 1) | 0x01;
mode[3] = 0x1F << 1;
eitDmx->sectionFilter(0x12, filter, mask, 4, timeout, mode);
#else
dsfp.filter.filter[3] = (((cur_eit + 1) & 0x01) << 1) | 0x01;
dsfp.filter.mask[3] = (0x01 << 1) | 0x01;
eitDmx->sectionFilter(dsfp.pid, dsfp.filter.filter, dsfp.filter.mask, 4, dsfp.timeout, NULL);
filter[3] = (((cur_eit + 1) & 0x01) << 1) | 0x01;
mask[3] = (0x01 << 1) | 0x01;
eitDmx->sectionFilter(0x12, filter, mask, 4, timeout, NULL);
#endif
//printf("[sectionsd] start EIT update filter: current version %02X, filter %02X %02X %02X %02X, mask %02X mode %02X \n", cur_eit, dsfp.filter.filter[0], dsfp.filter.filter[1], dsfp.filter.filter[2], dsfp.filter.filter[3], dsfp.filter.mask[3], dsfp.filter.mode[3]);