commit 91391f5230131598a74dc2e1fc30f1590da9763f
author xuesong.jiang <xuesong.jiang@amlogic.com> Fri Nov 19 15:42:30 2021 +0800
committer xuesong.jiang <xuesong.jiang@amlogic.com> Fri Nov 19 15:42:30 2021 +0800
tree 1c6f140f5154d13b0cebc545096916a2513fdaef
parent 32d7828ad93b89ec0613986977bf5248ed933d7b

fix deadlock

Change-Id: Ifd4e31fce9d45f1b16e7fbc36c16f05f76802f39

src/gstamlvideosink.c

diff --git a/src/gstamlvideosink.c b/src/gstamlvideosink.c
index 26f49a0..174e54f 100644
--- a/src/gstamlvideosink.c
+++ b/src/gstamlvideosink.c
@@ -15,6 +15,26 @@
 // #endif
 // #endif
 
+#ifdef GST_OBJECT_LOCK
+#undef GST_OBJECT_LOCK
+#define GST_OBJECT_LOCK(obj) \
+{ \
+  GST_DEBUG("dbg basesink ctxt lock | aml | %p | locking", obj); \
+  g_mutex_lock(GST_OBJECT_GET_LOCK(obj)); \
+  GST_DEBUG("dbg basesink ctxt lock | aml | %p | locked", obj); \
+} 
+#endif
+
+#ifdef GST_OBJECT_UNLOCK
+#undef GST_OBJECT_UNLOCK
+#define GST_OBJECT_UNLOCK(obj) \
+{ \
+  GST_DEBUG("dbg basesink ctxt lock | aml |%p | unlocking", obj); \
+  g_mutex_unlock(GST_OBJECT_GET_LOCK(obj)); \
+  GST_DEBUG("dbg basesink ctxt lock | aml |%p | unlocked", obj); \
+} 
+#endif
+
 /* signals */
 enum
 {
@@ -347,6 +367,7 @@
     GstAmlVideoSink *sink = GST_AML_VIDEO_SINK(bsink);
     GstAmlVideoSinkPrivate *sink_priv = GST_AML_VIDEO_SINK_GET_PRIVATE(sink);
     gboolean use_dmabuf;
+    gboolean ret = TRUE;
 
     GST_OBJECT_LOCK(sink);
 
@@ -354,21 +375,24 @@
     use_dmabuf = gst_caps_features_contains(gst_caps_get_features(caps, 0), GST_CAPS_FEATURE_MEMORY_DMABUF);
     if (use_dmabuf == FALSE)
     {
-        GST_DEBUG_OBJECT(sink, "not support non dma buffer case");
-        return FALSE;
+        GST_ERROR_OBJECT(sink, "not support non dma buffer case");
+        ret = FALSE;
+        goto done;
     }
 
     /* extract info from caps */
     if (!gst_video_info_from_caps(&sink_priv->video_info, caps))
     {
         GST_ERROR_OBJECT(sink, "can't get video info from caps");
-        return FALSE;
+        ret = FALSE;
+        goto done;
     }
 
     sink_priv->video_info_changed = TRUE;
 
+done:
     GST_OBJECT_UNLOCK(sink);
-    return TRUE;
+    return ret;
 }
 
 static GstFlowReturn gst_aml_video_sink_show_frame(GstVideoSink *vsink, GstBuffer *buffer)

src/render_lib.h

diff --git a/src/render_lib.h b/src/render_lib.h
index 820ac22..888dba3 100755
--- a/src/render_lib.h
+++ b/src/render_lib.h
@@ -257,20 +257,19 @@
 int render_display_frame(void *handle, RenderBuffer *buffer);
 
 /**
- * set property to render device,user must alloc a prop struct buffer of
- * the property
+ * set value to render device
  * @param handle a handle of render device that was opened
- * @param property a property of render device
- * @param prop property struct buffer of property
+ * @param key a key of render device
+ * @param value the value of key
  * @return 0 sucess,-1 fail
  */
 int render_set(void *handle, int key, void *value);
 
 /**
- * get property from render device
+ * get value from render device
  * @param handle a handle of render device that was opened
- * @param property a property of render device
- * @param prop property struct buffer of property
+ * @param key a key of render device
+ * @param value the value of key
  * @return 0 sucess,-1 fail
  */
 int render_get(void *handle, int key, void *value);