Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo

2 files changed, 55 insertions, 3 deletions

diff --git a/gst/mpegdemux/gstmpegdesc.h b/gst/mpegdemux/gstmpegdesc.h
index 84b40009..71b74aa2 100644
--- a/gst/mpegdemux/gstmpegdesc.h
+++ b/gst/mpegdemux/gstmpegdesc.h
@@ -78,6 +78,7 @@
 #define DESC_DIRAC_TC_PRIVATE			0xAC
 
 /* DVB tags */
+#define DESC_DVB_CAROUSEL_IDENTIFIER	0x13
 #define DESC_DVB_NETWORK_NAME   0x40
 #define DESC_DVB_SERVICE_LIST   0x41
 #define DESC_DVB_STUFFING       0x42
@@ -302,6 +303,22 @@
 #define DESC_DVB_CABLE_DELIVERY_SYSTEM_symbol_rate(desc)	(desc + 9)
 #define DESC_DVB_CABLE_DELIVERY_SYSTEM_fec_inner(desc)		(desc[12] & 0x0F)
 
+/* DVB Data Broadcast Descriptor */
+#define DESC_DVB_DATA_BROADCAST_data_broadcast_id(desc)		(GST_READ_UINT16_BE((desc) + 2))
+#define DESC_DVB_DATA_BROADCAST_component_tag(desc)		(desc[4])
+#define DESC_DVB_DATA_BROADCAST_selector_length(desc)		(desc[5])
+#define DESC_DVB_DATA_BROADCAST_selector(desc)			(desc + 6)
+#define DESC_DVB_DATA_BROADCAST_iso639_language_code(desc)	(desc + 6 + DESC_DVB_DATA_BROADCAST_selector_length(desc))
+#define DESC_DVB_DATA_BROADCAST_text_length(desc)		(desc + 9 + DESC_DVB_DATA_BROADCAST_selector_length(desc))
+#define DESC_DVB_DATA_BROADCAST_text(desc)			(desc + 10 + DESC_DVB_DATA_BROADCAST_selector_length(desc))
+
+/* DVB Data Broadcast Id Descriptor */
+#define DESC_DVB_DATA_BROADCAST_ID_data_broadcast_id(desc)	(GST_READ_UINT16_BE((desc) + 2))
+#define DESC_DVB_DATA_BROADCAST_ID_id_selector_byte(desc)	(desc + 4)
+
+/* DVB Carousel Identifier Descriptor */
+#define DESC_DVB_CAROUSEL_IDENTIFIER_carousel_id(desc)		(GST_READ_UINT32_BE((desc) + 2))
+
 typedef struct {
   guint    n_desc;
   guint8   data_length;
diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index c9fc325f..5ed71f0c 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -507,10 +507,48 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer * packetizer,
       GstMPEGDescriptor *desc =
           gst_mpeg_descriptor_parse (data, stream_info_length);
       if (desc != NULL) {
+        guint8 *desc_data;
         if (gst_mpeg_descriptor_find (desc, DESC_DVB_AC3)) {
           gst_structure_set (stream_info, "has-ac3", G_TYPE_BOOLEAN, TRUE,
               NULL);
         }
+        desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_DATA_BROADCAST_ID);
+        if (desc_data) {
+          guint16 data_broadcast_id;
+          data_broadcast_id =
+              DESC_DVB_DATA_BROADCAST_ID_data_broadcast_id (desc_data);
+          gst_structure_set (stream_info, "data-broadcast-id", G_TYPE_UINT,
+              data_broadcast_id, NULL);
+        }
+        desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_DATA_BROADCAST);
+        if (desc_data) {
+          GstStructure *databroadcast_info;
+          guint16 data_broadcast_id;
+          guint8 component_tag;
+          data_broadcast_id =
+              DESC_DVB_DATA_BROADCAST_data_broadcast_id (desc_data);
+          component_tag = DESC_DVB_DATA_BROADCAST_component_tag (desc_data);
+          databroadcast_info = gst_structure_new ("data-broadcast", "id",
+              G_TYPE_UINT, data_broadcast_id, "component-tag", component_tag,
+              NULL);
+          gst_structure_set (stream_info, "data-broadcast", GST_TYPE_STRUCTURE,
+              databroadcast_info, NULL);
+        }
+        desc_data =
+            gst_mpeg_descriptor_find (desc, DESC_DVB_CAROUSEL_IDENTIFIER);
+        if (desc_data) {
+          guint32 carousel_id;
+          carousel_id = DESC_DVB_CAROUSEL_IDENTIFIER_carousel_id (desc_data);
+          gst_structure_set (stream_info, "carousel-id", G_TYPE_UINT,
+              carousel_id, NULL);
+        }
+        desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_STREAM_IDENTIFIER);
+        if (desc_data) {
+          guint8 component_tag;
+          component_tag = DESC_DVB_STREAM_IDENTIFIER_component_tag (desc_data);
+          gst_structure_set (stream_info, "component-tag", G_TYPE_UINT,
+              component_tag, NULL);
+        }
         gst_mpeg_descriptor_free (desc);
       }
 
@@ -1874,9 +1912,6 @@ mpegts_packetizer_remove_stream (MpegTSPacketizer * packetizer, gint16 pid)
     GST_INFO ("Removing stream for PID %d", pid);
 
     g_hash_table_remove (packetizer->streams, GINT_TO_POINTER ((gint) pid));
-
-    g_object_unref (stream->section_adapter);
-    g_free (stream);
   }
 }