From f3edf7b53272bc0feb274e9fc4045daa3cc97e11 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Fri, 7 Oct 2011 00:47:13 +0300
Subject: [PATCH] dvb/si: Add support for descriptor 0x42 (Stuffing
 descriptor).

---
 README                 |  1 +
 TODO                   |  1 -
 dvb/si/desc_42.h       | 75 ++++++++++++++++++++++++++++++++++++++++++
 dvb/si/descs_list.h    |  1 +
 examples/dvb_gen_si.c  |  5 +++
 mpeg/psi/descs_print.h |  1 +
 6 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 dvb/si/desc_42.h

diff --git a/README b/README
index e05f076..7053ed6 100644
--- a/README
+++ b/README
@@ -98,6 +98,7 @@ Supported DVB descriptors
 =========================
 
  * Descriptor 0x40: Network name descriptor
+ * Descriptor 0x42: Stuffing descriptor
  * Descriptor 0x41: Service list descriptor
  * Descriptor 0x43: Satellite delivery system descriptor
  * Descriptor 0x44: Cable delivery system descriptor
diff --git a/TODO b/TODO
index 70feae4..1286191 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,6 @@ so if you like something just do it and send a patch.
   - Descriptor 0x6a: AC-3 descriptor
 
 - Add support (parser, generator, example) for these DVB descriptors:
-  - Descriptor 0x42: Stuffing descriptor
   - Descriptor 0x45: VBI data descriptor
   - Descriptor 0x49: Country availability descriptor
   - Descriptor 0x4b: NVOD_reference_descriptor
diff --git a/dvb/si/desc_42.h b/dvb/si/desc_42.h
new file mode 100644
index 0000000..813b4fe
--- /dev/null
+++ b/dvb/si/desc_42.h
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * desc_42.h: ETSI EN 300 468 Descriptor 0x42: Stuffing descriptor
+ *****************************************************************************
+ * Copyright (C) 2011 Unix Solutions Ltd.
+ *
+ * Authors: Georgi Chorbadzhiyski <georgi@unixsol.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+/*
+ * Normative references:
+ *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
+ */
+
+#ifndef __BITSTREAM_DVB_DESC_42_H__
+#define __BITSTREAM_DVB_DESC_42_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x42: Service list descriptor
+ *****************************************************************************/
+#define DESC42_HEADER_SIZE      DESC_HEADER_SIZE
+
+static inline void desc42_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x42);
+}
+
+static inline bool desc42_validate(const uint8_t *p_desc)
+{
+    return true;
+}
+
+static inline void desc42_print(uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque, "<STUFFING_DESC length=\"%u\"/>", desc_get_length(p_desc));
+        break;
+    default:
+        pf_print(opaque, "    - desc 42 stuffing length=%u", desc_get_length(p_desc));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h
index 69b3cf8..8f3c936 100644
--- a/dvb/si/descs_list.h
+++ b/dvb/si/descs_list.h
@@ -36,6 +36,7 @@
 
 #include <bitstream/dvb/si/desc_40.h>
 #include <bitstream/dvb/si/desc_41.h>
+#include <bitstream/dvb/si/desc_42.h>
 #include <bitstream/dvb/si/desc_43.h>
 #include <bitstream/dvb/si/desc_44.h>
 #include <bitstream/dvb/si/desc_46.h>
diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c
index 42cd2d1..8e25539 100644
--- a/examples/dvb_gen_si.c
+++ b/examples/dvb_gen_si.c
@@ -1794,6 +1794,11 @@ static void generate_pmt(void) {
             desc_loop = pmtn_get_descs(pmt_n);
             descs_set_length(desc_loop, DESCS_MAX_SIZE); // This is needed so descs_get_desc(x, n) works
 
+/* DVB  Descriptor 0x42: Stuffing descriptor */
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc0f(desc);
+            desc42_init(desc); /* Every descriptor can be stuffed */
+
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc2b(desc);
 
diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h
index dca7830..d313d5f 100644
--- a/mpeg/psi/descs_print.h
+++ b/mpeg/psi/descs_print.h
@@ -131,6 +131,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(2c)
         CASE_DESC_ICONV(40)
         CASE_DESC(41)
+        CASE_DESC(42)
         CASE_DESC(43)
         CASE_DESC(44)
         CASE_DESC(46)