Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / subparse / gstsubparse.c

diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index b05806c..c910cb2 100644 (file)
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -81,7 +81,7 @@ static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
 
 
 static gboolean gst_sub_parse_src_event (GstPad * pad, GstEvent * event);
-static gboolean gst_sub_parse_src_query (GstPad * pad, GstQuery ** query);
+static gboolean gst_sub_parse_src_query (GstPad * pad, GstQuery * query);
 static gboolean gst_sub_parse_sink_event (GstPad * pad, GstEvent * event);
 
 static GstStateChangeReturn gst_sub_parse_change_state (GstElement * element,
@@ -209,25 +209,25 @@ gst_sub_parse_init (GstSubParse * subparse)
  */
 
 static gboolean
-gst_sub_parse_src_query (GstPad * pad, GstQuery ** query)
+gst_sub_parse_src_query (GstPad * pad, GstQuery * query)
 {
   GstSubParse *self = GST_SUBPARSE (gst_pad_get_parent (pad));
   gboolean ret = FALSE;
 
-  GST_DEBUG ("Handling %s query", GST_QUERY_TYPE_NAME (*query));
+  GST_DEBUG ("Handling %s query", GST_QUERY_TYPE_NAME (query));
 
-  switch (GST_QUERY_TYPE (*query)) {
+  switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_POSITION:{
       GstFormat fmt;
 
-      gst_query_parse_position (*query, &fmt, NULL);
+      gst_query_parse_position (query, &fmt, NULL);
       if (fmt != GST_FORMAT_TIME) {
         ret = gst_pad_peer_query (self->sinkpad, query);
       } else {
         ret = TRUE;
-        gst_query_set_position (*query, GST_FORMAT_TIME,
-            self->segment.position);
+        gst_query_set_position (query, GST_FORMAT_TIME, self->segment.position);
       }
+      break;
     }
     case GST_QUERY_SEEKING:
     {
@@ -236,18 +236,17 @@ gst_sub_parse_src_query (GstPad * pad, GstQuery ** query)
 
       ret = TRUE;
 
-      gst_query_parse_seeking (*query, &fmt, NULL, NULL, NULL);
+      gst_query_parse_seeking (query, &fmt, NULL, NULL, NULL);
       if (fmt == GST_FORMAT_TIME) {
         GstQuery *peerquery = gst_query_new_seeking (GST_FORMAT_BYTES);
 
-        seekable = gst_pad_peer_query (self->sinkpad, &peerquery);
+        seekable = gst_pad_peer_query (self->sinkpad, peerquery);
         if (seekable)
           gst_query_parse_seeking (peerquery, NULL, &seekable, NULL, NULL);
         gst_query_unref (peerquery);
       }
 
-      gst_query_set_seeking (*query, fmt, seekable, seekable ? 0 : -1, -1);
-
+      gst_query_set_seeking (query, fmt, seekable, seekable ? 0 : -1, -1);
       break;
     }
     default:
@@ -1204,7 +1203,8 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
   switch (regtype) {
     case GST_SUB_PARSE_REGEX_MDVDSUB:
       result =
-          (gpointer) g_regex_new ("^\\{[0-9]+\\}\\{[0-9]+\\}", 0, 0, &gerr);
+          (gpointer) g_regex_new ("^\\{[0-9]+\\}\\{[0-9]+\\}",
+          G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &gerr);
       if (result == NULL) {
         g_warning ("Compilation of mdvd regex failed: %s", gerr->message);
         g_error_free (gerr);
@@ -1214,7 +1214,7 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
       result = (gpointer) g_regex_new ("^([ 0-9]){0,3}[0-9]\\s*(\x0d)?\x0a"
           "[ 0-9][0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]"
           " +--> +([ 0-9])?[0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]",
-          0, 0, &gerr);
+          G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &gerr);
       if (result == NULL) {
         g_warning ("Compilation of subrip regex failed: %s", gerr->message);
         g_error_free (gerr);
@@ -1222,7 +1222,7 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
       break;
     case GST_SUB_PARSE_REGEX_DKS:
       result = (gpointer) g_regex_new ("^\\[[0-9]+:[0-9]+:[0-9]+\\].*",
-          0, 0, &gerr);
+          G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &gerr);
       if (result == NULL) {
         g_warning ("Compilation of dks regex failed: %s", gerr->message);
         g_error_free (gerr);
@@ -1416,8 +1416,8 @@ feed_textbuf (GstSubParse * self, GstBuffer * buf)
   gst_adapter_push (self->adapter, buf);
 
   avail = gst_adapter_available (self->adapter);
-  data = gst_adapter_map (self->adapter, avail),
-      input = convert_encoding (self, (const gchar *) data, avail, &consumed);
+  data = gst_adapter_map (self->adapter, avail);
+  input = convert_encoding (self, (const gchar *) data, avail, &consumed);
 
   if (input && consumed > 0) {
     self->textbuf = g_string_append (self->textbuf, input);
@@ -1581,7 +1581,7 @@ gst_sub_parse_sink_event (GstPad * pad, GstEvent * event)
     }
     case GST_EVENT_SEGMENT:
     {
-      gst_event_parse_segment (event, &self->segment);
+      gst_event_copy_segment (event, &self->segment);
       GST_DEBUG_OBJECT (self, "newsegment (%s)",
           gst_format_get_name (self->segment.format));
 
@@ -1742,12 +1742,7 @@ gst_subparse_type_find (GstTypeFind * tf, gpointer private)
       }
     }
     converted_str = gst_convert_to_utf8 (str, 128, enc, &tmp, &err);
-    if (converted_str == NULL) {
-      GST_DEBUG ("Charset conversion failed: %s", err->message);
-      g_error_free (err);
-      g_free (str);
-      return;
-    } else {
+    if (converted_str != NULL) {
       g_free (str);
       str = converted_str;
     }