summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorHe Junyan <junyan.he@hotmail.com>2020-04-10 22:05:50 +0800
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2020-05-16 19:58:15 +0000
commit0b57e6e090a78e7527a2c2753501afe655a7bc60 (patch)
tree7abe522ae9d967c98fa0ee72304145bc584deb9a /gst
parent6ffabe2139cc16b66b8a9d330a1f1cda22b89791 (diff)
plugins: encode: Modify sink template of vp9 encode.
Use gst_vaapi_detect_codec_caps to get more precise template caps. Also implement gst_vaapiencode_vp9_register_type, which should be called at plugin register time. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/315>
Diffstat (limited to 'gst')
-rw-r--r--gst/vaapi/gstvaapiencode_vp9.c32
-rw-r--r--gst/vaapi/gstvaapiencode_vp9.h3
2 files changed, 11 insertions, 24 deletions
diff --git a/gst/vaapi/gstvaapiencode_vp9.c b/gst/vaapi/gstvaapiencode_vp9.c
index 1fd0f8ed..d0e527bf 100644
--- a/gst/vaapi/gstvaapiencode_vp9.c
+++ b/gst/vaapi/gstvaapiencode_vp9.c
@@ -50,29 +50,11 @@ GST_DEBUG_CATEGORY_STATIC (gst_vaapi_vp9_encode_debug);
"video/x-vp9"
/* *INDENT-OFF* */
-static const char gst_vaapiencode_vp9_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_vp9_src_caps_str[] =
GST_CODEC_CAPS;
/* *INDENT-ON* */
/* *INDENT-OFF* */
-static GstStaticPadTemplate gst_vaapiencode_vp9_sink_factory =
- GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (gst_vaapiencode_vp9_sink_caps_str));
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
static GstStaticPadTemplate gst_vaapiencode_vp9_src_factory =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
@@ -80,8 +62,10 @@ static GstStaticPadTemplate gst_vaapiencode_vp9_src_factory =
GST_STATIC_CAPS (gst_vaapiencode_vp9_src_caps_str));
/* *INDENT-ON* */
+#define EXTRA_FORMATS {}
+
/* vp9 encode */
-G_DEFINE_TYPE (GstVaapiEncodeVP9, gst_vaapiencode_vp9, GST_TYPE_VAAPIENCODE);
+GST_VAAPI_ENCODE_REGISTER_TYPE (vp9, VP9, VP9, EXTRA_FORMATS);
static void
gst_vaapiencode_vp9_init (GstVaapiEncodeVP9 * encode)
@@ -113,16 +97,14 @@ gst_vaapiencode_vp9_alloc_encoder (GstVaapiEncode * base,
}
static void
-gst_vaapiencode_vp9_class_init (GstVaapiEncodeVP9Class * klass)
+gst_vaapiencode_vp9_class_init (GstVaapiEncodeVP9Class * 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_vp9_encode_debug,
- GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
-
object_class->finalize = gst_vaapiencode_vp9_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_vp9_class_init (GstVaapiEncodeVP9Class * klass)
"Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
/* sink pad */
+ g_assert (sink_caps);
gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_vaapiencode_vp9_sink_factory));
+ gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps));
+ gst_caps_unref (sink_caps);
/* src pad */
gst_element_class_add_pad_template (element_class,
diff --git a/gst/vaapi/gstvaapiencode_vp9.h b/gst/vaapi/gstvaapiencode_vp9.h
index 09c1fe2a..8d57bda6 100644
--- a/gst/vaapi/gstvaapiencode_vp9.h
+++ b/gst/vaapi/gstvaapiencode_vp9.h
@@ -64,6 +64,9 @@ struct _GstVaapiEncodeVP9Class
GType
gst_vaapiencode_vp9_get_type (void) G_GNUC_CONST;
+GType
+gst_vaapiencode_vp9_register_type (GstVaapiDisplay * display);
+
G_END_DECLS
#endif /* GST_VAAPIENCODE_VP9_H */