From d674d457ab0031aabb6c75671d50863acb6f6147 Mon Sep 17 00:00:00 2001
From: He Junyan <junyan.he@hotmail.com>
Date: Fri, 10 Apr 2020 22:11:34 +0800
Subject: plugins: encode: Modify sink template of jpeg encode.

Use gst_vaapi_detect_codec_caps to get more precise template caps.
Also implement gst_vaapiencode_jpeg_register_type, which should be
called at plugin register time.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/315>
---
 gst/vaapi/gstvaapiencode_jpeg.c | 34 +++++++++-------------------------
 gst/vaapi/gstvaapiencode_jpeg.h |  3 +++
 2 files changed, 12 insertions(+), 25 deletions(-)

(limited to 'gst')

diff --git a/gst/vaapi/gstvaapiencode_jpeg.c b/gst/vaapi/gstvaapiencode_jpeg.c
index 34a0efd0..e6ae2787 100644
--- a/gst/vaapi/gstvaapiencode_jpeg.c
+++ b/gst/vaapi/gstvaapiencode_jpeg.c
@@ -49,29 +49,11 @@ GST_DEBUG_CATEGORY_STATIC (gst_vaapi_jpeg_encode_debug);
 #define GST_CODEC_CAPS                          \
   "image/jpeg"
 
-/* *INDENT-OFF* */
-static const char gst_vaapiencode_jpeg_sink_caps_str[] =
-  GST_VAAPI_MAKE_SURFACE_CAPS ", "
-  GST_CAPS_INTERLACED_FALSE "; "
-  GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
-  GST_CAPS_INTERLACED_FALSE ";"
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
-  GST_CAPS_INTERLACED_FALSE;
-/* *INDENT-ON* */
-
 /* *INDENT-OFF* */
 static const char gst_vaapiencode_jpeg_src_caps_str[] =
   GST_CODEC_CAPS;
 /* *INDENT-ON* */
 
-/* *INDENT-OFF* */
-static GstStaticPadTemplate gst_vaapiencode_jpeg_sink_factory =
-  GST_STATIC_PAD_TEMPLATE ("sink",
-      GST_PAD_SINK,
-      GST_PAD_ALWAYS,
-      GST_STATIC_CAPS (gst_vaapiencode_jpeg_sink_caps_str));
-/* *INDENT-ON* */
-
 /* *INDENT-OFF* */
 static GstStaticPadTemplate gst_vaapiencode_jpeg_src_factory =
   GST_STATIC_PAD_TEMPLATE ("src",
@@ -80,8 +62,10 @@ static GstStaticPadTemplate gst_vaapiencode_jpeg_src_factory =
       GST_STATIC_CAPS (gst_vaapiencode_jpeg_src_caps_str));
 /* *INDENT-ON* */
 
+#define EXTRA_FORMATS { GST_VIDEO_FORMAT_BGRA, }
+
 /* jpeg encode */
-G_DEFINE_TYPE (GstVaapiEncodeJpeg, gst_vaapiencode_jpeg, GST_TYPE_VAAPIENCODE);
+GST_VAAPI_ENCODE_REGISTER_TYPE (jpeg, JPEG, Jpeg, EXTRA_FORMATS);
 
 static void
 gst_vaapiencode_jpeg_init (GstVaapiEncodeJpeg * encode)
@@ -113,16 +97,14 @@ gst_vaapiencode_jpeg_alloc_encoder (GstVaapiEncode * base,
 }
 
 static void
-gst_vaapiencode_jpeg_class_init (GstVaapiEncodeJpegClass * klass)
+gst_vaapiencode_jpeg_class_init (GstVaapiEncodeJpegClass * klass, gpointer data)
 {
   GObjectClass *const object_class = G_OBJECT_CLASS (klass);
   GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
   GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
+  GstCaps *sink_caps = GST_CAPS_CAST (data);
   gpointer encoder_class;
 
-  GST_DEBUG_CATEGORY_INIT (gst_vaapi_jpeg_encode_debug,
-      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
-
   object_class->finalize = gst_vaapiencode_jpeg_finalize;
   object_class->set_property = gst_vaapiencode_set_property_subclass;
   object_class->get_property = gst_vaapiencode_get_property_subclass;
@@ -137,8 +119,10 @@ gst_vaapiencode_jpeg_class_init (GstVaapiEncodeJpegClass * klass)
       "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_vaapiencode_jpeg_sink_factory);
+  g_assert (sink_caps);
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps));
+  gst_caps_unref (sink_caps);
 
   /* src pad */
   gst_element_class_add_static_pad_template (element_class,
diff --git a/gst/vaapi/gstvaapiencode_jpeg.h b/gst/vaapi/gstvaapiencode_jpeg.h
index ea5a1873..f0bab68b 100644
--- a/gst/vaapi/gstvaapiencode_jpeg.h
+++ b/gst/vaapi/gstvaapiencode_jpeg.h
@@ -64,6 +64,9 @@ struct _GstVaapiEncodeJpegClass
 GType
 gst_vaapiencode_jpeg_get_type (void) G_GNUC_CONST;
 
+GType
+gst_vaapiencode_jpeg_register_type (GstVaapiDisplay * display);
+
 G_END_DECLS
 
 #endif /* GST_VAAPIENCODE_JPEG_H */
-- 
cgit v1.2.3