mpeg/psi: Add support for descriptor 0x2b (MPEG-2 AAC audio descriptor).

README

@@ -88,6 +88,7 @@ Supported MPEG descriptors
  * Descriptor 0x27: Metadata STD descriptor
  * Descriptor 0x28: AVC video descriptor
  * Descriptor 0x2a: AVC timing and HRD descriptor
+ * Descriptor 0x2b: MPEG-2 AAC audio descriptor
 
 
 Supported DVB descriptors

TODO

@@ -8,7 +8,6 @@ so if you like something just do it and send a patch.
   - Descriptor 0x25 metadata_pointer_descriptor
   - Descriptor 0x26 metadata_descriptor
   - Descriptor 0x29 IPMP_descriptor (defined in ISO/IEC 13818-11, MPEG-2 IPMP)
-  - Descriptor 0x2b MPEG-2_AAC_audio_descriptor
   - Descriptor 0x2c FlexMuxTiming_descriptor
 
 - Add support for Selection Information Table (SIT).

examples/dvb_gen_si.c

@@ -323,6 +323,14 @@ static void build_desc2a(uint8_t *desc) {
     desc2a_set_picture_to_display_conversion_flag(desc, true);
 }
 
+/* MPEG Descriptor 0x2b: MPEG-2 AAC audio descriptor */
+static void build_desc2b(uint8_t *desc) {
+    desc2b_init(desc);
+    desc2b_set_aac_profile(desc, 0x12);
+    desc2b_set_aac_channel_config(desc, 0x05);
+    desc2b_set_aac_additional_info(desc, 0x00);
+}
+
 /* =========================================================================
  * DVB defined descriptors
  * ========================================================================= */
@@ -1723,6 +1731,25 @@ static void generate_pmt(void) {
             descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE);
         }
 
+        pmt_n = pmt_get_es(pmt, pmt_n_counter++);
+        pmtn_init(pmt_n);
+        pmtn_set_streamtype(pmt_n, 0x0f); // AAC
+        pmtn_set_pid(pmt_n, pmt_pid + 27);
+        pmtn_set_desclength(pmt_n, 0);
+        {
+            // Add descriptors to transport_stream_n
+            desc_counter = 0;
+            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
+
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc2b(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);
+        }
+
         // Set transport_stream_loop length
         pmt_n = pmt_get_es(pmt, pmt_n_counter); // Get last service
         pmt_set_length(pmt, pmt_n - pmt_get_es(pmt, 0) + pmt_get_desclength(pmt));

mpeg/psi/desc_2b.h

@@ -0,0 +1,116 @@
+/*****************************************************************************
+ * desc_2b.h: ISO/IEC 13818-1 Descriptor 0x2b (MPEG2 AAC audio 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_2B_H__
+#define __BITSTREAM_MPEG_DESC_2B_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x2b (MPEG2 AAC audio descriptor)
+ *****************************************************************************/
+#define DESC2B_HEADER_SIZE      (DESC_HEADER_SIZE + 3)
+
+static inline void desc2b_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x2b);
+    desc_set_length(p_desc, DESC2B_HEADER_SIZE - DESC_HEADER_SIZE);
+}
+
+static inline bool desc2b_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC2B_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline uint8_t desc2b_get_aac_profile(const uint8_t *p_desc)
+{
+    return p_desc[2];
+}
+
+static inline void desc2b_set_aac_profile(uint8_t *p_desc, uint8_t i_profile)
+{
+    p_desc[2] = i_profile;
+}
+
+static inline uint8_t desc2b_get_aac_channel_config(const uint8_t *p_desc)
+{
+    return p_desc[3];
+}
+
+static inline void desc2b_set_aac_channel_config(uint8_t *p_desc, uint8_t i_channel_config)
+{
+    p_desc[3] = i_channel_config;
+}
+
+static inline uint8_t desc2b_get_aac_additional_info(const uint8_t *p_desc)
+{
+    return p_desc[4];
+}
+
+static inline void desc2b_set_aac_additional_info(uint8_t *p_desc, uint8_t i_additional_info)
+{
+    p_desc[4] = i_additional_info;
+}
+
+static inline void desc2b_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, "<MPEG2_AAC_AUDIO_DESC profile=\"0x%02x\""
+                " channel_config=\"0x%02x\" additional_info=\"0x%02x\"",
+                 desc2b_get_aac_profile(p_desc),
+                 desc2b_get_aac_channel_config(p_desc),
+                 desc2b_get_aac_additional_info(p_desc)
+                );
+        break;
+    default:
+        pf_print(opaque,"    - desc 2b mpeg2_aac_audio profile=0x%02x"
+                " channel_config=0x%02x additional_info=0x%02x",
+                 desc2b_get_aac_profile(p_desc),
+                 desc2b_get_aac_channel_config(p_desc),
+                 desc2b_get_aac_additional_info(p_desc)
+                );
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

mpeg/psi/descs_list.h

@@ -61,5 +61,6 @@
 #include <bitstream/mpeg/psi/desc_27.h>
 #include <bitstream/mpeg/psi/desc_28.h>
 #include <bitstream/mpeg/psi/desc_2a.h>
+#include <bitstream/mpeg/psi/desc_2b.h>
 
 #endif

mpeg/psi/descs_print.h

@@ -127,6 +127,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(27)
         CASE_DESC(28)
         CASE_DESC(2a)
+        CASE_DESC(2b)
         CASE_DESC_ICONV(40)
         CASE_DESC(41)
         CASE_DESC(43)