From: U. Artie Eoff <ullysses.a.eoff@intel.com>
Date: Tue, 11 Jun 2019 03:39:28 +0000 (-0700)
Subject: vaapivideomemory: allow negotiated info to be removed
X-Git-Tag: 1.19.3~503^2~508
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f4142221512f32f14038950f392a8128af4a995;p=platform%2Fupstream%2Fgstreamer.git

vaapivideomemory: allow negotiated info to be removed

Allow NULL negotiated_vinfo to be passed into
gst_allocator_set_vaapi_negotiated_video_info to allow
any previously set info to be removed.
---

diff --git a/gst/vaapi/gstvaapivideomemory.c b/gst/vaapi/gstvaapivideomemory.c
index e7a74ff..16bf143 100644
--- a/gst/vaapi/gstvaapivideomemory.c
+++ b/gst/vaapi/gstvaapivideomemory.c
@@ -1345,7 +1345,8 @@ gst_allocator_set_vaapi_video_info (GstAllocator * allocator,
 /**
  * gst_allocator_set_vaapi_negotiated_video_info:
  * @allocator: a #GstAllocator
- * @negotiated_vinfo: the negotiated #GstVideoInfo to store
+ * @negotiated_vinfo: the negotiated #GstVideoInfo to store.  If NULL, then
+ * removes any previously set value.
  *
  * Stores as GObject's qdata the @negotiated_vinfo in the allocator
  * instance.
@@ -1358,11 +1359,13 @@ gst_allocator_set_vaapi_negotiated_video_info (GstAllocator * allocator,
     const GstVideoInfo * negotiated_vinfo)
 {
   g_return_if_fail (allocator && GST_IS_ALLOCATOR (allocator));
-  g_return_if_fail (negotiated_vinfo);
 
-  g_object_set_qdata_full (G_OBJECT (allocator), NEGOTIATED_VINFO_QUARK,
-      gst_video_info_copy (negotiated_vinfo),
-      (GDestroyNotify) gst_video_info_free);
+  if (negotiated_vinfo)
+    g_object_set_qdata_full (G_OBJECT (allocator), NEGOTIATED_VINFO_QUARK,
+        gst_video_info_copy (negotiated_vinfo),
+        (GDestroyNotify) gst_video_info_free);
+  else
+    g_object_set_qdata (G_OBJECT (allocator), NEGOTIATED_VINFO_QUARK, NULL);
 }
 
 /**