commit 58e75f806e2cffe6a06f75c584063ab97bbf1a17
author xuesong.jiang <xuesong.jiang@amlogic.com> Thu Jun 30 19:23:20 2022 +0800
committer xuesong.jiang <xuesong.jiang@amlogic.com> Thu Jun 30 19:24:39 2022 +0800
tree 2390a09853e273c4620aa86d0cad82d76c3d8411
parent 61d5500f99a36449ec356d23c4ef9f6a983cc524

gst-amlvideosink: CB1 fix preroll deadlock [1/1]

PD#SWPL-86037

Problem:
resume fail because preroll deadlock

Solution:
(detail info)

Verify:
(detail info)

Change-Id: I5bbd9b8a6d58117c671e3887a51d8e00095b50b2
Signed-off-by: xuesong.jiang <xuesong.jiang@amlogic.com>

src/gstamlvideosink.c

diff --git a/src/gstamlvideosink.c b/src/gstamlvideosink.c
index 6eef9ef..9e092b4 100644
--- a/src/gstamlvideosink.c
+++ b/src/gstamlvideosink.c
@@ -45,9 +45,9 @@
 #undef GST_OBJECT_LOCK
 #define GST_OBJECT_LOCK(obj)                                           \
     {                                                                  \
-        GST_DEBUG("dbg basesink ctxt lock | aml | %p | locking", obj); \
+        GST_DEBUG("dbg basesink ctxt lock | aml | locking | %p", obj); \
         g_mutex_lock(GST_OBJECT_GET_LOCK(obj));                        \
-        GST_DEBUG("dbg basesink ctxt lock | aml | %p | locked", obj);  \
+        GST_DEBUG("dbg basesink ctxt lock | aml | locked  | %p", obj);  \
     }
 #endif
 
@@ -55,9 +55,29 @@
 #undef GST_OBJECT_UNLOCK
 #define GST_OBJECT_UNLOCK(obj)                                          \
     {                                                                   \
-        GST_DEBUG("dbg basesink ctxt lock | aml |%p | unlocking", obj); \
+        GST_DEBUG("dbg basesink ctxt lock | aml | unlocking | %p", obj); \
         g_mutex_unlock(GST_OBJECT_GET_LOCK(obj));                       \
-        GST_DEBUG("dbg basesink ctxt lock | aml |%p | unlocked", obj);  \
+        GST_DEBUG("dbg basesink ctxt lock | aml | unlocked  | %p", obj);  \
+    }
+#endif
+
+#ifdef GST_BASE_SINK_PREROLL_LOCK
+#undef GST_BASE_SINK_PREROLL_LOCK
+#define GST_BASE_SINK_PREROLL_LOCK(obj)                                           \
+    {                                                                  \
+        GST_DEBUG("dbg basesink preroll lock | aml | locking | %p", obj); \
+        g_mutex_lock(GST_BASE_SINK_GET_PREROLL_LOCK(obj));                        \
+        GST_DEBUG("dbg basesink preroll lock | aml | locked  | %p", obj);  \
+    }
+#endif
+
+#ifdef GST_BASE_SINK_PREROLL_UNLOCK
+#undef GST_BASE_SINK_PREROLL_UNLOCK
+#define GST_BASE_SINK_PREROLL_UNLOCK(obj)                                          \
+    {                                                                   \
+        GST_DEBUG("dbg basesink preroll lock | aml | unlocking | %p", obj); \
+        g_mutex_unlock(GST_BASE_SINK_GET_PREROLL_LOCK(obj));                       \
+        GST_DEBUG("dbg basesink preroll lock | aml | unlocked  | %p", obj);  \
     }
 #endif
 
@@ -626,6 +646,19 @@
         }
         break;
     }
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+    {
+        if (gst_base_sink_is_async_enabled(GST_BASE_SINK(sink)))
+        {
+            GstBaseSink *basesink;
+            basesink = GST_BASE_SINK(sink);
+            GST_BASE_SINK_PREROLL_LOCK (basesink);
+            basesink->have_preroll = 1;
+            GST_BASE_SINK_PREROLL_UNLOCK (basesink);
+            GST_DEBUG_OBJECT(sink, "1 set have preroll to true");
+        }
+        break;
+    }
     default:
         break;
     }