diff options
| author | He Junyan <junyan.he@hotmail.com> | 2020-04-10 22:05:18 +0800 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-05-16 19:58:15 +0000 |
| commit | 6ffabe2139cc16b66b8a9d330a1f1cda22b89791 (patch) | |
| tree | ed11044e719482876789a7e2cbbde6d7830e67ae | |
| parent | 7459bee9794c1f91ea17a63804434228adfc294b (diff) | |
plugins: encode: Modify sink template of vp8 encode.
Use gst_vaapi_detect_codec_caps to get more precise template caps.
Also implement gst_vaapiencode_vp8_register_type, which should be
called at plugin register time.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/315>
| -rw-r--r-- | gst/vaapi/gstvaapiencode_vp8.c | 34 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapiencode_vp8.h | 3 |
2 files changed, 12 insertions, 25 deletions
diff --git a/gst/vaapi/gstvaapiencode_vp8.c b/gst/vaapi/gstvaapiencode_vp8.c index 001a2f30..320ee178 100644 --- a/gst/vaapi/gstvaapiencode_vp8.c +++ b/gst/vaapi/gstvaapiencode_vp8.c @@ -50,29 +50,11 @@ GST_DEBUG_CATEGORY_STATIC (gst_vaapi_vp8_encode_debug); "video/x-vp8" /* *INDENT-OFF* */ -static const char gst_vaapiencode_vp8_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_vp8_src_caps_str[] = GST_CODEC_CAPS; /* *INDENT-ON* */ /* *INDENT-OFF* */ -static GstStaticPadTemplate gst_vaapiencode_vp8_sink_factory = - GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (gst_vaapiencode_vp8_sink_caps_str)); -/* *INDENT-ON* */ - -/* *INDENT-OFF* */ static GstStaticPadTemplate gst_vaapiencode_vp8_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -80,8 +62,10 @@ static GstStaticPadTemplate gst_vaapiencode_vp8_src_factory = GST_STATIC_CAPS (gst_vaapiencode_vp8_src_caps_str)); /* *INDENT-ON* */ +#define EXTRA_FORMATS {} + /* vp8 encode */ -G_DEFINE_TYPE (GstVaapiEncodeVP8, gst_vaapiencode_vp8, GST_TYPE_VAAPIENCODE); +GST_VAAPI_ENCODE_REGISTER_TYPE (vp8, VP8, VP8, EXTRA_FORMATS); static void gst_vaapiencode_vp8_init (GstVaapiEncodeVP8 * encode) @@ -113,16 +97,14 @@ gst_vaapiencode_vp8_alloc_encoder (GstVaapiEncode * base, } static void -gst_vaapiencode_vp8_class_init (GstVaapiEncodeVP8Class * klass) +gst_vaapiencode_vp8_class_init (GstVaapiEncodeVP8Class * 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_vp8_encode_debug, - GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); - object_class->finalize = gst_vaapiencode_vp8_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_vp8_class_init (GstVaapiEncodeVP8Class * klass) "Sreerenj Balachandran <sreerenj.balachandran@intel.com>"); /* sink pad */ - gst_element_class_add_static_pad_template (element_class, - &gst_vaapiencode_vp8_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_vp8.h b/gst/vaapi/gstvaapiencode_vp8.h index e71c2550..1523a9dd 100644 --- a/gst/vaapi/gstvaapiencode_vp8.h +++ b/gst/vaapi/gstvaapiencode_vp8.h @@ -64,6 +64,9 @@ struct _GstVaapiEncodeVP8Class GType gst_vaapiencode_vp8_get_type (void) G_GNUC_CONST; +GType +gst_vaapiencode_vp8_register_type (GstVaapiDisplay * display); + G_END_DECLS #endif /* GST_VAAPIENCODE_VP8_H */ |