subprojects/gst-devtools/validate/gst/validate/gst-validate-mockdecryptor.c

@@ -168,7 +168,6 @@ gst_mockdecryptor_transform_caps (GstBaseTransform * base,
         gst_caps_intersect_full (transformed_caps, filter,
         GST_CAPS_INTERSECT_FIRST);
     gst_caps_replace (&transformed_caps, intersection);
-    gst_caps_unref (intersection);
   }
 
   GST_DEBUG_OBJECT (base, "returning %" GST_PTR_FORMAT, transformed_caps);

subprojects/gst-devtools/validate/gst/validate/gst-validate-pipeline-monitor.c

@@ -488,7 +488,6 @@ _append_accept_caps_failure_details (GstValidatePadMonitor * monitor,
     }
   }
 
-  gst_caps_unref (refused_caps);
   gst_caps_unref (possible_caps);
   gst_object_unref (pad);
 

subprojects/gst-devtools/validate/gst/validate/gst-validate-report.c

@@ -699,6 +699,8 @@ gst_validate_report_init (void)
     gchar **wanted_files;
     wanted_files = g_strsplit (file_env, G_SEARCHPATH_SEPARATOR_S, 0);
 
+    /* FIXME: Make sure it is freed in the deinit function when that is
+     * implemented */
     log_files =
         g_malloc0 (sizeof (FILE *) * (g_strv_length (wanted_files) + 1));
     for (i = 0; i < g_strv_length (wanted_files); i++) {
@@ -743,16 +745,6 @@ gst_validate_report_deinit (void)
 
   g_clear_object (&socket_client);
   g_clear_object (&server_connection);
-
-  if (log_files) {
-    gint i;
-    for (i = 0; log_files[i]; i++) {
-      if (log_files[i] != stdout && log_files[i] != stderr)
-        fclose (log_files[i]);
-    }
-    g_free (log_files);
-    log_files = NULL;
-  }
 }
 
 /**

subprojects/gst-devtools/validate/gst/validate/gst-validate-reporter.c

@@ -90,7 +90,6 @@ gst_validate_reporter_get_priv (GstValidateReporter * reporter)
         g_direct_equal, NULL, (GDestroyNotify) gst_validate_report_unref);
 
     g_mutex_init (&priv->reports_lock);
-    g_weak_ref_init (&priv->runner, NULL);
     g_object_set_data_full (G_OBJECT (reporter), REPORTER_PRIVATE, priv,
         (GDestroyNotify) _free_priv);
   }

subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c

@@ -2207,7 +2207,6 @@ select_stream_data_free (SelectStreamData * d)
 {
   gst_validate_action_unref (d->action);
   g_list_free_full (d->wanted_streams, g_free);
-  g_rec_mutex_clear (&d->m);
 }
 
 static void
@@ -2312,7 +2311,7 @@ done:
   if (selected_streams && d->message_sid &&
       d->wanted_n_calls >= 1 && d->n_calls == d->wanted_n_calls) {
     /* Consider action done once we get the STREAM_SELECTED signal */
-    gst_validate_action_set_done (d->action);
+    gst_validate_action_set_done (gst_validate_action_ref (d->action));
     gst_bus_disable_sync_message_emission (bus);
     g_signal_handler_disconnect (bus, d->message_sid);
     d->message_sid = 0;
@@ -2348,7 +2347,7 @@ stream_selection_scenario_stopping_cb (GstValidateScenario * scenario,
         d->wanted_n_calls, d->n_calls);
   }
 
-  gst_validate_action_set_done (d->action);
+  gst_validate_action_set_done (gst_validate_action_ref (d->action));
 
   if (bus && d->message_sid) {
     gst_bus_disable_sync_message_emission (bus);
@@ -2912,8 +2911,6 @@ _execute_on_sub_scenario (GstValidateScenario * scenario,
           data->subaction_done_sigid);
       data->subaction_done_sigid = 0;
     }
-
-    gst_validate_action_set_done (subaction);
   }
   g_mutex_unlock (&data->sigid_lock);
   validate_action_foreign_scenario_data_unref (data);
@@ -4390,7 +4387,6 @@ _execute_appsrc_push (GstValidateScenario * scenario,
 
     g_signal_emit_by_name (appsink, "pull-sample", &sample, NULL);
 
-    g_strfreev (pipeline_elements);
     goto push_sample;
   }
 
@@ -5294,7 +5290,6 @@ handle_bus_message (MessageData * d)
       g_list_free_full (priv->seeks,
           (GDestroyNotify) gst_validate_seek_information_free);
       priv->seeks = NULL;
-      priv->current_seek = NULL;
       SCENARIO_UNLOCK (scenario);
 
       GST_DEBUG_OBJECT (scenario, "Got EOS; generate 'stop' action");
@@ -5963,7 +5958,6 @@ gst_validate_scenario_dispose (GObject * object)
   }
 
   gst_object_replace ((GstObject **) & priv->clock, NULL);
-  gst_object_unref (runner);
 
   G_OBJECT_CLASS (gst_validate_scenario_parent_class)->dispose (object);
 }
@@ -7604,7 +7598,6 @@ _execute_start_http_server (GstValidateScenario * scenario,
       err->message);
   REPORT_UNLESS (sscanf (line, "PORT: %d", &port) == 1, done,
       "Failed to parse port number from server output: %s", line);
-  g_free (line);
 
   server.port = port;
   server.subprocess = subprocess;

subprojects/gst-devtools/validate/gst/validate/validate.c

@@ -518,8 +518,7 @@ gst_validate_deinit (void)
   g_list_free (core_config);
   core_config = NULL;
 
-  g_list_free_full (g_steal_pointer (&all_configs),
+  g_list_free_full (all_configs, (GDestroyNotify) gst_structure_free);
-      (GDestroyNotify) gst_structure_free);
   gst_validate_deinit_runner ();
 
   gst_validate_scenario_deinit ();

subprojects/gst-devtools/validate/launcher/baseclasses.py

@@ -651,6 +651,9 @@ class Test(Loggable):
         return command
 
     def use_valgrind(self, command, subenv):
+        vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind'
+        self.extra_logfiles.add(vglogsfile)
+
         vg_args = []
 
         for o, v in [('trace-children', 'yes'),
@@ -672,7 +675,7 @@ class Test(Loggable):
         if not self.options.redirect_logs:
             vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind'
             self.extra_logfiles.add(vglogsfile)
-            vg_args.append("--%s=%s" % ('log-file', vglogsfile.replace("%", "%%")))
+            vg_args.append("--%s=%s" % ('log-file', vglogsfile))
 
         for supp in self.get_valgrind_suppressions():
             vg_args.append("--suppressions=%s" % supp)

subprojects/gst-devtools/validate/plugins/ssim/gstvalidatessim.c

@@ -481,7 +481,6 @@ _set_videoconvert (ValidateSsimOverride * o,
   caps = gst_pad_get_current_caps (pad);
   gst_object_unref (pad);
   gst_caps_replace (&priv->last_caps, caps);
-  gst_caps_unref (caps);
 
   gst_video_info_init (&priv->in_info);
   gst_video_info_init (&priv->out_info);

subprojects/gst-devtools/validate/tests/check/validate/monitoring.c

@@ -86,8 +86,6 @@ GST_START_TEST (monitors_cleanup)
       g_object_get_data ((GObject *) sink->sinkpads->data, "validate-monitor");
   gst_check_objects_destroyed_on_unref (monitor, pmonitor1, pmonitor2, NULL);
   gst_check_objects_destroyed_on_unref (pipeline, src, sink, NULL);
-
-  gst_object_unref (runner);
 }
 
 GST_END_TEST;

subprojects/gst-devtools/validate/tests/check/validate/padmonitor.c

@@ -154,7 +154,6 @@ GST_START_TEST (buffer_before_segment)
   _check_reports_refcount (srcpad, 2);
   gst_object_unref (srcpad);
   gst_check_object_destroyed_on_unref (sink);
-  gst_object_unref (monitor);
   ASSERT_OBJECT_REFCOUNT (runner, "runner", 2);
   gst_object_unref (runner);
 }
@@ -222,15 +221,11 @@ GST_START_TEST (buffer_outside_segment)
     buffer = gst_discont_buffer_new ();
     GST_BUFFER_PTS (buffer) = 10 * GST_SECOND;
     GST_BUFFER_DURATION (buffer) = GST_SECOND;
-    pad = gst_element_get_static_pad (identity, "sink");
+    fail_if (GST_PAD_IS_FLUSHING (gst_element_get_static_pad (identity,
-    fail_if (GST_PAD_IS_FLUSHING (pad));
+                "sink")));
-    gst_clear_object (&pad);
+    fail_if (GST_PAD_IS_FLUSHING (gst_element_get_static_pad (identity,
-    pad = gst_element_get_static_pad (identity, "src");
+                "src")));
-    fail_if (GST_PAD_IS_FLUSHING (pad));
+    fail_if (GST_PAD_IS_FLUSHING (gst_element_get_static_pad (sink, "sink")));
-    gst_clear_object (&pad);
-    pad = gst_element_get_static_pad (sink, "sink");
-    fail_if (GST_PAD_IS_FLUSHING (pad));
-    gst_clear_object (&pad);
     fail_unless_equals_int (gst_pad_push (srcpad, buffer), GST_FLOW_OK);
 
     reports = gst_validate_runner_get_reports (runner);

subprojects/gst-devtools/validate/tests/check/validate/reporting.c

@@ -206,10 +206,6 @@ _create_issues (GstValidateRunner * runner)
   gst_object_unref (sinkpad);
   gst_object_unref (funnel_sink1);
   gst_object_unref (funnel_sink2);
-  free_element_monitor (fakemixer);
-  free_element_monitor (sink);
-  free_element_monitor (src2);
-  free_element_monitor (src1);
   gst_check_objects_destroyed_on_unref (fakemixer, funnel_sink1, funnel_sink2,
       NULL);
   gst_check_objects_destroyed_on_unref (src1, srcpad1, NULL);

subprojects/gst-devtools/validate/tests/check/validate/scenario.c

@@ -37,9 +37,6 @@ GST_START_TEST (test_expression_parser)
   fail_unless_equals_uint64 (start, 50 * GST_SECOND);
   gst_validate_action_unref (action);
 
-  gst_mini_object_unref (GST_MINI_OBJECT (seek_type));
-  gst_mini_object_unref (GST_MINI_OBJECT (set_vars));
-  gst_object_unref (scenario);
   gst_object_unref (runner);
 }
 

subprojects/gst-integration-testsuites/testsuites/validate/dash/retry_backoff_time.validatetest

@@ -8,7 +8,7 @@ meta,
     expected-issues = {
         # First attempt to play while the mpd is not available
         "expected-issue, issue-id=\"runtime::error-on-bus\", details=\".*Service Unavailable.*\"",
-        "expected-issue, issue-id=\"runtime::error-on-bus\", details=\".*Got error: Internal data stream error.*\", sometimes=true",
+        "expected-issue, issue-id=\"runtime::error-on-bus\", details=\".*Got error: Internal data stream error.*\"",
         "expected-issue, issue-id=\"scenario::execution-error\", details=\".*Error message happened while executing action.*\"",
         # Spurious error that happens racily when tearing down the pipeline
         "expected-issue, issue-id=\"runtime::error-on-bus\", details=\".*Stream doesn't contain enough.*\", sometimes=true",

subprojects/gst-plugins-bad/gst-libs/gst/webrtc/rtpsender.c

@@ -90,7 +90,7 @@ gst_webrtc_rtp_sender_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_PRIORITY:
-      gst_webrtc_rtp_sender_set_priority (sender, g_value_get_enum (value));
+      gst_webrtc_rtp_sender_set_priority (sender, g_value_get_uint (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -107,7 +107,7 @@ gst_webrtc_rtp_sender_get_property (GObject * object, guint prop_id,
   switch (prop_id) {
     case PROP_PRIORITY:
       GST_OBJECT_LOCK (sender);
-      g_value_set_enum (value, sender->priority);
+      g_value_set_uint (value, sender->priority);
       GST_OBJECT_UNLOCK (sender);
       break;
     case PROP_TRANSPORT:

subprojects/gst-plugins-base/ext/pango/gstbasetextoverlay.c

@@ -2163,16 +2163,14 @@ gst_base_text_overlay_shade_xRGB (GstBaseTextOverlay * overlay,
 {
   gint i, j;
   guint8 *dest_ptr;
-  guint stride;
 
-  dest_ptr = GST_VIDEO_FRAME_PLANE_DATA (dest, 0);
+  dest_ptr = dest->data[0];
-  stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest, 0);
 
   for (i = y0; i < y1; i++) {
     for (j = x0; j < x1; j++) {
       gint y, y_pos, k;
 
-      y_pos = (i * stride) + j * 4;
+      y_pos = (i * 4 * overlay->width) + j * 4;
       for (k = 0; k < 4; k++) {
         y = dest_ptr[y_pos + k] - overlay->shading_value;
         dest_ptr[y_pos + k] = CLAMP (y, 0, 255);
@@ -2242,15 +2240,13 @@ gint x0, gint x1, gint y0, gint y1) \
 { \
   gint i, j;\
   guint8 *dest_ptr;\
-  guint stride;\
   \
-  dest_ptr = GST_VIDEO_FRAME_PLANE_DATA (dest, 0);\
+  dest_ptr = dest->data[0];\
-  stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest, 0);\
   \
   for (i = y0; i < y1; i++) {\
     for (j = x0; j < x1; j++) {\
       gint y, y_pos, k;\
-      y_pos = (i * stride) + j * 4;\
+      y_pos = (i * 4 * overlay->width) + j * 4;\
       for (k = OFFSET; k < 3+OFFSET; k++) {\
         y = dest_ptr[y_pos + k] - overlay->shading_value;\
         dest_ptr[y_pos + k] = CLAMP (y, 0, 255);\

subprojects/gst-plugins-base/gst-libs/gst/riff/riff-media.c

@@ -1342,9 +1342,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
          * so either we calculate the bitrate or mark it as invalid as this
          * would probably confuse timing */
         strf->av_bps = 0;
-        if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0 &&
+        if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0) {
-            (strf->blockalign / strf->channels) >= 7) {
+          int spb = ((strf->blockalign - strf->channels * 7) / 2) * 2;
-          int spb = ((strf->blockalign / strf->channels) - 7) * 2 + 2;
           strf->av_bps =
               gst_util_uint64_scale_int (strf->rate, strf->blockalign, spb);
           GST_DEBUG ("fixing av_bps to calculated value %d of MS ADPCM",
@@ -1465,9 +1464,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
          * header, so either we calculate the bitrate or mark it as invalid
          * as this would probably confuse timing */
         strf->av_bps = 0;
-        if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0 &&
+        if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0) {
-            (strf->blockalign / strf->channels) >= 4) {
+          int spb = ((strf->blockalign - strf->channels * 4) / 2) * 2;
-          int spb = ((strf->blockalign / strf->channels) - 4) * 2 + 1;
           strf->av_bps =
               gst_util_uint64_scale_int (strf->rate, strf->blockalign, spb);
           GST_DEBUG ("fixing av_bps to calculated value %d of IMA DVI ADPCM",

subprojects/gst-plugins-good/ext/qt/qtitem.cc

@@ -207,16 +207,6 @@ QtGLVideoItem::getForceAspectRatio()
   return this->priv->force_aspect_ratio;
 }
 
-void
-QtGLVideoItem::setAcceptEvents(bool accept)
-{
-  if (accept == acceptEvents)
-    return;
-
-  acceptEvents = accept;
-  Q_EMIT acceptEventsChanged(acceptEvents);
-}
-
 bool
 QtGLVideoItem::itemInitialized()
 {
@@ -505,21 +495,18 @@ QtGLVideoItem::wheelEvent(QWheelEvent * event)
     g_object_unref (element);
   }
   g_mutex_unlock (&this->priv->lock);
-  event->setAccepted(acceptEvents);
 }
 
 void
-QtGLVideoItem::hoverEnterEvent(QHoverEvent *event)
+QtGLVideoItem::hoverEnterEvent(QHoverEvent *)
 {
   mouseHovering = true;
-  event->setAccepted(acceptEvents);
 }
 
 void
-QtGLVideoItem::hoverLeaveEvent(QHoverEvent *event)
+QtGLVideoItem::hoverLeaveEvent(QHoverEvent *)
 {
   mouseHovering = false;
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -548,7 +535,6 @@ QtGLVideoItem::hoverMoveEvent(QHoverEvent * event)
     }
   }
   g_mutex_unlock (&this->priv->lock);
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -611,7 +597,6 @@ QtGLVideoItem::touchEvent(QTouchEvent * event)
 
   g_object_unref (element);
   g_mutex_unlock (&this->priv->lock);
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -664,14 +649,12 @@ QtGLVideoItem::mousePressEvent(QMouseEvent * event)
 {
   forceActiveFocus();
   sendMouseEvent(event, TRUE);
-  event->setAccepted(acceptEvents);
 }
 
 void
 QtGLVideoItem::mouseReleaseEvent(QMouseEvent * event)
 {
   sendMouseEvent(event, FALSE);
-  event->setAccepted(acceptEvents);
 }
 
 void

subprojects/gst-plugins-good/ext/qt/qtitem.h

@@ -71,10 +71,6 @@ class QtGLVideoItem : public QQuickItem, protected QOpenGLFunctions
                READ getForceAspectRatio
                WRITE setForceAspectRatio
                NOTIFY forceAspectRatioChanged)
-    Q_PROPERTY(bool acceptEvents
-               READ getAcceptEvents
-               WRITE setAcceptEvents
-               NOTIFY acceptEventsChanged)
 
 public:
     QtGLVideoItem();
@@ -86,9 +82,6 @@ public:
     bool getForceAspectRatio();
     bool itemInitialized();
 
-    bool getAcceptEvents() const { return acceptEvents; }
-    void setAcceptEvents(bool accept);
-
     QSharedPointer<QtGLVideoItemInterface> getInterface() { return proxy; };
     /* private for C interface ... */
     QtGLVideoItemPrivate *priv;
@@ -96,7 +89,6 @@ public:
 Q_SIGNALS:
     void itemInitializedChanged();
     void forceAspectRatioChanged(bool);
-    void acceptEventsChanged(bool acceptEvents);
 
 private Q_SLOTS:
     void handleWindowChanged(QQuickWindow * win);
@@ -125,7 +117,6 @@ private:
 
     quint32 mousePressedButton;
     bool mouseHovering;
-    bool acceptEvents = true;
 
     QSharedPointer<QtGLVideoItemInterface> proxy;
 };

subprojects/gst-plugins-good/ext/qt6/qt6glitem.cc

@@ -193,16 +193,6 @@ Qt6GLVideoItem::setForceAspectRatio(bool force_aspect_ratio)
   emit forceAspectRatioChanged(force_aspect_ratio);
 }
 
-void
-Qt6GLVideoItem::setAcceptEvents(bool accept)
-{
-  if (accept == acceptEvents)
-    return;
-
-  acceptEvents = accept;
-  Q_EMIT acceptEventsChanged(acceptEvents);
-}
-
 bool
 Qt6GLVideoItem::getForceAspectRatio()
 {
@@ -497,22 +487,18 @@ Qt6GLVideoItem::wheelEvent(QWheelEvent * event)
     g_object_unref (element);
   }
   g_mutex_unlock (&this->priv->lock);
-
-  event->setAccepted(acceptEvents);
 }
 
 void
-Qt6GLVideoItem::hoverEnterEvent(QHoverEvent *event)
+Qt6GLVideoItem::hoverEnterEvent(QHoverEvent *)
 {
   mouseHovering = true;
-  event->setAccepted(acceptEvents);
 }
 
 void
-Qt6GLVideoItem::hoverLeaveEvent(QHoverEvent *event)
+Qt6GLVideoItem::hoverLeaveEvent(QHoverEvent *)
 {
   mouseHovering = false;
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -541,7 +527,6 @@ Qt6GLVideoItem::hoverMoveEvent(QHoverEvent * event)
     }
   }
   g_mutex_unlock (&this->priv->lock);
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -604,7 +589,6 @@ Qt6GLVideoItem::touchEvent(QTouchEvent * event)
 
   g_object_unref (element);
   g_mutex_unlock (&this->priv->lock);
-  event->setAccepted(acceptEvents);
 }
 
 void
@@ -657,14 +641,12 @@ Qt6GLVideoItem::mousePressEvent(QMouseEvent * event)
 {
   forceActiveFocus();
   sendMouseEvent(event, TRUE);
-  event->setAccepted(acceptEvents);
 }
 
 void
 Qt6GLVideoItem::mouseReleaseEvent(QMouseEvent * event)
 {
   sendMouseEvent(event, FALSE);
-  event->setAccepted(acceptEvents);
 }
 
 void

subprojects/gst-plugins-good/ext/qt6/qt6glitem.h

@@ -73,10 +73,7 @@ class Qt6GLVideoItem : public QQuickItem, protected QOpenGLFunctions
                READ getForceAspectRatio
                WRITE setForceAspectRatio
                NOTIFY forceAspectRatioChanged)
-    Q_PROPERTY(bool acceptEvents
+
-               READ getAcceptEvents
-               WRITE setAcceptEvents
-               NOTIFY acceptEventsChanged)
 public:
     Qt6GLVideoItem();
     ~Qt6GLVideoItem();
@@ -86,8 +83,6 @@ public:
     void setForceAspectRatio(bool);
     bool getForceAspectRatio();
     bool itemInitialized();
-    bool getAcceptEvents() const { return acceptEvents; }
-    void setAcceptEvents(bool accept);
 
     QSharedPointer<Qt6GLVideoItemInterface> getInterface() { return proxy; };
     /* private for C interface ... */
@@ -96,7 +91,6 @@ public:
 Q_SIGNALS:
     void itemInitializedChanged();
     void forceAspectRatioChanged(bool);
-    void acceptEventsChanged(bool acceptEvents);
 
 private Q_SLOTS:
     void handleWindowChanged(QQuickWindow * win);
@@ -126,7 +120,6 @@ private:
 
     quint32 mousePressedButton;
     bool mouseHovering;
-    bool acceptEvents = true;
 
     QSharedPointer<Qt6GLVideoItemInterface> proxy;
 };

subprojects/gst-rtsp-server/tests/check/gst/onvif.c

@@ -207,7 +207,6 @@ test_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
     onvif_event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, s);
 
     gst_element_send_event (GST_ELEMENT (src), onvif_event);
-    gst_object_unref (clock);
   }
 
   if (src->segment->rate < 1.0) {

subprojects/gst-rtsp-server/tests/check/gst/rtspserver.c

@@ -2403,8 +2403,6 @@ GST_START_TEST (test_record_tcp)
   g_free (session);
   /* release the reference to server_sink, obtained in media_constructed_cb */
   gst_object_unref (server_sink);
-
-  gst_rtsp_thread_pool_cleanup ();
 }
 
 GST_END_TEST;

subprojects/gst-rtsp-server/tests/test-reuse.c

@@ -64,9 +64,6 @@ main (int argc, char *argv[])
   /* create a server instance */
   server = gst_rtsp_server_new ();
 
-  /* set port to any */
-  gst_rtsp_server_set_service (server, "0");
-
   /* attach the server to the default maincontext */
   if ((id = gst_rtsp_server_attach (server, NULL)) == 0)
     goto failed;
@@ -87,9 +84,6 @@ main (int argc, char *argv[])
   /* ERRORS */
 failed:
   {
-    g_object_unref (server);
-    g_main_loop_unref (loop);
-
     g_print ("failed to attach the server\n");
     return -1;
   }