va: Add a gstva.h to include all va lib header files.

And replacing all va lib headers with this new header files
when including.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1256>

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h
new file mode 100644 (file)
index 0000000..dc830ab
--- /dev/null
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h
@@ -0,0 +1,31 @@
+/* GStreamer
+ *  Copyright (C) 2021 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifndef GST_USE_UNSTABLE_API
+#pragma message ("The va library from gst-plugins-bad is unstable API and may change in future.")
+#pragma message ("You can define GST_USE_UNSTABLE_API to avoid this warning.")
+#endif
+
+#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstvadisplay_drm.h>
+#include <gst/va/gstvadisplay_wrapped.h>
+#include <gst/va/gstvautils.h>

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
index 7d92c8d..8149f67 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
@@ -6,6 +6,7 @@ va_sources = [
 ]
 
 va_headers = [
+  'gstva.h',
   'gstvadisplay.h',
   'gstvadisplay_drm.h',
   'gstvadisplay_wrapped.h',

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaallocator.h b/subprojects/gst-plugins-bad/sys/va/gstvaallocator.h
index 6a3019b..3475859 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvaallocator.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaallocator.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <gst/allocators/allocators.h>
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <stdint.h>
 #include <va/va.h>

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
index 28e4bc3..3c312a3 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
@@ -18,8 +18,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gst/va/gstvautils.h>
-
 #include "gstvabasedec.h"
 
 #include "gstvaallocator.h"

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
index 9250013..0842fcf 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
@@ -22,8 +22,6 @@
 #include "config.h"
 #endif
 
-#include <gst/va/gstvautils.h>
-
 #include "gstvabasetransform.h"
 
 #include "gstvaallocator.h"

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvacaps.h b/subprojects/gst-plugins-bad/sys/va/gstvacaps.h
index 096e656..41301a8 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvacaps.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvacaps.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <va/va.h>
 
 G_BEGIN_DECLS

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
index 973b4dc..961f066 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
@@ -28,7 +28,6 @@
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
 #include "gstvavideoformat.h"
-#include <gst/va/gstvadisplay_wrapped.h>
 
 struct _GstVaDecoder
 {

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.h b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.h
index b529e71..c643995 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <va/va.h>
 
 G_BEGIN_DECLS

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
index c628eeb..8cb50a5 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
@@ -54,7 +54,6 @@
 #include <gst/video/video.h>
 
 #include <va/va_drmcommon.h>
-#include <gst/va/gstvautils.h>
 
 #include "gstvaallocator.h"
 #include "gstvabasetransform.h"

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadevice.h b/subprojects/gst-plugins-bad/sys/va/gstvadevice.h
index 774741a..662acd3 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvadevice.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadevice.h
@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-#include <gst/va/gstvadisplay_drm.h>
+#include <gst/va/gstva.h>
 
 #define GST_TYPE_VA_DEVICE    (gst_va_device_get_type())
 #define GST_IS_VA_DEVICE(obj) (GST_IS_MINI_OBJECT_TYPE((obj), GST_TYPE_VA_DEVICE))

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvafilter.h b/subprojects/gst-plugins-bad/sys/va/gstvafilter.h
index 344fe67..a9e6680 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvafilter.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvafilter.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 
 #include <va/va.h>

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvasurfacecopy.h b/subprojects/gst-plugins-bad/sys/va/gstvasurfacecopy.h
index eb4641a..624169a 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvasurfacecopy.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvasurfacecopy.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va.h>
 

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
index 503f653..f69734f 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
@@ -68,7 +68,6 @@
 #include "gstvavpp.h"
 
 #include <gst/video/video.h>
-#include <gst/va/gstvautils.h>
 
 #include <va/va_drmcommon.h>
 

diff --git a/subprojects/gst-plugins-bad/sys/va/vasurfaceimage.h b/subprojects/gst-plugins-bad/sys/va/vasurfaceimage.h
index e0ced58..41af438 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/va/vasurfaceimage.h
+++ b/subprojects/gst-plugins-bad/sys/va/vasurfaceimage.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va.h>
 #include <va/va_drmcommon.h>

diff --git a/subprojects/gst-plugins-bad/tests/examples/va/main.c b/subprojects/gst-plugins-bad/tests/examples/va/main.c
index e226939..4f37243 100644 (file)
--- a/subprojects/gst-plugins-bad/tests/examples/va/main.c
+++ b/subprojects/gst-plugins-bad/tests/examples/va/main.c
@@ -14,7 +14,7 @@
 #include <gst/gst.h>
 #include <gst/app/gstappsink.h>
 #include <gst/video/video.h>
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 
 #include <va/va_x11.h>
 

diff --git a/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c b/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
index 175327e..8c08c2b 100644 (file)
--- a/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
+++ b/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
@@ -4,7 +4,7 @@
 #include <gst/video/video.h>
 #include <gst/controller/gstinterpolationcontrolsource.h>
 #include <gst/controller/gstdirectcontrolbinding.h>
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 
 #define CHANGE_DIR_WITH_EVENT 0