X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTransportPacket.hh;h=7f214156b00ccacc8424698e8907741f754d437d;hb=ab243554f940af9f873e1a920d0a6b7886c6f5cf;hp=eecb10319851f2e1595bf063ccbd92383275a957;hpb=2a5995bedd9e4861dce1a70a460fdeb7bd0f2ad7;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index eecb103..7f21415 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -3,7 +3,7 @@
 // Copyright (C) 2007
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
 //
 // 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
@@ -28,10 +28,7 @@
 
 // Custom includes
 #include <algorithm>
-#include "Packets/PacketType.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/PacketRegistry.hh"
-#include "Packets/PacketParser.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "TransportPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -40,48 +37,26 @@ namespace senf {
 
     /** \brief Parse a Transport Stream packet
 
-        Parser implementing the header of a MPEG Transport Stream Packet.
+        Parser implementing the header of a MPEG Transport Stream packet.
         
         \see TransportPacketType
      */
     struct Parse_TransportPacket : public PacketParserBase
     {
-        typedef Parse_Flag      <     0 > Parse_tei; // transport_error_indicator
-        typedef Parse_Flag      <     1 > Parse_pusi; // payload_unit_start_indicator
-        typedef Parse_Flag      <     2 > Parse_transportPrio;  // transport_priority
-        typedef Parse_UIntField < 2, 16 > Parse_pid;
-        typedef Parse_UIntField < 0,  2 > Parse_tsc; // transport_scrambling_control
-        typedef Parse_UIntField < 2,  4 > Parse_adaptCtrl; // adaptation_field_control
-        typedef Parse_UIntField < 4,  8 > Parse_contCounter; // continuity_counter
-    
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_INIT(Parse_TransportPacket);
-        
-        SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
-            ((Field       ) ( sync_byte,                 Parse_UInt8         )) 
-            ((OverlayField) ( transport_error_indicator, Parse_tei           ))
-            ((OverlayField) ( pusi,                      Parse_pusi          ))
-            ((OverlayField) ( transport_priority,        Parse_transportPrio ))
-            ((Field       ) ( pid,                       Parse_pid           ))
-            ((OverlayField) ( transport_scrmbl_ctrl,     Parse_tsc           ))
-            ((OverlayField) ( adaptation_field_ctrl,     Parse_adaptCtrl     ))
-            ((Field       ) ( continuity_counter,        Parse_contCounter   ))      
-        );
-        
-#       else
-        
-        Parse_UInt8         sync_byte() const;
-        Parse_tei           transport_error_indicator() const;
-        Parse_pusi          pusi() const;
-        Parse_transportPrio transport_priority() const;
-        Parse_pid           pid() const;
-        Parse_tsc           transport_scrmbl_ctrl() const;
-        Parse_adaptCtrl     adaptation_field_ctrl() const;
-        Parse_contCounter   continuity_counter() const;
+#       include SENF_FIXED_PARSER()
 
-#       endif
+        SENF_PARSER_FIELD( sync_byte, Parse_UInt8 );
         
+        SENF_PARSER_BITFIELD( transport_error_indicator,  1, bool     );
+        SENF_PARSER_BITFIELD( pusi,                       1, bool     );
+        SENF_PARSER_BITFIELD( transport_priority,         1, bool     );
+        SENF_PARSER_BITFIELD( pid,                       13, unsigned );
+        SENF_PARSER_BITFIELD( transport_scrmbl_ctrl,      2, unsigned );
+        SENF_PARSER_BITFIELD( adaptation_field_ctrl,      2, unsigned );
+        SENF_PARSER_BITFIELD( continuity_counter,         4, unsigned );
+
+        SENF_PARSER_FINALIZE( Parse_TransportPacket );
+    
 //        Parse_UInt8 payload_pointer() const {
 //            return parse<Parse_UInt8>( Parse_TransportPacket::fixed_bytes ); 
 //        }
@@ -89,6 +64,40 @@ namespace senf {
     
     /** \brief Transport Stream packet
         
+        <table class="senf">
+          <tr style="text-align:center">
+            <th>Syntax</th><th>No. of bits</th></tr>
+          <tr>
+            <td>transport_packet() {</td> <td></td>
+          </tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::sync_byte() "sync_byte"</td>
+            <td>8</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_error_indicator() "transport_error_indicator"</td>
+            <td>1</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::pusi() "payload_uni_start_indicator"</td>
+            <td>1</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_priority() "transport_priority"</td>
+            <td>1</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::pid() "PID"</td>
+            <td>13</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_scrmbl_ctrl() "transport_scrambling_control"</td>
+            <td>2</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::adaptation_field_ctrl() "adaptation_field_control"</td>
+            <td>2</td></tr>
+          <tr>
+            <td style="padding-left:2em">\ref Parse_TransportPacket::continuity_counter() "continuity_counter"</td>
+            <td>4</td></tr>
+          <tr>
+            <td>}</td> <td></td></tr>
+        </table>
+        
         \par Packet type (typedef):
             \ref TransportPacket
 
@@ -106,7 +115,6 @@ namespace senf {
         typedef Parse_TransportPacket parser;
     
         using mixin::nextPacketRange;
-    //          using mixin::nextPacketType;
         using mixin::init;
         using mixin::initSize;