mpeg/psi: Add support for descriptor 0x27 (Metadata STD descriptor).

README

@@ -85,6 +85,7 @@ Supported MPEG descriptors
  * Descriptor 0x1f: FMC_descriptor
  * Descriptor 0x20: External ES_ID descriptor
  * Descriptor 0x23: MultiplexBuffer descriptor
+ * Descriptor 0x27: Metadata STD descriptor
 
 
 Supported DVB descriptors

TODO

@@ -7,7 +7,6 @@ so if you like something just do it and send a patch.
   - Descriptor 0x24 content_labeling_descriptor
   - Descriptor 0x25 metadata_pointer_descriptor
   - Descriptor 0x26 metadata_descriptor
-  - Descriptor 0x27 metadata_STD_descriptor
   - Descriptor 0x28 AVC video descriptor
   - Descriptor 0x29 IPMP_descriptor (defined in ISO/IEC 13818-11, MPEG-2 IPMP)
   - Descriptor 0x2a AVC timing and HRD descriptor

examples/dvb_gen_si.c

@@ -288,6 +288,14 @@ static void build_desc23(uint8_t *desc) {
     desc23_set_tb_leak_rate(desc, 445566);
 }
 
+/* MPEG Descriptor 0x27: Metadata STD descriptor */
+static void build_desc27(uint8_t *desc) {
+    desc27_init(desc);
+    desc27_set_input_leak_rate(desc, 12345);
+    desc27_set_buffer_size(desc, 23456);
+    desc27_set_output_leak_rate(desc, 34567);
+}
+
 /* =========================================================================
  * DVB defined descriptors
  * ========================================================================= */
@@ -1658,6 +1666,9 @@ static void generate_pmt(void) {
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc23(desc);
 
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc27(desc);
+
             // Finish descriptor generation
             desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos
             descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE);

mpeg/psi/desc_27.h

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * desc_27.h: ISO/IEC 13818-1 Descriptor 0x27 (Metadata STD 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:
+ *  - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems)
+ */
+
+#ifndef __BITSTREAM_MPEG_DESC_27_H__
+#define __BITSTREAM_MPEG_DESC_27_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x27 (Metadata STD descriptor)
+ *****************************************************************************/
+#define DESC27_HEADER_SIZE      (DESC_HEADER_SIZE + 9)
+
+static inline void desc27_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x27);
+    desc_set_length(p_desc, DESC27_HEADER_SIZE - DESC_HEADER_SIZE);
+}
+
+static inline bool desc27_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC27_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline uint32_t desc27_get_input_leak_rate(const uint8_t *p_desc)
+{
+    return ((p_desc[2] & 0x3f) << 16) | (p_desc[3] << 8) | p_desc[4];
+}
+
+static inline void desc27_set_input_leak_rate(uint8_t *p_desc, uint32_t i_input_leak_rate)
+{
+    p_desc[2] = ((i_input_leak_rate >> 16) & 0xff) | 0xc0;
+    p_desc[3] =  (i_input_leak_rate >>  8) & 0xff;
+    p_desc[4] =   i_input_leak_rate        & 0xff;
+}
+
+static inline uint32_t desc27_get_buffer_size(const uint8_t *p_desc)
+{
+    return ((p_desc[5] & 0x3f) << 16) | (p_desc[6] << 8) | p_desc[7];
+}
+
+static inline void desc27_set_buffer_size(uint8_t *p_desc, uint32_t i_buffer_size)
+{
+    p_desc[5] = ((i_buffer_size >> 16) & 0xff) | 0xc0;
+    p_desc[6] =  (i_buffer_size >>  8) & 0xff;
+    p_desc[7] =   i_buffer_size        & 0xff;
+}
+
+static inline uint32_t desc27_get_output_leak_rate(const uint8_t *p_desc)
+{
+    return ((p_desc[8] & 0x3f) << 16) | (p_desc[9] << 8) | p_desc[10];
+}
+
+static inline void desc27_set_output_leak_rate(uint8_t *p_desc, uint32_t i_output_leak_rate)
+{
+    p_desc[ 8] = ((i_output_leak_rate >> 16) & 0xff) | 0xc0;
+    p_desc[ 9] =  (i_output_leak_rate >>  8) & 0xff;
+    p_desc[10] =   i_output_leak_rate        & 0xff;
+}
+
+static inline void desc27_print(const 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, "<METADATA_STD_DESC input_leak_rate=\"%u\" buffer_size=\"%u\" output_leak_rate=\"%u\"/>",
+                 desc27_get_input_leak_rate(p_desc),
+                 desc27_get_buffer_size(p_desc),
+                 desc27_get_output_leak_rate(p_desc));
+        break;
+    default:
+        pf_print(opaque,"    - desc 27 metadata_std input_leak_rate=%u buffer_size=%u output_leak_rate=%u",
+                 desc27_get_input_leak_rate(p_desc),
+                 desc27_get_buffer_size(p_desc),
+                 desc27_get_output_leak_rate(p_desc));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

mpeg/psi/descs_list.h

@@ -58,5 +58,6 @@
 #include <bitstream/mpeg/psi/desc_1f.h>
 #include <bitstream/mpeg/psi/desc_20.h>
 #include <bitstream/mpeg/psi/desc_23.h>
+#include <bitstream/mpeg/psi/desc_27.h>
 
 #endif

mpeg/psi/descs_print.h

@@ -124,6 +124,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(1f)
         CASE_DESC(20)
         CASE_DESC(23)
+        CASE_DESC(27)
         CASE_DESC_ICONV(40)
         CASE_DESC(41)
         CASE_DESC(43)