SDT: rename i_ts_id to i_extension

The SDT field known as i_ts_id is named i_extension in the struct dvbpsi_psi_section_t.

examples/decode_sdt.c

@@ -106,7 +106,7 @@ static void DumpSDT(void* p_zero, dvbpsi_sdt_t* p_sdt)
   printf(  "\n");
   printf(  "New active SDT\n");
   printf(  "  ts_id : %d\n",
-         p_sdt->i_ts_id);
+         p_sdt->i_extension);
   printf(  "  version_number : %d\n",
          p_sdt->i_version);
   printf(  "  network_id        : %d\n",

examples/dvbinfo/libdvbpsi.c

@@ -1279,7 +1279,7 @@ static void handle_SDT(void* p_data, dvbpsi_sdt_t* p_sdt)
     printf("\n");
     printf("  SDT: Session Descriptor Table\n");
     printf("\tVersion number : %d\n", p_sdt->i_version);
-    printf("\tTransport stream id : %d\n", p_sdt->i_ts_id);
+    printf("\tTransport stream id : %d\n", p_sdt->i_extension);
     printf("\tNetwork id     : %d\n", p_sdt->i_network_id);
     while (p_service)
     {

src/tables/sdt.c

@@ -284,7 +284,7 @@ static bool dvbpsi_CheckSDT(dvbpsi_t *p_dvbpsi, dvbpsi_sdt_decoder_t *p_sdt_deco
     assert(p_dvbpsi);
     assert(p_sdt_decoder);
 
-    if (p_sdt_decoder->p_building_sdt->i_ts_id != p_section->i_extension)
+    if (p_sdt_decoder->p_building_sdt->i_extension != p_section->i_extension)
     {
         /* transport_stream_id */
         dvbpsi_error(p_dvbpsi, "SDT decoder",
@@ -485,8 +485,8 @@ dvbpsi_psi_section_t *dvbpsi_sdt_sections_generate(dvbpsi_t *p_dvbpsi, dvbpsi_sd
     p_current->i_table_id = 0x42;
     p_current->b_syntax_indicator = true;
     p_current->b_private_indicator = true;
-    p_current->i_length = 12;                     /* header + CRC_32 */
-    p_current->i_extension = p_sdt->i_ts_id;
+    p_current->i_length = 12;                    /* header + CRC_32 */
+    p_current->i_extension = p_sdt->i_extension; /* is transport_stream_id */
     p_current->i_version = p_sdt->i_version;
     p_current->b_current_next = p_sdt->b_current_next;
     p_current->i_number = 0;
@@ -525,7 +525,7 @@ dvbpsi_psi_section_t *dvbpsi_sdt_sections_generate(dvbpsi_t *p_dvbpsi, dvbpsi_sd
             p_current->b_syntax_indicator = true;
             p_current->b_private_indicator = true;
             p_current->i_length = 12;                 /* header + CRC_32 */
-            p_current->i_extension = p_sdt->i_ts_id;;
+            p_current->i_extension = p_sdt->i_extension;;
             p_current->i_version = p_sdt->i_version;
             p_current->b_current_next = p_sdt->b_current_next;
             p_current->i_number = p_prev->i_number + 1;

src/tables/sdt.h

@@ -88,10 +88,9 @@ typedef struct dvbpsi_sdt_s
 {
     /* PSI table members */
     uint8_t                   i_table_id;         /*!< table id */
-    uint16_t                  i_extension;        /*!< subtable id */
+    uint16_t                  i_extension;        /*!< subtable id, here transport_stream_id */
 
     /* Table specific */
-    uint16_t                  i_ts_id;            /*!< transport_stream_id */
     uint8_t                   i_version;          /*!< version_number */
     bool                      b_current_next;     /*!< current_next_indicator */
     uint16_t                  i_network_id;       /*!< original network id */