Fixed a couple issue

1. Fixed racing condition issue with subpicture enable. 2. Fixed compositefitler memory leak in composite.InputStream. 3. Fixed full color memory allocation only available on RGB4/ Signed-off-by: Lim Siew Hoon <[email protected]>
intel · Sep 17, 2019 · 1be01b2 · 1be01b2
1 parent a4fce96
commit 1be01b2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/gst-libs/mfx/gstmfxcompositefilter.c b/gst-libs/mfx/gstmfxcompositefilter.c
@@ -53,7 +53,9 @@ static void
 gst_mfx_composite_filter_finalize (GstMfxCompositeFilter * filter)
 {
   /* Free allocated memory for filters */
-  g_slice_free1 ((sizeof (mfxExtBuffer *)), filter->ext_buffer);
+  if (filter->composite.InputStream)
+    g_slice_free1 ((sizeof (mfxVPPCompInputStream) * filter->composite.NumInputStream), filter->composite.InputStream);
+
   gst_mfx_surface_replace (&filter->out_surface, NULL);
   gst_mfx_task_aggregator_unref (filter->aggregator);
 

diff --git a/gst-libs/mfx/gstmfxsurface.c b/gst-libs/mfx/gstmfxsurface.c
@@ -32,7 +32,6 @@
 #undef gst_mfx_surface_unref
 #undef gst_mfx_surface_replace
 
-
 static gboolean
 gst_mfx_surface_allocate_default (GstMfxSurface * surface, GstMfxTask * task)
 {
@@ -221,17 +220,21 @@ gst_mfx_surface_init_properties(GstMfxSurface * surface)
 
 #if MSDK_CHECK_VERSION(1,19)
   /* Full color range */
+  memset(&surface->siginfo, 0, (sizeof(mfxExtVPPVideoSignalInfo)));
   surface->siginfo.Header.BufferId = MFX_EXTBUFF_VPP_VIDEO_SIGNAL_INFO;
   surface->siginfo.Header.BufferSz = sizeof (mfxExtVPPVideoSignalInfo);
-  surface->siginfo.TransferMatrix = MFX_TRANSFERMATRIX_UNKNOWN;
-  surface->siginfo.NominalRange = MFX_NOMINALRANGE_0_255;
-
-  if (NULL == surface->ext_buf) {
-    surface->ext_buf = g_slice_alloc (sizeof (mfxExtBuffer *));
-    if (NULL != surface->ext_buf) {
-      surface->ext_buf[0] = (mfxExtBuffer *) &surface->siginfo;
-      ptr->NumExtParam = 1;
-      ptr->ExtParam = &surface->ext_buf[0];
+
+  if (info->FourCC == MFX_FOURCC_RGB4) {
+    surface->siginfo.TransferMatrix = MFX_TRANSFERMATRIX_UNKNOWN;
+    surface->siginfo.NominalRange = MFX_NOMINALRANGE_0_255;
+
+    if (NULL == surface->ext_buf) {
+      surface->ext_buf = g_slice_alloc (sizeof (mfxExtBuffer *));
+      if (NULL != surface->ext_buf) {
+        surface->ext_buf[0] = (mfxExtBuffer *) &surface->siginfo;
+        ptr->NumExtParam = 1;
+        ptr->ExtParam = &surface->ext_buf[0];
+      }
     }
   }
 #endif

diff --git a/gst/mfx/gstmfxsink.c b/gst/mfx/gstmfxsink.c
@@ -1037,6 +1037,7 @@ gst_mfxsink_show_frame (GstVideoSink * video_sink, GstBuffer * src_buffer)
       surface_rect->x, surface_rect->y,
       surface_rect->width, surface_rect->height);
 
+  gst_mfxsink_lock (sink);
   if (cmeta) {
     overlay = cmeta->overlay;
 
@@ -1055,22 +1056,22 @@ gst_mfxsink_show_frame (GstVideoSink * video_sink, GstBuffer * src_buffer)
         composition, &composite_surface);
   }
 
-  gst_mfxsink_lock (sink);
   if (!gst_mfxsink_render_surface (sink,
         composite_surface ? composite_surface : surface, surface_rect))
     goto error;
 
   gst_mfx_surface_dequeue(surface);
   ret = GST_FLOW_OK;
 done:
-  gst_mfxsink_unlock (sink);
   gst_mfx_surface_composition_replace (&composition, NULL);
+  gst_mfxsink_unlock (sink);
   return ret;
 
 error:
   GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
       ("Internal error: could not render surface"), (NULL));
   ret = GST_FLOW_ERROR;
+  gst_mfxsink_unlock (sink);
   goto done;
 
 no_surface: