Merge branch 'dev-0.10'

Author: rrcarlosrodriguez

configure.ac

@@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
 dnl initialize autoconf
 dnl releases only do -Wall, git and prerelease does -Werror too
 dnl use a three digit version number for releases, and four for git/pre
-AC_INIT([GStreamer Inference],[0.10.0.1],[https://github.com/RidgeRun/gst-inference/issues],[gst-inference])
+AC_INIT([GStreamer Inference],[0.10.1.1],[https://github.com/RidgeRun/gst-inference/issues],[gst-inference])
 
 AG_GST_INIT
 

gst-libs/gst/r2inference/gstvideoinference.c

@@ -907,7 +907,7 @@ gst_video_inference_process_model (GstVideoInference * self, GstBuffer * buffer,
     GST_ELEMENT_ERROR (self, STREAM, FAILED,
         ("Subclass didn't implement post-process"), (NULL));
     ret = GST_FLOW_ERROR;
-    goto buffer_free;
+    goto out;
   }
 
   buffer_model = gst_buffer_make_writable (buffer);
@@ -939,7 +939,7 @@ gst_video_inference_process_model (GstVideoInference * self, GstBuffer * buffer,
   if (!video_inference_prepare_postprocess (klass->inference_meta_info,
           buffer_model, info_model, meta_model)) {
     ret = GST_FLOW_ERROR;
-    goto prediction_free;
+    goto buffer_free;
   }
 
   /* Subclass Processing */
@@ -949,7 +949,7 @@ gst_video_inference_process_model (GstVideoInference * self, GstBuffer * buffer,
     GST_ELEMENT_ERROR (self, STREAM, FAILED, ("Subclass failed at preprocess"),
         (NULL));
     ret = GST_FLOW_ERROR;
-    goto prediction_free;
+    goto buffer_free;
   }
 
   /* Check if bypass pad was requested, if not, forward buffer */
@@ -976,13 +976,12 @@ gst_video_inference_process_model (GstVideoInference * self, GstBuffer * buffer,
   ret = gst_video_inference_forward_buffer (self, gst_buffer_ref (buffer_model),
       priv->src_model);
 
-prediction_free:
-  g_free (prediction_data);
-
 buffer_free:
   gst_buffer_unref (buffer_model);
 
 out:
+  g_free (prediction_data);
+
   return ret;
 }
 

meson.build

@@ -1,5 +1,5 @@
 project('GStreamer Inference', ['c', 'cpp'], default_options : ['cpp_std=c++11'],
-  version : '0.10.0.1',
+  version : '0.10.1.1',
   meson_version : '>= 0.50',)
 
 project_name = meson.project_name()