plugins: encode: Modify sink template of h264 encode.

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

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/315>
This commit is contained in:
He Junyan 2020-04-10 22:00:38 +08:00 committed by Víctor Manuel Jáquez Leal
parent d674d457ab
commit 53a17f9c98
2 changed files with 12 additions and 25 deletions

View file

@ -78,30 +78,12 @@ GST_DEBUG_CATEGORY_STATIC (gst_vaapi_h264_encode_debug);
"stream-format = (string) { avc, byte-stream }, " \ "stream-format = (string) { avc, byte-stream }, " \
"alignment = (string) au" "alignment = (string) au"
/* *INDENT-OFF* */
static const char gst_vaapiencode_h264_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* */ /* *INDENT-OFF* */
static const char gst_vaapiencode_h264_src_caps_str[] = static const char gst_vaapiencode_h264_src_caps_str[] =
GST_CODEC_CAPS ", " GST_CODEC_CAPS ", "
"profile = (string) { constrained-baseline, baseline, main, high, multiview-high, stereo-high }"; "profile = (string) { constrained-baseline, baseline, main, high, multiview-high, stereo-high }";
/* *INDENT-ON* */ /* *INDENT-ON* */
/* *INDENT-OFF* */
static GstStaticPadTemplate gst_vaapiencode_h264_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (gst_vaapiencode_h264_sink_caps_str));
/* *INDENT-ON* */
/* *INDENT-OFF* */ /* *INDENT-OFF* */
static GstStaticPadTemplate gst_vaapiencode_h264_src_factory = static GstStaticPadTemplate gst_vaapiencode_h264_src_factory =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
@ -110,8 +92,10 @@ static GstStaticPadTemplate gst_vaapiencode_h264_src_factory =
GST_STATIC_CAPS (gst_vaapiencode_h264_src_caps_str)); GST_STATIC_CAPS (gst_vaapiencode_h264_src_caps_str));
/* *INDENT-ON* */ /* *INDENT-ON* */
#define EXTRA_FORMATS {}
/* h264 encode */ /* h264 encode */
G_DEFINE_TYPE (GstVaapiEncodeH264, gst_vaapiencode_h264, GST_TYPE_VAAPIENCODE); GST_VAAPI_ENCODE_REGISTER_TYPE (h264, H264, H264, EXTRA_FORMATS);
static void static void
gst_vaapiencode_h264_init (GstVaapiEncodeH264 * encode) gst_vaapiencode_h264_init (GstVaapiEncodeH264 * encode)
@ -568,16 +552,14 @@ error_convert_buffer:
} }
static void static void
gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass) gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass, gpointer data)
{ {
GObjectClass *const object_class = G_OBJECT_CLASS (klass); GObjectClass *const object_class = G_OBJECT_CLASS (klass);
GstElementClass *const element_class = GST_ELEMENT_CLASS (klass); GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass); GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
GstCaps *sink_caps = GST_CAPS_CAST (data);
gpointer encoder_class; gpointer encoder_class;
GST_DEBUG_CATEGORY_INIT (gst_vaapi_h264_encode_debug,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
object_class->finalize = gst_vaapiencode_h264_finalize; object_class->finalize = gst_vaapiencode_h264_finalize;
object_class->set_property = gst_vaapiencode_set_property_subclass; object_class->set_property = gst_vaapiencode_set_property_subclass;
object_class->get_property = gst_vaapiencode_get_property_subclass; object_class->get_property = gst_vaapiencode_get_property_subclass;
@ -595,8 +577,10 @@ gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass)
GST_PLUGIN_DESC, "Wind Yuan <feng.yuan@intel.com>"); GST_PLUGIN_DESC, "Wind Yuan <feng.yuan@intel.com>");
/* sink pad */ /* sink pad */
gst_element_class_add_static_pad_template (element_class, g_assert (sink_caps);
&gst_vaapiencode_h264_sink_factory); 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 */ /* src pad */
gst_element_class_add_static_pad_template (element_class, gst_element_class_add_static_pad_template (element_class,

View file

@ -68,6 +68,9 @@ struct _GstVaapiEncodeH264Class
GType GType
gst_vaapiencode_h264_get_type (void) G_GNUC_CONST; gst_vaapiencode_h264_get_type (void) G_GNUC_CONST;
GType
gst_vaapiencode_h264_register_type (GstVaapiDisplay * display);
G_END_DECLS G_END_DECLS
#endif /* GST_VAAPIENCODE_H264_H */ #endif /* GST_VAAPIENCODE_H264_H */