EIT: add missing fields in print

dvb/si/eit_print.h

@@ -64,19 +64,25 @@ static inline void eit_print(uint8_t *p_eit,
     switch (i_print_type) {
     case PRINT_XML:
         pf_print(print_opaque,
-                "<EIT tableid=\"0x%02x\" type=\"%s\" service_id=\"%u\" version=\"%u\""
-                " current_next=\"%u\" tsid=\"%u\" onid=\"%u\">",
+                "<EIT tableid=\"0x%02x\" type=\"%s\" service_id=\"%u\""
+                " version=\"%u\" section=\"%u\" last_section=\"%u\""
+                " current_next=\"%u\" segment_last_section=\"%u\""
+                " tsid=\"%u\" onid=\"%u\">",
                  i_tid, psz_tid,
                  eit_get_sid(p_eit),
                  psi_get_version(p_eit),
+                 psi_get_section(p_eit),
+                 psi_get_lastsection(p_eit),
                  !psi_get_current(p_eit) ? 0 : 1,
+                 eit_get_segment_last_sec_number(p_eit),
                  eit_get_tsid(p_eit),
                  eit_get_onid(p_eit)
                 );
         break;
     default:
         pf_print(print_opaque,
-                 "new EIT tableid=0x%02x type=%s service_id=%u version=%u%s section=%u/%u tsid=%u"
+                 "new EIT tableid=0x%02x type=%s service_id=%u version=%u%s"
+                 " section=%u/%u segment_last_section=%u tsid=%u"
                  " onid=%u",
                  i_tid, psz_tid,
                  eit_get_sid(p_eit),
@@ -84,6 +90,7 @@ static inline void eit_print(uint8_t *p_eit,
                  !psi_get_current(p_eit) ? " (next)" : "",
                  psi_get_section(p_eit),
                  psi_get_lastsection(p_eit),
+                 eit_get_segment_last_sec_number(p_eit),
                  eit_get_tsid(p_eit),
                  eit_get_onid(p_eit)
                 );

examples/dvb_print_si.output.txt

@@ -141,9 +141,9 @@ new SDT actual tsid=10000 version=1 onid=40000
     - desc 4b nvod_reference tsid=10200 onid=40200 sid=20200
     - desc 5f private_data specifier=0xaabbccdd
 end SDT
-new EIT tableid=0x4e type=actual_pf service_id=20000 version=0 section=0/0 tsid=10000 onid=40000
+new EIT tableid=0x4e type=actual_pf service_id=20000 version=0 section=0/0 segment_last_section=0 tsid=10000 onid=40000
 end EIT
-new EIT tableid=0x4e type=actual_pf service_id=20000 version=1 section=0/0 tsid=10000 onid=40000
+new EIT tableid=0x4e type=actual_pf service_id=20000 version=1 section=0/0 segment_last_section=0 tsid=10000 onid=40000
   * EVENT id=30000 start_time=1234567890 start_time_dec="2009-02-13 23:31:30 UTC" duration=86399 duration_dec=23:59:59 running=2 free_CA=0
     - desc 4d short_event lang=eng event_name="Major TV event" text="The event of the century!"
   * EVENT id=30100 start_time=1 start_time_dec="1970-01-01 00:00:01 UTC" duration=3600 duration_dec=01:00:00 running=1 free_CA=0

examples/dvb_print_si.output.xml

@@ -30,13 +30,13 @@
 </TSDT>
 <TSDT version="1" current_next="1">
 <DESC id="0x67" length="3" value="445642">
-<TRANSPORT_STREAM_DESC bytes="445642" bytes_txt="DVB"/>
+<TRANSPORT_STREAM_DESC bytes="445642"/>
 </DESC>
 <DESC id="0x67" length="4" value="434f4e54">
-<TRANSPORT_STREAM_DESC bytes="434f4e54" bytes_txt="CONT"/>
+<TRANSPORT_STREAM_DESC bytes="434f4e54"/>
 </DESC>
 <DESC id="0x68" length="33" value="313233342c534e475f48656164717561727465722c534e475f50726f7669646572">
-<DSNG_DESC bytes="313233342c534e475f48656164717561727465722c534e475f50726f7669646572" bytes_txt="1234,SNG_Headquarter,SNG_Provider"/>
+<DSNG_DESC bytes="313233342c534e475f48656164717561727465722c534e475f50726f7669646572"/>
 </DESC>
 </TSDT>
 <NIT tid="64" networkid="40000" version="0" current_next="1">
@@ -228,10 +228,10 @@
 <PRIVATE_DATA_SPECIFIER_DESC specifier="0xaabbccdd" />
 </DESC>
 <DESC id="0x64" length="22" value="11224e054259225445656e6709536f6d652074657874">
-<DATA_BROADCAST_DESC broadcast_id="0x1122" component_tag="78" selector_byte="4259225445" selector_byte_txt="BY.TE" lang="eng" text="Some text"/>
+<DATA_BROADCAST_DESC broadcast_id="0x1122" component_tag="78" selector_byte="4259225445" lang="eng" text="Some text"/>
 </DESC>
 <DESC id="0x66" length="6" value="1122554e4958">
-<DATA_BROADCAST_ID_DESC broadcast_id="0x1122" selector_byte="554e4958" selector_byte_txt="UNIX"/>
+<DATA_BROADCAST_ID_DESC broadcast_id="0x1122" selector_byte="554e4958"/>
 </DESC>
 </SERVICE>
 <SERVICE sid="20300" eit_schedule="1" eit_pf="1" running="2" free_CA="1">
@@ -248,9 +248,9 @@
 </DESC>
 </SERVICE>
 </SDT>
-<EIT tableid="0x4e" type="actual_pf" service_id="20000" version="0" current_next="1" tsid="10000" onid="40000">
+<EIT tableid="0x4e" type="actual_pf" service_id="20000" version="0" section="0" last_section="0" current_next="1" segment_last_section="0" tsid="10000" onid="40000">
 </EIT>
-<EIT tableid="0x4e" type="actual_pf" service_id="20000" version="1" current_next="1" tsid="10000" onid="40000">
+<EIT tableid="0x4e" type="actual_pf" service_id="20000" version="1" section="0" last_section="0" current_next="1" segment_last_section="0" tsid="10000" onid="40000">
 <EVENT id="30000" start_time="1234567890" start_time_dec="2009-02-13 23:31:30 UTC" duration="86399" duration_dec="23:59:59" running="2" free_CA="0">
 <DESC id="0x4d" length="44" value="656e670e4d616a6f72205456206576656e7419546865206576656e74206f66207468652063656e7475727921">
 <SHORT_EVENT_DESC lang="eng" event_name="Major TV event" text="The event of the century!"/>