mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

smartencoder: Always plug a vp9parse when encoding vp9

Browse source 
This way we know that all relevant fields about video format are
added and we avoid renegotiation issues.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1062>
This commit is contained in:
Thibault Saunier 2021-10-14 22:29:19 -03:00
parent 20f6af7e3c
commit e9fdfade61
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
subprojects/gst-plugins-base/gst/encoding/gstsmartencoder.c
View file

@ -744,14 +744,15 @@ static gboolean
gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format) gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
{ {
const gchar *stream_format; const gchar *stream_format;
GstPad *chainpad, *internal_chainpad, *sinkpad; GstPad *chainpad, *internal_chainpad, *sinkpad = NULL;
GstStructure *structure = gst_caps_get_structure (format, 0); GstStructure *structure = gst_caps_get_structure (format, 0);
GstElement *capsfilter = gst_element_factory_make ("capsfilter", NULL); GstElement *capsfilter = gst_element_factory_make ("capsfilter", NULL);
GstElement *parser = NULL;
gst_bin_add (GST_BIN (self), capsfilter); gst_bin_add (GST_BIN (self), capsfilter);
g_object_set (capsfilter, "caps", format, NULL); g_object_set (capsfilter, "caps", format, NULL);
if (gst_structure_has_name (structure, "video/x-h264")) { if (gst_structure_has_name (structure, "video/x-h264")) {
GstElement *parser = gst_element_factory_make ("h264parse", NULL); parser = gst_element_factory_make ("h264parse", NULL);
if (!parser) { if (!parser) {
GST_ERROR_OBJECT (self, "`h264parse` is missing, can't encode smartly"); GST_ERROR_OBJECT (self, "`h264parse` is missing, can't encode smartly");
@ -762,22 +763,9 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
if (g_strcmp0 (stream_format, "avc1")) if (g_strcmp0 (stream_format, "avc1"))
g_object_set (parser, "config-interval", -1, NULL); g_object_set (parser, "config-interval", -1, NULL);
if (!gst_bin_add (GST_BIN (self), parser)) {
GST_ERROR_OBJECT (self, "Could not add parser.");
goto failed;
}
if (!gst_element_link (parser, capsfilter)) {
GST_ERROR_OBJECT (self, "Could not link capfilter and parser.");
goto failed;
}
sinkpad = gst_element_get_static_pad (parser, "sink");
} else if (gst_structure_has_name (gst_caps_get_structure (format, 0), } else if (gst_structure_has_name (gst_caps_get_structure (format, 0),
"video/x-h265")) { "video/x-h265")) {
GstElement *parser = gst_element_factory_make ("h265parse", NULL); parser = gst_element_factory_make ("h265parse", NULL);
if (!parser) { if (!parser) {
GST_ERROR_OBJECT (self, "`h265parse` is missing, can't encode smartly"); GST_ERROR_OBJECT (self, "`h265parse` is missing, can't encode smartly");
@ -787,7 +775,18 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
stream_format = gst_structure_get_string (structure, "stream-format"); stream_format = gst_structure_get_string (structure, "stream-format");
if (g_strcmp0 (stream_format, "hvc1")) if (g_strcmp0 (stream_format, "hvc1"))
g_object_set (parser, "config-interval", -1, NULL); g_object_set (parser, "config-interval", -1, NULL);
} else if (gst_structure_has_name (structure, "video/x-vp9")) {
parser = gst_element_factory_make ("vp9parse", NULL);
if (!parser) {
GST_ERROR_OBJECT (self, "`vp9parse` is missing, can't encode smartly");
goto failed;
}
} else {
sinkpad = gst_element_get_static_pad (capsfilter, "sink");
}
if (parser) {
if (!gst_bin_add (GST_BIN (self), parser)) { if (!gst_bin_add (GST_BIN (self), parser)) {
GST_ERROR_OBJECT (self, "Could not add parser."); GST_ERROR_OBJECT (self, "Could not add parser.");
@ -801,8 +800,6 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
} }
sinkpad = gst_element_get_static_pad (parser, "sink"); sinkpad = gst_element_get_static_pad (parser, "sink");
} else {
sinkpad = gst_element_get_static_pad (capsfilter, "sink");
} }
g_assert (sinkpad); g_assert (sinkpad);
@ -826,6 +823,8 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
return TRUE; return TRUE;
failed: failed:
gst_clear_object (&parser);
return FALSE; return FALSE;
} }