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

eitd/SIsections.cpp/hpp: remove unused code, test new event parsing

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 369671c36e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-08 (Wed, 08 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-02-08 18:46:22 +04:00
parent c3bc71d2f4
commit 0bdd6f2d42
2 changed files with 38 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/eitd/SIsections.cpp
View File

@@ -28,7 +28,6 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/poll.h> // fuer poll()
#include <set>
#include <algorithm>
@@ -44,6 +43,8 @@
#include "FreesatTables.hpp"
#endif
#include <dvbsi++/descriptor_tag.h>
struct descr_generic_header {
unsigned descriptor_tag : 8;
unsigned descriptor_length : 8;
@@ -82,30 +83,6 @@ struct service_list_entry {
unsigned service_type : 8;
} __attribute__ ((packed)) ;
struct digplus_order_entry {
unsigned service_id_hi : 8;
unsigned service_id_lo : 8;
unsigned channel_number_hi : 8;
unsigned channel_number_lo : 8;
} __attribute__ ((packed)) ;
struct bskyb_order_entry {
unsigned service_id_hi : 8;
unsigned service_id_lo : 8;
unsigned service_type : 8;
unsigned unknown1 : 8;
unsigned unknown2 : 8;
unsigned channel_number_hi : 8;
unsigned channel_number_lo : 8;
unsigned unknown3 : 8;
unsigned unknown4 : 8;
} __attribute__ ((packed)) ;
struct bskyb_bid {
unsigned unknown1 : 8;
unsigned unknown2 : 8;
} __attribute__ ((packed)) ;
struct private_data_specifier {
unsigned byte1 : 8;
unsigned byte2 : 8;
@@ -441,25 +418,22 @@ void SIsectionEIT::parseDescriptors(const uint8_t *des, unsigned len, SIevent &e
// Die infos aus dem Puffer holen
void SIsectionEIT::parse(void)
{
if (!buffer || parsed)
return;
#if 0
const uint8_t *actPos;
const uint8_t *bufEnd;
struct eit_event *evt;
unsigned short descriptors_loop_length;
if (!buffer || parsed)
return;
if (bufferLength < sizeof(SI_section_EIT_header) + sizeof(struct eit_event)) {
bufferLength=0;
return;
}
#if 0
unsigned char table_id = header()->table_id;
unsigned char version_number = header()->version_number;
#endif
unsigned char table_id = getTableId();
unsigned char version_number = getVersionNumber();
actPos = buffer + sizeof(SI_section_EIT_header);
bufEnd = buffer + bufferLength;
@@ -476,7 +450,30 @@ void SIsectionEIT::parse(void)
evts.insert(e);
actPos += descriptors_loop_length;
}
#endif
#if 1
const EventList &elist = *getEvents();
if(elist.empty())
return;
t_service_id sid = getTableIdExtension();
t_original_network_id onid = getOriginalNetworkId();
t_transport_stream_id tsid = getTransportStreamId();
unsigned char tid = getTableId();
unsigned char version = getVersionNumber();
for (EventConstIterator eit = elist.begin(); eit != elist.end(); ++eit) {
Event &event = (**eit);
SIevent e(onid, tsid, sid, event.getEventId());
e.table_id = tid;
e.version = version;
e.parse(event);
evts.insert(e);
}
#endif
parsed = 1;
}