mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 15:22:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

smartencoder: Respect user stream-format when specified

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1249>
This commit is contained in:
Thibault Saunier 2021-08-09 21:24:34 -04:00 committed by GStreamer Marge Bot
parent 4aa72cea4f
commit acf98372a3
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/encoding/gstencodebasebin.c
View file

@ -1196,16 +1196,19 @@ _capsfilter_force_format (GstPad * pad,
if (sgroup->smart_capsfilter) {
GstStructure *structure = gst_caps_get_structure (caps, 0);
/* Pick a stream format that allows for in-band SPS updates, and remove
* restrictions on fields that can be updated by codec_data or in-band SPS
/* Pick a stream format that allows for in-band SPS updates if none
* specified by the user, and remove restrictions on fields that can be
* updated by codec_data or in-band SPS
*/
if (gst_structure_has_name (structure, "video/x-h264")) {
if (gst_structure_has_name (structure, "video/x-h264") &&
!gst_structure_has_field (structure, "stream_format")) {
gst_structure_set (structure, "stream-format",
G_TYPE_STRING, "avc3", NULL);
gst_structure_remove_fields (structure, "codec_data", "profile",
"level", NULL);
} else if (gst_structure_has_name (structure, "video/x-h265")) {
} else if (gst_structure_has_name (structure, "video/x-h265") &&
!gst_structure_has_field (structure, "stream_format")) {
gst_structure_set (structure, "stream-format",
G_TYPE_STRING, "hev1", NULL);

13
gst/encoding/gstsmartencoder.c
View file

@ -681,13 +681,14 @@ smart_encoder_sink_query (GstPad * pad, GstObject * ghostpad, GstQuery * query)
static gboolean
gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
{
const gchar *stream_format;
GstPad *chainpad, *internal_chainpad, *sinkpad;
GstStructure *structure = gst_caps_get_structure (format, 0);
GstElement *capsfilter = gst_element_factory_make ("capsfilter", NULL);
gst_bin_add (GST_BIN (self), capsfilter);
g_object_set (capsfilter, "caps", format, NULL);
if (gst_structure_has_name (gst_caps_get_structure (format, 0),
"video/x-h264")) {
if (gst_structure_has_name (structure, "video/x-h264")) {
GstElement *parser = gst_element_factory_make ("h264parse", NULL);
if (!parser) {
GST_ERROR_OBJECT (self, "`h264parse` is missing, can't encode smartly");
@ -695,7 +696,9 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
goto failed;
}
g_object_set (parser, "config-interval", -1, NULL);
stream_format = gst_structure_get_string (structure, "stream-format");
if (g_strcmp0 (stream_format, "avc1"))
g_object_set (parser, "config-interval", -1, NULL);
if (!gst_bin_add (GST_BIN (self), parser)) {
GST_ERROR_OBJECT (self, "Could not add parser.");
@ -719,7 +722,9 @@ gst_smart_encoder_add_parser (GstSmartEncoder * self, GstCaps * format)
goto failed;
}
g_object_set (parser, "config-interval", -1, NULL);
stream_format = gst_structure_get_string (structure, "stream-format");
if (g_strcmp0 (stream_format, "hvc1"))
g_object_set (parser, "config-interval", -1, NULL);
if (!gst_bin_add (GST_BIN (self), parser)) {
GST_ERROR_OBJECT (self, "Could not add parser.");