From 58776501adf7c17cadd13259d5d8bae01c8a7977 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Mon, 10 Oct 2011 15:58:36 +0300
Subject: [PATCH] mpeg/psi: Add support for descriptor 0x08 (Video Window
 descriptor).

---
 mpeg/psi/desc_08.h     | 94 ++++++++++++++++++++++++++++++++++++++++++
 mpeg/psi/descs_list.h  |  1 +
 mpeg/psi/descs_print.h |  1 +
 3 files changed, 96 insertions(+)
 create mode 100644 mpeg/psi/desc_08.h

diff --git a/mpeg/psi/desc_08.h b/mpeg/psi/desc_08.h
new file mode 100644
index 0000000..eb411f0
--- /dev/null
+++ b/mpeg/psi/desc_08.h
@@ -0,0 +1,94 @@
+/*****************************************************************************
+ * desc_08.h: ISO/IEC 13818-1 Descriptor 0x08 (Video Window 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_08_H__
+#define __BITSTREAM_MPEG_DESC_08_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/mpeg/psi/desc_07.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x08: Video Window descriptor
+ *****************************************************************************/
+#define DESC08_HEADER_SIZE      (DESC_HEADER_SIZE + 4)
+
+static inline void desc08_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x08);
+    desc_set_length(p_desc, DESC08_HEADER_SIZE - DESC_HEADER_SIZE);
+}
+
+#define desc08_get_horizontal_offset desc07_get_horizontal_size
+#define desc08_set_horizontal_offset desc07_set_horizontal_size
+
+#define desc08_get_vertical_offset desc07_get_vertical_size
+#define desc08_set_vertical_offset desc07_set_vertical_size
+
+#define desc08_get_window_priority desc07_get_aspect_ratio_info
+#define desc08_set_window_priority desc07_set_aspect_ratio_info
+
+static inline bool desc08_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC08_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc08_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, "<VIDEO_WINDOW_DESC horizontal_offset=\"%u\" vertical_offset=\"%u\" window_priority=\"%u\"/>",
+                 desc08_get_horizontal_offset(p_desc),
+                 desc08_get_vertical_offset(p_desc),
+                 desc08_get_window_priority(p_desc)
+                );
+        break;
+    default:
+        pf_print(opaque, "    - desc 08 video_window horizontal_offset=%u vertical_offset=%u window_priority=%u",
+                 desc08_get_horizontal_offset(p_desc),
+                 desc08_get_vertical_offset(p_desc),
+                 desc08_get_window_priority(p_desc)
+                );
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h
index e042541..a79b283 100644
--- a/mpeg/psi/descs_list.h
+++ b/mpeg/psi/descs_list.h
@@ -40,6 +40,7 @@
 #include <bitstream/mpeg/psi/desc_05.h>
 #include <bitstream/mpeg/psi/desc_06.h>
 #include <bitstream/mpeg/psi/desc_07.h>
+#include <bitstream/mpeg/psi/desc_08.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 78c4691..a3c1374 100644
--- a/mpeg/psi/descs_print.h
+++ b/mpeg/psi/descs_print.h
@@ -106,6 +106,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(05)
         CASE_DESC(06)
         CASE_DESC(07)
+        CASE_DESC(08)
         CASE_DESC(09)
         CASE_DESC(0a)
         CASE_DESC_ICONV(40)