mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-06 03:41:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

openh264: Respect level set downstream

Browse source 
We were not specifying the requested level to openh264  meaning that
it was choosing anything and was not respecting what was specified\
downstream

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2289>
This commit is contained in:
Thibault Saunier 2021-05-28 17:36:15 -04:00 committed by GStreamer Marge Bot
parent c5fda68403
commit e4c82f450d
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/openh264/gstopenh264enc.cpp
View file

@ -30,6 +30,7 @@
#include "gstopenh264elements.h" #include "gstopenh264elements.h"
#include "gstopenh264enc.h" #include "gstopenh264enc.h"
#include <gst/pbutils/pbutils.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/base.h> #include <gst/base/base.h>
#include <gst/video/video.h> #include <gst/video/video.h>
@ -684,6 +685,19 @@ gst_openh264enc_stop (GstVideoEncoder * encoder)
return TRUE; return TRUE;
} }
static guint8
gst_openh264enc_get_level_from_caps (GstCaps *outcaps, GstCaps *allowed_caps)
{
GstStructure *s = gst_caps_get_structure (outcaps, 0);
const gchar * level = gst_structure_get_string (gst_caps_get_structure (allowed_caps, 0), "level");
if (!level)
return LEVEL_UNKNOWN;
gst_structure_set (s, "level", G_TYPE_STRING, level, NULL);
return gst_codec_utils_h264_get_level_idc (level);
}
static EProfileIdc static EProfileIdc
gst_openh264enc_get_profile_from_caps (GstCaps *outcaps, GstCaps *allowed_caps) gst_openh264enc_get_profile_from_caps (GstCaps *outcaps, GstCaps *allowed_caps)
{ {
@ -790,6 +804,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
enc_params.fMaxFrameRate = fps_n * 1.0 / fps_d; enc_params.fMaxFrameRate = fps_n * 1.0 / fps_d;
enc_params.iLoopFilterDisableIdc = openh264enc->deblocking_mode; enc_params.iLoopFilterDisableIdc = openh264enc->deblocking_mode;
enc_params.sSpatialLayers[0].uiProfileIdc = gst_openh264enc_get_profile_from_caps (outcaps, allowed_caps); enc_params.sSpatialLayers[0].uiProfileIdc = gst_openh264enc_get_profile_from_caps (outcaps, allowed_caps);
enc_params.sSpatialLayers[0].uiLevelIdc = (ELevelIdc) gst_openh264enc_get_level_from_caps (outcaps, allowed_caps);
enc_params.sSpatialLayers[0].iVideoWidth = enc_params.iPicWidth; enc_params.sSpatialLayers[0].iVideoWidth = enc_params.iPicWidth;
enc_params.sSpatialLayers[0].iVideoHeight = enc_params.iPicHeight; enc_params.sSpatialLayers[0].iVideoHeight = enc_params.iPicHeight;
enc_params.sSpatialLayers[0].fFrameRate = fps_n * 1.0 / fps_d; enc_params.sSpatialLayers[0].fFrameRate = fps_n * 1.0 / fps_d;

2
ext/openh264/meson.build
View file

@ -15,7 +15,7 @@ if openh264_dep.found()
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,
link_args : noseh_link_args, link_args : noseh_link_args,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstvideo_dep, openh264_dep], dependencies : [gstvideo_dep, openh264_dep, gstpbutils_dep, ],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )