From 61de88e58030e245b596fd10af422615c08cb9a3 Mon Sep 17 00:00:00 2001
From: He Junyan <junyan.he@hotmail.com>
Date: Wed, 18 Dec 2019 00:40:58 +0800
Subject: [PATCH] plugin: encode: change the dmabuf caps to all supported
 formats.

The encode's dmabuf caps definition is obsolete, it can support
more formats now. Re-define it to include all supported formats
in video format map.
---
 gst/vaapi/gstvaapiencode_h264.c     | 2 +-
 gst/vaapi/gstvaapiencode_h264_fei.c | 2 +-
 gst/vaapi/gstvaapiencode_h265.c     | 2 +-
 gst/vaapi/gstvaapiencode_jpeg.c     | 2 +-
 gst/vaapi/gstvaapiencode_mpeg2.c    | 2 +-
 gst/vaapi/gstvaapiencode_vp8.c      | 2 +-
 gst/vaapi/gstvaapiencode_vp9.c      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c
index e1d91b67ea..018917f866 100644
--- a/gst/vaapi/gstvaapiencode_h264.c
+++ b/gst/vaapi/gstvaapiencode_h264.c
@@ -84,7 +84,7 @@ static const char gst_vaapiencode_h264_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_h264_fei.c b/gst/vaapi/gstvaapiencode_h264_fei.c
index c45e8d2aa9..5a998afbd6 100644
--- a/gst/vaapi/gstvaapiencode_h264_fei.c
+++ b/gst/vaapi/gstvaapiencode_h264_fei.c
@@ -64,7 +64,7 @@ static const char gst_vaapiencode_h264_fei_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_h265.c b/gst/vaapi/gstvaapiencode_h265.c
index 711f5e1447..5fb2cfbded 100644
--- a/gst/vaapi/gstvaapiencode_h265.c
+++ b/gst/vaapi/gstvaapiencode_h265.c
@@ -58,7 +58,7 @@ static const char gst_vaapiencode_h265_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_jpeg.c b/gst/vaapi/gstvaapiencode_jpeg.c
index d532429ecc..34a0efd000 100644
--- a/gst/vaapi/gstvaapiencode_jpeg.c
+++ b/gst/vaapi/gstvaapiencode_jpeg.c
@@ -55,7 +55,7 @@ static const char gst_vaapiencode_jpeg_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_mpeg2.c b/gst/vaapi/gstvaapiencode_mpeg2.c
index a01042f6f6..06b3458ca8 100644
--- a/gst/vaapi/gstvaapiencode_mpeg2.c
+++ b/gst/vaapi/gstvaapiencode_mpeg2.c
@@ -57,7 +57,7 @@ static const char gst_vaapiencode_mpeg2_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_vp8.c b/gst/vaapi/gstvaapiencode_vp8.c
index 767ec38575..001a2f3089 100644
--- a/gst/vaapi/gstvaapiencode_vp8.c
+++ b/gst/vaapi/gstvaapiencode_vp8.c
@@ -55,7 +55,7 @@ static const char gst_vaapiencode_vp8_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */
 
diff --git a/gst/vaapi/gstvaapiencode_vp9.c b/gst/vaapi/gstvaapiencode_vp9.c
index 6fed2382fc..1fd0f8ed2c 100644
--- a/gst/vaapi/gstvaapiencode_vp9.c
+++ b/gst/vaapi/gstvaapiencode_vp9.c
@@ -55,7 +55,7 @@ static const char gst_vaapiencode_vp9_sink_caps_str[] =
   GST_CAPS_INTERLACED_FALSE "; "
   GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
   GST_CAPS_INTERLACED_FALSE ";"
-  GST_VAAPI_MAKE_DMABUF_CAPS ","
+  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
   GST_CAPS_INTERLACED_FALSE;
 /* *INDENT-ON* */