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

diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index bfd177f..2c5fc62 100644
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -1,68 +1,83 @@
 // $Id: ULEdec.cc 355 2007-07-26 14:17:02Z tho $
 //
-// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Thorsten Horstmann <tho@berlios.de>
+
 
 // Definition of non-inline non-template functions
 
-#include <string>
-#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"
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Packets/MPEGDVBBundle/TransportPacket.hh>
+#include <senf/Packets/MPEGDVBBundle/SNDUPacket.hh>
+#include <senf/Socket/Protocols/DVB.hh>
 
 
 class ULEdec
 {
 public:
-    ULEdec();
+    ULEdec(unsigned short adapter=0, unsigned short device=0);
 
 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;
-    
-    template <class Iterator>
-    void hexdump(Iterator i, Iterator const & i_end, std::ostream& stream);
-    
-    void handleEvent(senf::FileHandle, senf::Scheduler::EventId event);
-    
+    void handleEvent(senf::Scheduler::EventId event);
     void handleTSPacket(senf::TransportPacket tsPacket);
+    void handleSNDUPacket();
+
+    iterator readNewSNDUPacket(iterator i, const iterator i_end);
+    iterator readContSNDUPacket(iterator i, const iterator i_end);
+    iterator readRawSNDUPacketData(iterator i, iterator const i_end);
+
+    inline bool isSDNUPacketComplete();
+    inline iterator::difference_type snduPacketBytesLeft();
+
+};
+
+
+struct ULEdecException : public senf::Exception
+{
+    ULEdecException(std::string const & what)
+        : senf::Exception(what) {}
 };
 
+
 
 // Local Variables:
 // mode: c++
@@ -70,6 +85,6 @@ private:
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
-// compile-command: "scons -u test"
+// compile-command: "scons -u"
 // comment-column: 40
 // End: