Imported Upstream version 1.1.2
diff --git a/gst-libs/gst/mpegts/gstmpegtsdescriptor.h b/gst-libs/gst/mpegts/gstmpegtsdescriptor.h
new file mode 100644
index 0000000..2ac27b1
--- /dev/null
+++ b/gst-libs/gst/mpegts/gstmpegtsdescriptor.h
@@ -0,0 +1,316 @@
+/*
+ * gstmpegtsdescriptor.h - 
+ * Copyright (C) 2013 Edward Hervey
+ * 
+ * Authors:
+ *   Edward Hervey <edward@collabora.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Some parts of this code come from the Fluendo MPEG Demuxer plugin.
+ *
+ * The Initial Developer of the Original Code is Fluendo, S.L.
+ * Portions created by Fluendo, S.L. are Copyright (C) 2005
+ * Fluendo, S.L. All Rights Reserved.
+ *
+ * Contributor(s): Wim Taymans <wim@fluendo.com>
+ */
+
+#ifndef GST_MPEGTS_DESCRIPTOR_H
+#define GST_MPEGTS_DESCRIPTOR_H
+
+#include <gst/gst.h>
+
+/*
+ * descriptor_tag TS  PS                      Identification
+ *        0       n/a n/a Reserved
+ *        1       n/a n/a Reserved
+ *        2        X   X  video_stream_descriptor
+ *        3        X   X  audio_stream_descriptor
+ *        4        X   X  hierarchy_descriptor
+ *        5        X   X  registration_descriptor
+ *        6        X   X  data_stream_alignment_descriptor
+ *        7        X   X  target_background_grid_descriptor
+ *        8        X   X  video_window_descriptor
+ *        9        X   X  CA_descriptor
+ *       10        X   X  ISO_639_language_descriptor
+ *       11        X   X  system_clock_descriptor
+ *       12        X   X  multiplex_buffer_utilization_descriptor
+ *       13        X   X  copyright_descriptor
+ *       14        X      maximum bitrate descriptor
+ *       15        X   X  private data indicator descriptor
+ *       16        X   X  smoothing buffer descriptor
+ *       17        X      STD_descriptor
+ *       18        X   X  IBP descriptor
+ *      19-63     n/a n/a ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved
+ *     64-255     n/a n/a User Private
+ */
+
+/**
+ * GstMpegTsDescriptorType:
+ *
+ * The type of #GstMpegTsDescriptor
+ *
+ * These values correspond to the registered descriptor type from
+ * the base MPEG-TS specifications (ITU H.222.0 | ISO/IEC 13818-1).
+ *
+ * Consult the relevant specifications for more details.
+ */
+typedef enum {
+  /* 0-18 ISO/IEC 13818-1 (H222.0 06/2012) */
+  GST_MTS_DESC_RESERVED_00                      = 0x00,
+  GST_MTS_DESC_RESERVED_01                      = 0x01,
+  GST_MTS_DESC_VIDEO_STREAM                     = 0x02,
+  GST_MTS_DESC_AUDIO_STREAM                     = 0x03,
+  GST_MTS_DESC_HIERARCHY                        = 0x04,
+  GST_MTS_DESC_REGISTRATION                     = 0x05,
+  GST_MTS_DESC_DATA_STREAM_ALIGNMENT            = 0x06,
+  GST_MTS_DESC_TARGET_BACKGROUND_GRID           = 0x07,
+  GST_MTS_DESC_VIDEO_WINDOW                     = 0x08,
+  GST_MTS_DESC_CA                               = 0x09,
+  GST_MTS_DESC_ISO_639_LANGUAGE                 = 0x0A,
+  GST_MTS_DESC_SYSTEM_CLOCK                     = 0x0B,
+  GST_MTS_DESC_MULTIPLEX_BUFFER_UTILISATION     = 0x0C,
+  GST_MTS_DESC_COPYRIGHT                        = 0x0D,
+  GST_MTS_DESC_MAXIMUM_BITRATE                  = 0x0E,
+  GST_MTS_DESC_PRIVATE_DATA_INDICATOR           = 0x0F,
+  GST_MTS_DESC_SMOOTHING_BUFFER                 = 0x10,
+  GST_MTS_DESC_STD                              = 0x11,
+  GST_MTS_DESC_IBP                              = 0x12,
+
+  /* 19-26 Defined in ISO/IEC 13818-6 (Extensions for DSM-CC) */
+  GST_MTS_DESC_DSMCC_CAROUSEL_IDENTIFIER        = 0x13,
+  GST_MTS_DESC_DSMCC_ASSOCIATION_TAG            = 0x14,
+  GST_MTS_DESC_DSMCC_DEFERRED_ASSOCIATION_TAG   = 0x15,
+  /* 0x16 is reserved (so far) */
+  GST_MTS_DESC_DSMCC_NPT_REFERENCE              = 0x17,
+  GST_MTS_DESC_DSMCC_NPT_ENDPOINT               = 0x18,
+  GST_MTS_DESC_DSMCC_STREAM_MODE                = 0x19,
+  GST_MTS_DESC_DSMCC_STREAM_EVENT               = 0x1A,
+
+  /* 27-54 Later additions to ISO/IEC 13818-1 (H222.0 06/2012) */
+  GST_MTS_DESC_MPEG4_VIDEO                      = 0x1B,
+  GST_MTS_DESC_MPEG4_AUDIO                      = 0x1C,
+  GST_MTS_DESC_IOD                              = 0x1D,
+  GST_MTS_DESC_SL                               = 0x1E,
+  GST_MTS_DESC_FMC                              = 0x1F,
+  GST_MTS_DESC_EXTERNAL_ES_ID                   = 0x20,
+  GST_MTS_DESC_MUX_CODE                         = 0x21,
+  GST_MTS_DESC_FMX_BUFFER_SIZE                  = 0x22,
+  GST_MTS_DESC_MULTIPLEX_BUFFER                 = 0x23,
+  GST_MTS_DESC_CONTENT_LABELING                 = 0x24,
+  GST_MTS_DESC_METADATA_POINTER                 = 0x25,
+  GST_MTS_DESC_METADATA                         = 0x26,
+  GST_MTS_DESC_METADATA_STD                     = 0x27,
+  GST_MTS_DESC_AVC_VIDEO                        = 0x28,
+  /* defined in ISO/IEC 13818-11, MPEG-2 IPMP */
+  GST_MTS_DESC_IPMP                             = 0x29,
+  GST_MTS_DESC_AVC_TIMING_AND_HRD               = 0x2A,
+  GST_MTS_DESC_MPEG2_AAC_AUDIO                  = 0x2B,
+  GST_MTS_DESC_FLEX_MUX_TIMING                  = 0x2C,
+  GST_MTS_DESC_MPEG4_TEXT                       = 0x2D,
+  GST_MTS_DESC_MPEG4_AUDIO_EXTENSION            = 0x2E,
+  GST_MTS_DESC_AUXILIARY_VIDEO_STREAM           = 0x2F,
+  GST_MTS_DESC_SVC_EXTENSION                    = 0x30,
+  GST_MTS_DESC_MVC_EXTENSION                    = 0x31,
+  GST_MTS_DESC_J2K_VIDEO                        = 0x32,
+  GST_MTS_DESC_MVC_OPERATION_POINT              = 0x33,
+  GST_MTS_DESC_MPEG2_STEREOSCOPIC_VIDEO_FORMAT  = 0x34,
+  GST_MTS_DESC_STEREOSCOPIC_PROGRAM_INFO        = 0x35,
+  GST_MTS_DESC_STEREOSCOPIC_VIDEO_INFO          = 0x36,
+
+  /* 55-63 ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved */
+} GstMpegTsDescriptorType;
+
+/**
+ * GstMpegTsMiscDescriptorType:
+ *
+ * The type of #GstMpegTsDescriptor
+ *
+ * These values correspond to miscellaneous descriptor types that are
+ * not yet identified from known specifications.
+ */
+typedef enum {
+  /* 0x80 - 0xFE are user defined */
+  GST_MTS_DESC_AC3_AUDIO_STREAM                 = 0x81,
+  GST_MTS_DESC_DTG_LOGICAL_CHANNEL              = 0x83,    /* from DTG D-Book */
+} GstMpegTsMiscDescriptorType;
+
+/**
+ * GstMpegTsATSCDescriptorType:
+ *
+ * These values correspond to the registered descriptor type from
+ * the various ATSC specifications.
+ *
+ * Consult the relevant specifications for more details.
+ */
+typedef enum {
+  /* ATSC A/65 2009 */
+  GST_MTS_DESC_ATSC_STUFFING                    = 0x80,
+  GST_MTS_DESC_ATSC_AC3                         = 0x83,
+  GST_MTS_DESC_ATSC_CAPTION_SERVICE             = 0x86,
+  GST_MTS_DESC_ATSC_CONTENT_ADVISORY            = 0x87,
+  GST_MTS_DESC_ATSC_EXTENDED_CHANNEL_NAME       = 0xA0,
+  GST_MTS_DESC_ATSC_SERVICE_LOCATION            = 0xA1,
+  GST_MTS_DESC_ATSC_TIME_SHIFTED_SERVICE        = 0xA2,
+  GST_MTS_DESC_ATSC_COMPONENT_NAME              = 0xA3,
+  GST_MTS_DESC_ATSC_DCC_DEPARTING_REQUEST       = 0xA8,
+  GST_MTS_DESC_ATSC_DCC_ARRIVING_REQUEST        = 0xA9,
+  GST_MTS_DESC_ATSC_REDISTRIBUTION_CONTROL      = 0xAA,
+  GST_MTS_DESC_ATSC_GENRE                       = 0xAB,
+  GST_MTS_DESC_ATSC_PRIVATE_INFORMATION         = 0xAD,
+
+  /* ATSC A/53:3 2009 */
+  GST_MTS_DESC_ATSC_ENHANCED_SIGNALING          = 0xB2,
+
+  /* ATSC A/90 */
+  GST_MTS_DESC_ATSC_DATA_SERVICE                = 0xA4,
+  GST_MTS_DESC_ATSC_PID_COUNT                   = 0xA5,
+  GST_MTS_DESC_ATSC_DOWNLOAD_DESCRIPTOR         = 0xA6,
+  GST_MTS_DESC_ATSC_MULTIPROTOCOL_ENCAPSULATION = 0xA7,
+  GST_MTS_DESC_ATSC_MODULE_LINK                 = 0xB4,
+  GST_MTS_DESC_ATSC_CRC32                       = 0xB5,
+  GST_MTS_DESC_ATSC_GROUP_LINK                  = 0xB8,
+} GstMpegTsATSCDescriptorType;
+
+/**
+ * GstMpegTsISDBDescriptorType:
+ *
+ * These values correspond to the registered descriptor type from
+ * the various ISDB specifications.
+ *
+ * Consult the relevant specifications for more details.
+ */
+typedef enum {
+  /* ISDB ARIB B10 v4.6 */
+  GST_MTS_DESC_ISDB_HIERARCHICAL_TRANSMISSION   = 0xC0,
+  GST_MTS_DESC_ISDB_DIGITAL_COPY_CONTROL        = 0xC1,
+  GST_MTS_DESC_ISDB_NETWORK_IDENTIFICATION      = 0xC2,
+  GST_MTS_DESC_ISDB_PARTIAL_TS_TIME             = 0xc3,
+  GST_MTS_DESC_ISDB_AUDIO_COMPONENT             = 0xc4,
+  GST_MTS_DESC_ISDB_HYPERLINK                   = 0xc5,
+  GST_MTS_DESC_ISDB_TARGET_REGION               = 0xc6,
+  GST_MTS_DESC_ISDB_DATA_CONTENT                = 0xc7,
+  GST_MTS_DESC_ISDB_VIDEO_DECODE_CONTROL        = 0xc8,
+  GST_MTS_DESC_ISDB_DOWNLOAD_CONTENT            = 0xc9,
+  GST_MTS_DESC_ISDB_CA_EMM_TS                   = 0xca,
+  GST_MTS_DESC_ISDB_CA_CONTRACT_INFORMATION     = 0xcb,
+  GST_MTS_DESC_ISDB_CA_SERVICE                  = 0xcc,
+  GST_MTS_DESC_ISDB_TS_INFORMATION              = 0xcd,
+  GST_MTS_DESC_ISDB_EXTENDED_BROADCASTER        = 0xce,
+  GST_MTS_DESC_ISDB_LOGO_TRANSMISSION           = 0xcf,
+  GST_MTS_DESC_ISDB_BASIC_LOCAL_EVENT           = 0xd0,
+  GST_MTS_DESC_ISDB_REFERENCE                   = 0xd1,
+  GST_MTS_DESC_ISDB_NODE_RELATION               = 0xd2,
+  GST_MTS_DESC_ISDB_SHORT_NODE_INFORMATION      = 0xd3,
+  GST_MTS_DESC_ISDB_STC_REFERENCE               = 0xd4,
+  GST_MTS_DESC_ISDB_SERIES                      = 0xd5,
+  GST_MTS_DESC_ISDB_EVENT_GROUP                 = 0xd6,
+  GST_MTS_DESC_ISDB_SI_PARAMETER                = 0xd7,
+  GST_MTS_DESC_ISDB_BROADCASTER_NAME            = 0xd8,
+  GST_MTS_DESC_ISDB_COMPONENT_GROUP             = 0xd9,
+  GST_MTS_DESC_ISDB_SI_PRIME_TS                 = 0xda,
+  GST_MTS_DESC_ISDB_BOARD_INFORMATION           = 0xdb,
+  GST_MTS_DESC_ISDB_LDT_LINKAGE                 = 0xdc,
+  GST_MTS_DESC_ISDB_CONNECTED_TRANSMISSION      = 0xdd,
+  GST_MTS_DESC_ISDB_CONTENT_AVAILABILITY        = 0xde,
+  /* ... */
+  GST_MTS_DESC_ISDB_SERVICE_GROUP               = 0xe0
+  
+} GstMpegTsISDBDescriptorType;
+
+typedef struct _GstMpegTsDescriptor GstMpegTsDescriptor;
+
+#define GST_TYPE_MPEGTS_DESCRIPTOR (gst_mpegts_descriptor_get_type())
+GType gst_mpegts_descriptor_get_type (void);
+
+/**
+ * GstMpegTsDescriptor:
+ * @descriptor_tag: the type of descriptor
+ * @descriptor_tag_extension: the extended type (if @descriptor_tag is 0x7f)
+ * @descriptor_length: the length of the descriptor content (excluding tag/length field)
+ * @descriptor_data: the full descriptor data (including tag, extension, length)
+ *
+ * Mpeg-TS descriptor (ISO/IEC 13818-1).
+ */
+struct _GstMpegTsDescriptor
+{
+  guint8 descriptor_tag;
+  guint8 descriptor_tag_extension;
+  guint8 descriptor_length;
+  const guint8 *descriptor_data;
+};
+
+GArray *gst_mpegts_parse_descriptors (guint8 * buffer, gsize buf_len);
+
+const GstMpegTsDescriptor * gst_mpegts_find_descriptor (GArray *descriptors,
+							guint8 tag);
+
+/* GST_MTS_DESC_ISO_639_LANGUAGE (0x0A) */
+/**
+ * GstMpegTsISO639AudioType:
+ *
+ * Type of audio streams
+ *
+ * Defined in ITU H.222.0 Table 2-60
+ */
+typedef enum {
+  GST_MPEGTS_AUDIO_TYPE_UNDEFINED = 0,
+  GST_MPEGTS_AUDIO_TYPE_CLEAN_EFFECTS,
+  GST_MPEGTS_AUDIO_TYPE_HEARING_IMPAIRED,
+  GST_MPEGTS_AUDIO_TYPE_VISUAL_IMPAIRED_COMMENTARY
+} GstMpegTsIso639AudioType;
+
+/* FIXME: Make two methods. One for getting the number of languages,
+ * and the other for getting the (allocated, null-terminated) language 
+ * and audio type */
+typedef struct _GstMpegTsISO639LanguageDescriptor GstMpegTsISO639LanguageDescriptor;
+struct _GstMpegTsISO639LanguageDescriptor
+{
+  guint                    nb_language;
+  gchar                    language[64][3];
+  GstMpegTsIso639AudioType audio_type[64];
+};
+
+gboolean gst_mpegts_descriptor_parse_iso_639_language (const GstMpegTsDescriptor *descriptor,
+						       GstMpegTsISO639LanguageDescriptor *res);
+
+
+
+/* GST_MTS_DESC_DTG_LOGICAL_CHANNEL (0x83) */
+typedef struct _GstMpegTsLogicalChannelDescriptor GstMpegTsLogicalChannelDescriptor;
+typedef struct _GstMpegTsLogicalChannel GstMpegTsLogicalChannel;
+
+struct _GstMpegTsLogicalChannel
+{
+  guint16   service_id;
+  gboolean  visible_service;
+  guint16   logical_channel_number;
+};
+
+struct _GstMpegTsLogicalChannelDescriptor
+{
+  guint                   nb_channels;
+  GstMpegTsLogicalChannel channels[64];
+};
+
+/* FIXME : Maybe make two methods. One for getting the number of channels,
+ * and the other for getting the content for one channel ? */
+gboolean
+gst_mpegts_descriptor_parse_logical_channel (const GstMpegTsDescriptor *descriptor,
+					     GstMpegTsLogicalChannelDescriptor *res);
+
+#endif				/* GST_MPEGTS_DESCRIPTOR_H */