X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FDVBAdapter%2FULEdec.hh;h=f35c7d371710601e67ef026135d55f1de4915dbb;hb=f1fc7057fa65a9509651d08c6c134d136fbb0424;hp=bfd177f9f8e9d8ed80c6fcf15bbbc16226db3cd8;hpb=9027d68d973f1d8ad8f25d6827166ba2ee9be7a7;p=senf.git

diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index bfd177f..f35c7d3 100644
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -1,6 +1,6 @@
 // $Id: ULEdec.cc 355 2007-07-26 14:17:02Z tho $
 //
-// Copyright (C) 2006
+// Copyright (C) 2007
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
 //     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
@@ -26,19 +26,12 @@
 #include <iostream>
 #include <iomanip>
 #include <sys/ioctl.h>
-#include <linux/sockios.h>
 #include <linux/dvb/dmx.h> 
 
 #include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
 #include "Packets/MPEGDVBBundle/TransportPacket.hh"
 #include "Packets/MPEGDVBBundle/SNDUPacket.hh"
-#include "Utils/membind.hh"
 #include "Socket/Protocols/DVB/DVBDemuxHandles.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/Packet.hh"
-#include "Packets/PacketData.hh"
-#include "Packets/ParseInt.hh"
 
 
 class ULEdec
@@ -47,20 +40,34 @@ public:
     ULEdec();
 
 private:
+    typedef senf::PacketData::iterator iterator;
+    
+    enum ReceiverState {
+        Idle,
+        Reassembly
+    };
+    
     senf::DVBDemuxPESHandle demuxHandle;
     senf::DVBDvrHandle dvrHandle;
+    
     senf::SNDUPacket snduPacket;
-    unsigned char receiver_state;
+    
+    ReceiverState receiver_state;
     unsigned char priv_tscc;
+    bool priv_sndu_type_1;
+    iterator snduPacketData_iter;
 
-    static const unsigned BLOCK_SIZE = 16;
+    void handleEvent(senf::FileHandle, senf::Scheduler::EventId event);
+    void handleTSPacket(senf::TransportPacket tsPacket);
+    void handleSNDUPacket();
     
-    template <class Iterator>
-    void hexdump(Iterator i, Iterator const & i_end, std::ostream& stream);
+    iterator readNewSNDUPacket(iterator i_start, iterator i_end);
+    iterator readContSNDUPacket(iterator i_start, iterator i_end);
+    iterator readRawSNDUPacketData(iterator i_start, iterator i_end);
     
-    void handleEvent(senf::FileHandle, senf::Scheduler::EventId event);
+    inline bool isSDNUPacketComplete(); 
+    inline iterator::difference_type snduPacketBytesLeft();
     
-    void handleTSPacket(senf::TransportPacket tsPacket);
 };