mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

opusenc: replace cbr and constrained-vbr properties with an enum

Browse source 
It was deemed confusing before.

https://bugzilla.gnome.org/show_bug.cgi?id=744909
This commit is contained in:
Vincent Penquerc'h 2015-03-12 12:49:40 +00:00
parent b8565d3ab6
commit fcce2fe059
2 changed files with 83 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
ext/opus/gstopusenc.c
View file

@ -136,6 +136,29 @@ gst_opus_enc_audio_type_get_type (void)
return id; return id;
} }
#define GST_OPUS_ENC_TYPE_BITRATE_TYPE (gst_opus_enc_bitrate_type_get_type())
static GType
gst_opus_enc_bitrate_type_get_type (void)
{
static const GEnumValue values[] = {
{BITRATE_TYPE_CBR, "CBR", "cbr"},
{BITRATE_TYPE_VBR, "VBR", "vbr"},
{BITRATE_TYPE_CONSTRAINED_VBR, "Constrained VBR", "constrained-vbr"},
{0, NULL, NULL}
};
static volatile GType id = 0;
if (g_once_init_enter ((gsize *) & id)) {
GType _id;
_id = g_enum_register_static ("GstOpusEncBitrateType", values);
g_once_init_leave ((gsize *) & id, _id);
}
return id;
}
#define FORMAT_STR GST_AUDIO_NE(S16) #define FORMAT_STR GST_AUDIO_NE(S16)
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -160,6 +183,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
#define DEFAULT_FRAMESIZE 20 #define DEFAULT_FRAMESIZE 20
#define DEFAULT_CBR TRUE #define DEFAULT_CBR TRUE
#define DEFAULT_CONSTRAINED_VBR TRUE #define DEFAULT_CONSTRAINED_VBR TRUE
#define DEFAULT_BITRATE_TYPE BITRATE_TYPE_CBR
#define DEFAULT_COMPLEXITY 10 #define DEFAULT_COMPLEXITY 10
#define DEFAULT_INBAND_FEC FALSE #define DEFAULT_INBAND_FEC FALSE
#define DEFAULT_DTX FALSE #define DEFAULT_DTX FALSE
@ -176,6 +200,7 @@ enum
PROP_FRAME_SIZE, PROP_FRAME_SIZE,
PROP_CBR, PROP_CBR,
PROP_CONSTRAINED_VBR, PROP_CONSTRAINED_VBR,
PROP_BITRATE_TYPE,
PROP_COMPLEXITY, PROP_COMPLEXITY,
PROP_INBAND_FEC, PROP_INBAND_FEC,
PROP_DTX, PROP_DTX,
@ -271,11 +296,17 @@ gst_opus_enc_class_init (GstOpusEncClass * klass)
g_param_spec_boolean ("cbr", "Constant bit rate", "Constant bit rate", g_param_spec_boolean ("cbr", "Constant bit rate", "Constant bit rate",
DEFAULT_CBR, DEFAULT_CBR,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING)); GST_PARAM_MUTABLE_PLAYING | G_PARAM_DEPRECATED));
g_object_class_install_property (gobject_class, PROP_CONSTRAINED_VBR, g_object_class_install_property (gobject_class, PROP_CONSTRAINED_VBR,
g_param_spec_boolean ("constrained-vbr", "Constrained VBR", g_param_spec_boolean ("constrained-vbr", "Constrained VBR",
"Constrained VBR", DEFAULT_CONSTRAINED_VBR, "Constrained VBR", DEFAULT_CONSTRAINED_VBR,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING | G_PARAM_DEPRECATED));
g_object_class_install_property (gobject_class, PROP_BITRATE_TYPE,
g_param_spec_enum ("bitrate-type", "Bitrate type",
"Bitrate type", GST_OPUS_ENC_TYPE_BITRATE_TYPE,
DEFAULT_BITRATE_TYPE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING)); GST_PARAM_MUTABLE_PLAYING));
g_object_class_install_property (gobject_class, PROP_COMPLEXITY, g_object_class_install_property (gobject_class, PROP_COMPLEXITY,
g_param_spec_int ("complexity", "Complexity", "Complexity", 0, 10, g_param_spec_int ("complexity", "Complexity", "Complexity", 0, 10,
@ -337,8 +368,7 @@ gst_opus_enc_init (GstOpusEnc * enc)
enc->bitrate = DEFAULT_BITRATE; enc->bitrate = DEFAULT_BITRATE;
enc->bandwidth = DEFAULT_BANDWIDTH; enc->bandwidth = DEFAULT_BANDWIDTH;
enc->frame_size = DEFAULT_FRAMESIZE; enc->frame_size = DEFAULT_FRAMESIZE;
enc->cbr = DEFAULT_CBR; enc->bitrate_type = DEFAULT_BITRATE_TYPE;
enc->constrained_vbr = DEFAULT_CONSTRAINED_VBR;
enc->complexity = DEFAULT_COMPLEXITY; enc->complexity = DEFAULT_COMPLEXITY;
enc->inband_fec = DEFAULT_INBAND_FEC; enc->inband_fec = DEFAULT_INBAND_FEC;
enc->dtx = DEFAULT_DTX; enc->dtx = DEFAULT_DTX;
@ -695,9 +725,11 @@ gst_opus_enc_setup (GstOpusEnc * enc)
opus_multistream_encoder_ctl (enc->state, OPUS_SET_BITRATE (enc->bitrate), 0); opus_multistream_encoder_ctl (enc->state, OPUS_SET_BITRATE (enc->bitrate), 0);
opus_multistream_encoder_ctl (enc->state, OPUS_SET_BANDWIDTH (enc->bandwidth), opus_multistream_encoder_ctl (enc->state, OPUS_SET_BANDWIDTH (enc->bandwidth),
0); 0);
opus_multistream_encoder_ctl (enc->state, OPUS_SET_VBR (!enc->cbr), 0);
opus_multistream_encoder_ctl (enc->state, opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR_CONSTRAINT (enc->constrained_vbr), 0); OPUS_SET_VBR (enc->bitrate_type != BITRATE_TYPE_CBR), 0);
opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR_CONSTRAINT (enc->bitrate_type ==
BITRATE_TYPE_CONSTRAINED_VBR), 0);
opus_multistream_encoder_ctl (enc->state, opus_multistream_encoder_ctl (enc->state,
OPUS_SET_COMPLEXITY (enc->complexity), 0); OPUS_SET_COMPLEXITY (enc->complexity), 0);
opus_multistream_encoder_ctl (enc->state, opus_multistream_encoder_ctl (enc->state,
@ -997,10 +1029,16 @@ gst_opus_enc_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_enum (value, enc->frame_size); g_value_set_enum (value, enc->frame_size);
break; break;
case PROP_CBR: case PROP_CBR:
g_value_set_boolean (value, enc->cbr); g_warning ("cbr property is deprecated; use bitrate-type instead");
g_value_set_boolean (value, enc->bitrate_type == BITRATE_TYPE_CBR);
break; break;
case PROP_CONSTRAINED_VBR: case PROP_CONSTRAINED_VBR:
g_value_set_boolean (value, enc->constrained_vbr); g_warning
("constrained-vbr property is deprecated; use bitrate-type instead");
g_value_set_boolean (value,
enc->bitrate_type == BITRATE_TYPE_CONSTRAINED_VBR);
case PROP_BITRATE_TYPE:
g_value_set_enum (value, enc->bitrate_type);
break; break;
case PROP_COMPLEXITY: case PROP_COMPLEXITY:
g_value_set_int (value, enc->complexity); g_value_set_int (value, enc->complexity);
@ -1065,15 +1103,40 @@ gst_opus_enc_set_property (GObject * object, guint prop_id,
g_mutex_unlock (&enc->property_lock); g_mutex_unlock (&enc->property_lock);
break; break;
case PROP_CBR: case PROP_CBR:
/* this one has an opposite meaning to the opus ctl... */ g_warning ("cbr property is deprecated; use bitrate-type instead");
g_mutex_lock (&enc->property_lock); g_mutex_lock (&enc->property_lock);
enc->cbr = g_value_get_boolean (value); enc->bitrate_type = BITRATE_TYPE_CBR;
if (enc->state) if (enc->state) {
opus_multistream_encoder_ctl (enc->state, OPUS_SET_VBR (!enc->cbr)); opus_multistream_encoder_ctl (enc->state, OPUS_SET_VBR (FALSE));
opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR_CONSTRAINT (FALSE), 0);
}
g_mutex_unlock (&enc->property_lock); g_mutex_unlock (&enc->property_lock);
break; break;
case PROP_CONSTRAINED_VBR: case PROP_CONSTRAINED_VBR:
GST_OPUS_UPDATE_PROPERTY (constrained_vbr, boolean, VBR_CONSTRAINT); g_warning
("constrained-vbr property is deprecated; use bitrate-type instead");
g_mutex_lock (&enc->property_lock);
enc->bitrate_type = BITRATE_TYPE_CONSTRAINED_VBR;
if (enc->state) {
opus_multistream_encoder_ctl (enc->state, OPUS_SET_VBR (TRUE));
opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR_CONSTRAINT (TRUE), 0);
}
g_mutex_unlock (&enc->property_lock);
break;
case PROP_BITRATE_TYPE:
/* this one has an opposite meaning to the opus ctl... */
g_mutex_lock (&enc->property_lock);
enc->bitrate_type = g_value_get_enum (value);
if (enc->state) {
opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR (enc->bitrate_type != BITRATE_TYPE_CBR));
opus_multistream_encoder_ctl (enc->state,
OPUS_SET_VBR_CONSTRAINT (enc->bitrate_type ==
BITRATE_TYPE_CONSTRAINED_VBR), 0);
}
g_mutex_unlock (&enc->property_lock);
break; break;
case PROP_COMPLEXITY: case PROP_COMPLEXITY:
GST_OPUS_UPDATE_PROPERTY (complexity, int, COMPLEXITY); GST_OPUS_UPDATE_PROPERTY (complexity, int, COMPLEXITY);

10
ext/opus/gstopusenc.h
View file

@ -45,6 +45,13 @@ G_BEGIN_DECLS
#define MAX_FRAME_SIZE 2000*2 #define MAX_FRAME_SIZE 2000*2
#define MAX_FRAME_BYTES 2000 #define MAX_FRAME_BYTES 2000
typedef enum
{
BITRATE_TYPE_CBR,
BITRATE_TYPE_VBR,
BITRATE_TYPE_CONSTRAINED_VBR,
} GstOpusEncBitrateType;
typedef struct _GstOpusEnc GstOpusEnc; typedef struct _GstOpusEnc GstOpusEnc;
typedef struct _GstOpusEncClass GstOpusEncClass; typedef struct _GstOpusEncClass GstOpusEncClass;
@ -61,8 +68,7 @@ struct _GstOpusEnc {
gint bitrate; gint bitrate;
gint bandwidth; gint bandwidth;
gint frame_size; gint frame_size;
gboolean cbr; GstOpusEncBitrateType bitrate_type;
gboolean constrained_vbr;
gint complexity; gint complexity;
gboolean inband_fec; gboolean inband_fec;
gboolean dtx; gboolean dtx;