[Spice-devel] [spice v10 16/27] server: Respect the GStreamer encoder's valid bit rate range
Francois Gouget
fgouget at codeweavers.com
Tue Mar 1 15:55:01 UTC 2016
Otherwise it may get wrapped to a much lower value than intended.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
server/gstreamer-encoder.c | 84 ++++++++++++++++++++++++++++++++++------------
1 file changed, 63 insertions(+), 21 deletions(-)
diff --git a/server/gstreamer-encoder.c b/server/gstreamer-encoder.c
index 35afe65..9af78f9 100644
--- a/server/gstreamer-encoder.c
+++ b/server/gstreamer-encoder.c
@@ -20,6 +20,8 @@
#include <config.h>
#endif
+#include <inttypes.h>
+
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
#include <gst/app/gstappsink.h>
@@ -839,6 +841,65 @@ static gboolean create_pipeline(SpiceGstEncoder *encoder)
return TRUE;
}
+/* A helper for configure_pipeline() */
+static void set_gstenc_bitrate(SpiceGstEncoder *encoder)
+{
+ GObjectClass *class = G_OBJECT_GET_CLASS(encoder->gstenc);
+ GParamSpec *param = g_object_class_find_property(class, "bitrate");
+ if (param == NULL) {
+ param = g_object_class_find_property(class, "target-bitrate");
+ }
+ if (param) {
+ uint64_t gst_bit_rate = encoder->video_bit_rate;
+ if (strstr(g_param_spec_get_blurb(param), "kbit")) {
+ gst_bit_rate = gst_bit_rate / 1024;
+ }
+ switch (param->value_type) {
+ case G_TYPE_ULONG: {
+ GParamSpecULong *range = G_PARAM_SPEC_ULONG(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ case G_TYPE_LONG: {
+ GParamSpecLong *range = G_PARAM_SPEC_LONG(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ case G_TYPE_UINT: {
+ GParamSpecUInt *range = G_PARAM_SPEC_UINT(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ case G_TYPE_INT: {
+ GParamSpecInt *range = G_PARAM_SPEC_INT(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ case G_TYPE_UINT64: {
+ GParamSpecUInt64 *range = G_PARAM_SPEC_UINT64(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ case G_TYPE_INT64: {
+ GParamSpecInt64 *range = G_PARAM_SPEC_INT64(param);
+ gst_bit_rate = MAX(range->minimum, MIN(range->maximum, gst_bit_rate));
+ break;
+ }
+ default:
+ spice_debug("the %s property has an unsupported type %zu",
+ g_param_spec_get_name(param), param->value_type);
+ }
+ spice_debug("setting the GStreamer %s to %"PRIu64,
+ g_param_spec_get_name(param), gst_bit_rate);
+ g_object_set(G_OBJECT(encoder->gstenc),
+ g_param_spec_get_name(param), gst_bit_rate,
+ NULL);
+ } else {
+ spice_printerr("Could not find the bit rate property for %s",
+ get_gst_codec_name(encoder));
+ }
+}
+
/* A helper for spice_gst_encoder_encode_frame() */
static gboolean configure_pipeline(SpiceGstEncoder *encoder,
const SpiceBitmap *bitmap)
@@ -848,30 +909,11 @@ static gboolean configure_pipeline(SpiceGstEncoder *encoder,
}
/* Configure the encoder bitrate */
- switch (encoder->base.codec_type) {
- case SPICE_VIDEO_CODEC_TYPE_MJPEG:
- g_object_set(G_OBJECT(encoder->gstenc),
- "bitrate", encoder->video_bit_rate,
- NULL);
+ set_gstenc_bitrate(encoder);
+ if (encoder->base.codec_type == SPICE_VIDEO_CODEC_TYPE_MJPEG) {
/* See https://bugzilla.gnome.org/show_bug.cgi?id=753257 */
spice_debug("removing the pipeline clock");
gst_pipeline_use_clock(GST_PIPELINE(encoder->pipeline), NULL);
- break;
- case SPICE_VIDEO_CODEC_TYPE_VP8:
- g_object_set(G_OBJECT(encoder->gstenc),
- "target-bitrate", encoder->video_bit_rate,
- NULL);
- break;
- case SPICE_VIDEO_CODEC_TYPE_H264:
- g_object_set(G_OBJECT(encoder->gstenc),
- "bitrate", encoder->video_bit_rate / 1024,
- NULL);
- break;
- default:
- /* gstreamer_encoder_new() should have rejected this codec type */
- spice_warning("unsupported codec type %d", encoder->base.codec_type);
- free_pipeline(encoder);
- return FALSE;
}
/* Set the source caps */
--
2.7.0
More information about the Spice-devel
mailing list