From ea1c2a2e22543ba44bca7d71ff79834cc9f6f0b2 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Mon, 10 Oct 2011 15:57:20 +0300
Subject: [PATCH] mpeg/psi: Add support for descriptor 0x06 (Data stream
 alignment).

---
 mpeg/psi/desc_06.h     | 99 ++++++++++++++++++++++++++++++++++++++++++
 mpeg/psi/descs_list.h  |  1 +
 mpeg/psi/descs_print.h |  1 +
 3 files changed, 101 insertions(+)
 create mode 100644 mpeg/psi/desc_06.h

diff --git a/mpeg/psi/desc_06.h b/mpeg/psi/desc_06.h
new file mode 100644
index 0000000..5205a55
--- /dev/null
+++ b/mpeg/psi/desc_06.h
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * desc_06.h: ISO/IEC 13818-1 Descriptor 0x06 (Data stream alignment)
+ *****************************************************************************
+ * 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_06_H__
+#define __BITSTREAM_MPEG_DESC_06_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x06: Data stream alignment descriptor
+ *****************************************************************************/
+#define DESC06_HEADER_SIZE      (DESC_HEADER_SIZE + 1)
+
+static inline void desc06_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x06);
+    desc_set_length(p_desc, DESC06_HEADER_SIZE - DESC_HEADER_SIZE);
+}
+
+static inline void desc06_set_alignment(uint8_t *p_desc, uint8_t alignment)
+{
+    p_desc[2] = alignment;
+}
+
+static inline uint8_t desc06_get_alignment(const uint8_t *p_desc)
+{
+    return p_desc[2];
+}
+
+static inline const char *desc06_get_alignment_txt(uint8_t alignment)
+{
+    return alignment == 0x00 ? "Reserved" :
+           alignment == 0x01 ? "Slice, or video access unit or syncword" :
+           alignment == 0x02 ? "Video access unit" :
+           alignment == 0x03 ? "GOP, or SEQ" :
+           alignment == 0x04 ? "SEQ" : "Reserved";
+}
+
+static inline bool desc06_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC06_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc06_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, "<DATA_STREAM_ALIGNMENT_DESC alignment=\"%u\" alignment_txt=\"%s\"/>",
+                 desc06_get_alignment(p_desc),
+                 desc06_get_alignment_txt(desc06_get_alignment(p_desc)));
+        break;
+    default:
+        pf_print(opaque, "    - desc 06 data_stream_alignment alignment=%u alignment_txt=\"%s\"",
+                 desc06_get_alignment(p_desc),
+                 desc06_get_alignment_txt(desc06_get_alignment(p_desc)));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h
index 83fd845..d3a5a45 100644
--- a/mpeg/psi/descs_list.h
+++ b/mpeg/psi/descs_list.h
@@ -38,6 +38,7 @@
 #include <bitstream/mpeg/psi/desc_03.h>
 #include <bitstream/mpeg/psi/desc_04.h>
 #include <bitstream/mpeg/psi/desc_05.h>
+#include <bitstream/mpeg/psi/desc_06.h>
 #include <bitstream/mpeg/psi/desc_09.h>
 #include <bitstream/mpeg/psi/desc_0a.h>
 
diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h
index 034c572..7fc1cd6 100644
--- a/mpeg/psi/descs_print.h
+++ b/mpeg/psi/descs_print.h
@@ -104,6 +104,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(03)
         CASE_DESC(04)
         CASE_DESC(05)
+        CASE_DESC(06)
         CASE_DESC(09)
         CASE_DESC(0a)
         CASE_DESC_ICONV(40)