dvb/si: Add support for descriptor 0x4b (NVOD reference descriptor).

README

@@ -108,6 +108,7 @@ Supported DVB descriptors
  * Descriptor 0x48: Service descriptor
  * Descriptor 0x49: Country availability descriptor
  * Descriptor 0x4a: Linkage descriptor (partially implemented)
+ * Descriptor 0x4b: NVOD reference descriptor
  * Descriptor 0x4d: Short event descriptor
  * Descriptor 0x4e: Extended event descriptor
  * Descriptor 0x52: Stream identifier descriptor

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 0x4b: NVOD_reference_descriptor
   - Descriptor 0x4c: time_shifted_service_descriptor
   - Descriptor 0x4f: time_shifted_event_descriptor
   - Descriptor 0x50: component_descriptor

dvb/si/desc_4b.h

@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * desc_4b.h: ETSI EN 300 468 Descriptor 0x4b: NVOD reference descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          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_4B_H__
+#define __BITSTREAM_DVB_DESC_4B_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x4b: NVOD reference descriptor
+ *****************************************************************************/
+#define DESC4B_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC4B_REFERENCE_SIZE   6
+
+static inline void desc4b_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x4b);
+}
+
+static inline uint16_t desc4bn_get_tsid(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[0] << 8) | p_desc_n[1];
+}
+
+static inline void desc4bn_set_tsid(uint8_t *p_desc_n, uint16_t i_tsid)
+{
+    p_desc_n[0] = (i_tsid >> 8) & 0xff;
+    p_desc_n[1] =  i_tsid       & 0xff;
+}
+
+static inline uint16_t desc4bn_get_onid(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[2] << 8) | p_desc_n[3];
+}
+
+static inline void desc4bn_set_onid(uint8_t *p_desc_n, uint16_t i_onid)
+{
+    p_desc_n[2] = (i_onid >> 8) & 0xff;
+    p_desc_n[3] =  i_onid       & 0xff;
+}
+
+static inline uint16_t desc4bn_get_sid(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[4] << 8) | p_desc_n[5];
+}
+
+static inline void desc4bn_set_sid(uint8_t *p_desc_n, uint16_t i_sid)
+{
+    p_desc_n[4] = (i_sid >> 8) & 0xff;
+    p_desc_n[5] =  i_sid       & 0xff;
+}
+
+static inline uint8_t *desc4b_get_reference(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC4B_HEADER_SIZE + n * DESC4B_REFERENCE_SIZE;
+    if (p_desc_n + DESC4B_REFERENCE_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC4B_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+static inline bool desc4b_validate(const uint8_t *p_desc)
+{
+    return !(desc_get_length(p_desc) % DESC4B_REFERENCE_SIZE);
+}
+
+static inline void desc4b_print(uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    uint8_t j = 0;
+    uint8_t *p_desc_n;
+
+    while ((p_desc_n = desc4b_get_reference(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+                "<NVOD_REFERENCE_DESC tsid=\"%u\" onid=\"%u\" sid=\"%u\"/>",
+                desc4bn_get_tsid(p_desc_n),
+                desc4bn_get_onid(p_desc_n),
+                desc4bn_get_sid(p_desc_n)
+            );
+            break;
+        default:
+            pf_print(opaque,
+            "    - desc 4b nvod_reference tsid=%u onid=%u sid=%u",
+                desc4bn_get_tsid(p_desc_n),
+                desc4bn_get_onid(p_desc_n),
+                desc4bn_get_sid(p_desc_n)
+            );
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -45,6 +45,7 @@
 #include <bitstream/dvb/si/desc_48.h>
 #include <bitstream/dvb/si/desc_49.h>
 #include <bitstream/dvb/si/desc_4a.h>
+#include <bitstream/dvb/si/desc_4b.h>
 #include <bitstream/dvb/si/desc_4d.h>
 #include <bitstream/dvb/si/desc_4e.h>
 #include <bitstream/dvb/si/desc_52.h>

examples/dvb_gen_si.c

@@ -537,7 +537,33 @@ static void build_desc49(uint8_t *desc, bool b_available) {
 }
 
 /* DVB  Descriptor 0x4a: Linkage descriptor (partially implemented) */
-/* ---  Descriptor 0x4b: NVOD_reference_descriptor */
+/* DVB  Descriptor 0x4b: NVOD_reference_descriptor */
+static void build_desc4b(uint8_t *desc, bool b_available) {
+    uint8_t k = 0;
+    uint8_t *ref_n;
+
+    desc4b_init(desc);
+    desc_set_length(desc, 255);
+
+    ref_n = desc4b_get_reference(desc, k++);
+    desc4bn_set_tsid(ref_n, tsid);
+    desc4bn_set_onid(ref_n, onid);
+    desc4bn_set_sid (ref_n, sid);
+
+    ref_n = desc4b_get_reference(desc, k++);
+    desc4bn_set_tsid(ref_n, tsid + 100);
+    desc4bn_set_onid(ref_n, onid + 100);
+    desc4bn_set_sid (ref_n, sid  + 100);
+
+    ref_n = desc4b_get_reference(desc, k++);
+    desc4bn_set_tsid(ref_n, tsid + 200);
+    desc4bn_set_onid(ref_n, onid + 200);
+    desc4bn_set_sid (ref_n, sid  + 200);
+
+    ref_n = desc4b_get_reference(desc, k);
+    desc_set_length(desc, ref_n - desc - DESC_HEADER_SIZE);
+}
+
 /* ---  Descriptor 0x4c: time_shifted_service_descriptor */
 /* DVB  Descriptor 0x4d: Short event descriptor */
 static void build_desc4d(uint8_t *desc) {
@@ -1331,6 +1357,9 @@ static void generate_sdt(void) {
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc48(desc);
 
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc4b(desc, false);
+
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc5f(desc);
 

mpeg/psi/descs_print.h

@@ -140,6 +140,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC_ICONV(48)
         CASE_DESC(49)
         CASE_DESC(4a)
+        CASE_DESC(4b)
         CASE_DESC_ICONV(4d)
         CASE_DESC_ICONV(4e)
         CASE_DESC(52)