From 3bb4b5069e17d9020d57cceb5e434fce19893675 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 19 Oct 2010 10:06:33 +0300 Subject: [PATCH] various (ext): add a missing G_PARAM_STATIC_STRINGS flags --- ext/a52dec/gsta52dec.c | 9 ++-- ext/amrnb/amrnbdec.c | 3 +- ext/amrnb/amrnbenc.c | 3 +- ext/cdio/gstcdiocddasrc.c | 2 +- ext/dvdread/dvdreadsrc.c | 9 ++-- ext/lame/gstlame.c | 87 +++++++++++++++++++------------- ext/lame/gstlamemp3enc.c | 15 +++--- ext/mad/gstmad.c | 4 +- ext/sidplay/gstsiddec.cc | 23 +++++---- ext/x264/gstx264enc.c | 101 +++++++++++++++++++++++--------------- 10 files changed, 157 insertions(+), 99 deletions(-) diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index baebb5e9d8..d6557be147 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -166,7 +166,8 @@ gst_a52dec_class_init (GstA52DecClass * klass) */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DRC, g_param_spec_boolean ("drc", "Dynamic Range Compression", - "Use Dynamic Range Compression", FALSE, G_PARAM_READWRITE)); + "Use Dynamic Range Compression", FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GstA52Dec::mode * @@ -176,14 +177,16 @@ gst_a52dec_class_init (GstA52DecClass * klass) */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MODE, g_param_spec_enum ("mode", "Decoder Mode", "Decoding Mode (default 3f2r)", - GST_TYPE_A52DEC_MODE, A52_3F2R, G_PARAM_READWRITE)); + GST_TYPE_A52DEC_MODE, A52_3F2R, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GstA52Dec::lfe * * Whether to output the LFE (Low Frequency Emitter) channel of the audio stream. */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LFE, - g_param_spec_boolean ("lfe", "LFE", "LFE", TRUE, G_PARAM_READWRITE)); + g_param_spec_boolean ("lfe", "LFE", "LFE", TRUE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* If no CPU instruction based acceleration is available, end up using the * generic software djbfft based one when available in the used liba52 */ diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c index 2be1cec07e..b6b4169a1f 100644 --- a/ext/amrnb/amrnbdec.c +++ b/ext/amrnb/amrnbdec.c @@ -139,7 +139,8 @@ gst_amrnbdec_class_init (GstAmrnbDecClass * klass) g_object_class_install_property (object_class, PROP_VARIANT, g_param_spec_enum ("variant", "Variant", "The decoder variant", GST_AMRNB_VARIANT_TYPE, - VARIANT_DEFAULT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + VARIANT_DEFAULT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); element_class->change_state = GST_DEBUG_FUNCPTR (gst_amrnbdec_state_change); } diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c index 7b683e80f0..2f64a59112 100644 --- a/ext/amrnb/amrnbenc.c +++ b/ext/amrnb/amrnbenc.c @@ -181,7 +181,8 @@ gst_amrnbenc_class_init (GstAmrnbEncClass * klass) g_object_class_install_property (object_class, PROP_BANDMODE, g_param_spec_enum ("band-mode", "Band Mode", "Encoding Band Mode (Kbps)", GST_AMRNBENC_BANDMODE_TYPE, - BANDMODE_DEFAULT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + BANDMODE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); element_class->change_state = GST_DEBUG_FUNCPTR (gst_amrnbenc_state_change); } diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c index e05743cb56..f57e368394 100644 --- a/ext/cdio/gstcdiocddasrc.c +++ b/ext/cdio/gstcdiocddasrc.c @@ -338,7 +338,7 @@ gst_cdio_cdda_src_class_init (GstCdioCddaSrcClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_READ_SPEED, g_param_spec_int ("read-speed", "Read speed", "Read from device at the specified speed (-1 = default)", -1, 100, - DEFAULT_READ_SPEED, G_PARAM_READWRITE)); + DEFAULT_READ_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index 3fe009d355..1eb298defb 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -160,16 +160,17 @@ gst_dvd_read_src_class_init (GstDvdReadSrcClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEVICE, g_param_spec_string ("device", "Device", - "DVD device location", NULL, G_PARAM_READWRITE)); + "DVD device location", NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TITLE, g_param_spec_int ("title", "title", "title", - 1, 999, 1, G_PARAM_READWRITE)); + 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CHAPTER, g_param_spec_int ("chapter", "chapter", "chapter", - 1, 999, 1, G_PARAM_READWRITE)); + 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ANGLE, g_param_spec_int ("angle", "angle", "angle", - 1, 999, 1, G_PARAM_READWRITE)); + 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_dvd_read_src_start); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_dvd_read_src_stop); diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index a3b6a8048b..a9e7a420a2 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -411,138 +411,159 @@ gst_lame_class_init (GstLameClass * klass) g_param_spec_int ("bitrate", "Bitrate (kb/s)", "Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, " "112, 128, 160, 192, 224, 256 or 320)", - 0, 320, gst_lame_default_settings.bitrate, G_PARAM_READWRITE)); + 0, 320, gst_lame_default_settings.bitrate, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* compression ratio set to 0.0 by default otherwise it overrides the bitrate setting */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_COMPRESSION_RATIO, g_param_spec_float ("compression_ratio", "Compression Ratio", "let lame choose bitrate to achieve selected compression ratio", 0.0, 200.0, gst_lame_default_settings.compression_ratio, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY, g_param_spec_enum ("quality", "Quality", "Quality of algorithm used for encoding", GST_TYPE_LAME_QUALITY, - gst_lame_default_settings.quality, G_PARAM_READWRITE)); + gst_lame_default_settings.quality, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MODE, g_param_spec_enum ("mode", "Mode", "Encoding mode", GST_TYPE_LAME_MODE, - gst_lame_default_settings.mode, G_PARAM_READWRITE)); + gst_lame_default_settings.mode, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FORCE_MS, g_param_spec_boolean ("force-ms", "Force ms", "Force ms_stereo on all frames", gst_lame_default_settings.force_ms, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FREE_FORMAT, g_param_spec_boolean ("free-format", "Free format", "Produce a free format bitstream", - gst_lame_default_settings.free_format, G_PARAM_READWRITE)); + gst_lame_default_settings.free_format, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_COPYRIGHT, g_param_spec_boolean ("copyright", "Copyright", "Mark as copyright", - gst_lame_default_settings.copyright, G_PARAM_READWRITE)); + gst_lame_default_settings.copyright, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ORIGINAL, g_param_spec_boolean ("original", "Original", "Mark as original", - gst_lame_default_settings.original, G_PARAM_READWRITE)); + gst_lame_default_settings.original, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ERROR_PROTECTION, g_param_spec_boolean ("error-protection", "Error protection", "Adds 16 bit checksum to every frame", - gst_lame_default_settings.error_protection, G_PARAM_READWRITE)); + gst_lame_default_settings.error_protection, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PADDING_TYPE, g_param_spec_enum ("padding-type", "Padding type", "Padding type " "(DEPRECATED: this setting has no effect)", - GST_TYPE_LAME_PADDING, FALSE, G_PARAM_READWRITE)); + GST_TYPE_LAME_PADDING, FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_EXTENSION, g_param_spec_boolean ("extension", "Extension", "Extension", - gst_lame_default_settings.extension, G_PARAM_READWRITE)); + gst_lame_default_settings.extension, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_STRICT_ISO, g_param_spec_boolean ("strict-iso", "Strict ISO", "Comply as much as possible to ISO MPEG spec", TRUE, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DISABLE_RESERVOIR, g_param_spec_boolean ("disable-reservoir", "Disable reservoir", "Disable the bit reservoir", TRUE, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR, g_param_spec_enum ("vbr", "VBR", "Specify bitrate mode", GST_TYPE_LAME_VBRMODE, gst_lame_default_settings.vbr, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_QUALITY, g_param_spec_enum ("vbr-quality", "VBR Quality", "VBR Quality", GST_TYPE_LAME_QUALITY, gst_lame_default_settings.vbr_quality, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_MEAN_BITRATE, g_param_spec_int ("vbr-mean-bitrate", "VBR mean bitrate", "Specify mean VBR bitrate", 0, 320, - gst_lame_default_settings.vbr_mean_bitrate, G_PARAM_READWRITE)); + gst_lame_default_settings.vbr_mean_bitrate, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_MIN_BITRATE, g_param_spec_int ("vbr-min-bitrate", "VBR min bitrate", "Specify minimum VBR bitrate (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, " "112, 128, 160, 192, 224, 256 or 320)", 0, 320, - gst_lame_default_settings.vbr_min_bitrate, G_PARAM_READWRITE)); + gst_lame_default_settings.vbr_min_bitrate, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_MAX_BITRATE, g_param_spec_int ("vbr-max-bitrate", "VBR max bitrate", "Specify maximum VBR bitrate (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, " "112, 128, 160, 192, 224, 256 or 320)", 0, 320, - gst_lame_default_settings.vbr_max_bitrate, G_PARAM_READWRITE)); + gst_lame_default_settings.vbr_max_bitrate, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_HARD_MIN, g_param_spec_int ("vbr-hard-min", "VBR hard min", "Specify whether min VBR bitrate is a hard limit. Normally, " "it can be violated for silence", 0, 1, - gst_lame_default_settings.vbr_hard_min, G_PARAM_READWRITE)); + gst_lame_default_settings.vbr_hard_min, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOWPASS_FREQ, g_param_spec_int ("lowpass-freq", "Lowpass freq", "frequency(kHz), lowpass filter cutoff above freq", 0, 50000, - gst_lame_default_settings.lowpass_freq, G_PARAM_READWRITE)); + gst_lame_default_settings.lowpass_freq, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOWPASS_WIDTH, g_param_spec_int ("lowpass-width", "Lowpass width", "frequency(kHz) - default 15% of lowpass freq", -1, G_MAXINT, - gst_lame_default_settings.lowpass_width, G_PARAM_READWRITE)); + gst_lame_default_settings.lowpass_width, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HIGHPASS_FREQ, g_param_spec_int ("highpass-freq", "Highpass freq", "frequency(kHz), highpass filter cutoff below freq", 0, 50000, - gst_lame_default_settings.highpass_freq, G_PARAM_READWRITE)); + gst_lame_default_settings.highpass_freq, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HIGHPASS_WIDTH, g_param_spec_int ("highpass-width", "Highpass width", "frequency(kHz) - default 15% of highpass freq", -1, G_MAXINT, - gst_lame_default_settings.highpass_width, G_PARAM_READWRITE)); + gst_lame_default_settings.highpass_width, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ATH_ONLY, g_param_spec_boolean ("ath-only", "ATH only", "Ignore GPSYCHO completely, use ATH only", - gst_lame_default_settings.ath_only, G_PARAM_READWRITE)); + gst_lame_default_settings.ath_only, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ATH_SHORT, g_param_spec_boolean ("ath-short", "ATH short", "Ignore GPSYCHO for short blocks, use ATH only", - gst_lame_default_settings.ath_short, G_PARAM_READWRITE)); + gst_lame_default_settings.ath_short, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NO_ATH, g_param_spec_boolean ("no-ath", "No ath", "turns ATH down to a flat noise floor", - gst_lame_default_settings.no_ath, G_PARAM_READWRITE)); + gst_lame_default_settings.no_ath, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ATH_LOWER, g_param_spec_int ("ath-lower", "ATH lower", "lowers ATH by x dB", G_MININT, G_MAXINT, gst_lame_default_settings.ath_lower, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CWLIMIT, g_param_spec_int ("cwlimit", "Cwlimit", "Compute tonality up to freq (in kHz) default 8.8717 " "(DEPRECATED: this setting has no effect)", 0, 50000, 0, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ALLOW_DIFF_SHORT, g_param_spec_boolean ("allow-diff-short", "Allow diff short", "Allow diff short", gst_lame_default_settings.allow_diff_short, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NO_SHORT_BLOCKS, g_param_spec_boolean ("no-short-blocks", "No short blocks", "Do not use short blocks", gst_lame_default_settings.no_short_blocks, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_EMPHASIS, g_param_spec_boolean ("emphasis", "Emphasis", "Emphasis", - gst_lame_default_settings.emphasis, G_PARAM_READWRITE)); + gst_lame_default_settings.emphasis, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_XINGHEADER, g_param_spec_boolean ("xingheader", "Output Xing Header", "Output Xing Header (BROKEN, use xingmux instead)", FALSE, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #ifdef GSTLAME_PRESET g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PRESET, g_param_spec_enum ("preset", "Lame Preset", "Lame Preset", GST_TYPE_LAME_PRESET, gst_lame_default_settings.preset, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #endif gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_lame_change_state); diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c index 01884894b5..7ad7829e55 100644 --- a/ext/lame/gstlamemp3enc.c +++ b/ext/lame/gstlamemp3enc.c @@ -274,29 +274,32 @@ gst_lamemp3enc_class_init (GstLameMP3EncClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TARGET, g_param_spec_enum ("target", "Target", "Optimize for quality or bitrate", GST_TYPE_LAMEMP3ENC_TARGET, - DEFAULT_TARGET, G_PARAM_READWRITE)); + DEFAULT_TARGET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BITRATE, g_param_spec_int ("bitrate", "Bitrate (kb/s)", "Bitrate in kbit/sec (Only valid if target is bitrate, for CBR one " "of 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, " - "256 or 320)", 8, 320, DEFAULT_BITRATE, G_PARAM_READWRITE)); + "256 or 320)", 8, 320, DEFAULT_BITRATE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CBR, g_param_spec_boolean ("cbr", "CBR", "Enforce constant bitrate encoding " - "(Only valid if target is bitrate)", DEFAULT_CBR, G_PARAM_READWRITE)); + "(Only valid if target is bitrate)", DEFAULT_CBR, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY, g_param_spec_float ("quality", "Quality", "VBR Quality from 0 to 10, 0 being the best " "(Only valid if target is quality)", 0.0, 9.999, - DEFAULT_QUALITY, G_PARAM_READWRITE)); + DEFAULT_QUALITY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ENCODING_ENGINE_QUALITY, g_param_spec_enum ("encoding-engine-quality", "Encoding Engine Quality", "Quality/speed of the encoding engine, " "this does not affect the bitrate!", GST_TYPE_LAMEMP3ENC_ENCODING_ENGINE_QUALITY, - DEFAULT_ENCODING_ENGINE_QUALITY, G_PARAM_READWRITE)); + DEFAULT_ENCODING_ENGINE_QUALITY, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MONO, g_param_spec_boolean ("mono", "Mono", "Enforce mono encoding", - DEFAULT_MONO, G_PARAM_READWRITE)); + DEFAULT_MONO, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_lamemp3enc_change_state); diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index ebbb7ed546..95fd7eae64 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -211,10 +211,10 @@ gst_mad_class_init (GstMadClass * klass) * default values and ranges need to be selected right */ g_object_class_install_property (gobject_class, ARG_HALF, g_param_spec_boolean ("half", "Half", "Generate PCM at 1/2 sample rate", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_IGNORE_CRC, g_param_spec_boolean ("ignore_crc", "Ignore CRC", "Ignore CRC errors", - TRUE, G_PARAM_READWRITE)); + TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* register tags */ #define GST_TAG_LAYER "layer" diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 308d529a54..f835a87e6e 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -202,33 +202,38 @@ gst_siddec_class_init (GstSidDec * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TUNE, g_param_spec_int ("tune", "tune", "tune", - 0, 100, DEFAULT_TUNE, (GParamFlags) G_PARAM_READWRITE)); + 0, 100, DEFAULT_TUNE, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_CLOCK, g_param_spec_enum ("clock", "clock", "clock", - GST_TYPE_SID_CLOCK, DEFAULT_CLOCK, (GParamFlags) G_PARAM_READWRITE)); + GST_TYPE_SID_CLOCK, DEFAULT_CLOCK, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MEMORY, g_param_spec_enum ("memory", "memory", "memory", GST_TYPE_SID_MEMORY, - DEFAULT_MEMORY, (GParamFlags) G_PARAM_READWRITE)); + DEFAULT_MEMORY, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER, g_param_spec_boolean ("filter", "filter", "filter", DEFAULT_FILTER, - (GParamFlags) G_PARAM_READWRITE)); + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MEASURED_VOLUME, g_param_spec_boolean ("measured_volume", "measured_volume", "measured_volume", DEFAULT_MEASURED_VOLUME, - (GParamFlags) G_PARAM_READWRITE)); + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MOS8580, g_param_spec_boolean ("mos8580", "mos8580", "mos8580", DEFAULT_MOS8580, - (GParamFlags) G_PARAM_READWRITE)); + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FORCE_SPEED, g_param_spec_boolean ("force_speed", "force_speed", "force_speed", - DEFAULT_FORCE_SPEED, (GParamFlags) G_PARAM_READWRITE)); + DEFAULT_FORCE_SPEED, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE, g_param_spec_ulong ("blocksize", "Block size", "Size in bytes to output per buffer", 1, G_MAXULONG, - DEFAULT_BLOCKSIZE, (GParamFlags) G_PARAM_READWRITE)); + DEFAULT_BLOCKSIZE, + (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); g_object_class_install_property (gobject_class, PROP_METADATA, g_param_spec_boxed ("metadata", "Metadata", "Metadata", GST_TYPE_CAPS, - (GParamFlags) G_PARAM_READABLE)); + (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS))); } static void diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index c5748e6194..b5b4bae2ae 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -546,18 +546,21 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_PASS, g_param_spec_enum ("pass", "Encoding pass/type", "Encoding pass/type", GST_X264_ENC_PASS_TYPE, - ARG_PASS_DEFAULT, G_PARAM_READWRITE)); + ARG_PASS_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_QUANTIZER, g_param_spec_uint ("quantizer", "Constant Quantizer", "Constant quantizer or quality to apply", - 1, 50, ARG_QUANTIZER_DEFAULT, G_PARAM_READWRITE)); + 1, 50, ARG_QUANTIZER_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_BITRATE, g_param_spec_uint ("bitrate", "Bitrate", "Bitrate in kbit/sec", 1, - 100 * 1024, ARG_BITRATE_DEFAULT, G_PARAM_READWRITE)); + 100 * 1024, ARG_BITRATE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_VBV_BUF_CAPACITY, g_param_spec_uint ("vbv-buf-capacity", "VBV buffer capacity", "Size of the VBV buffer in milliseconds", - 300, 10000, ARG_VBV_BUF_CAPACITY_DEFAULT, G_PARAM_READWRITE)); + 300, 10000, ARG_VBV_BUF_CAPACITY_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #ifdef X264_PRESETS g_object_class_install_property (gobject_class, ARG_SPEED_PRESET, @@ -565,31 +568,36 @@ gst_x264_enc_class_init (GstX264EncClass * klass) "Preset name for speed/quality tradeoff options (can affect decode " "compatibility - impose restrictions separately for your target decoder)", GST_X264_ENC_SPEED_PRESET_TYPE, ARG_SPEED_PRESET_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_PSY_TUNE, g_param_spec_enum ("psy-tune", "Psychovisual tuning preset", "Preset name for psychovisual tuning options", - GST_X264_ENC_PSY_TUNE_TYPE, ARG_PSY_TUNE_DEFAULT, G_PARAM_READWRITE)); + GST_X264_ENC_PSY_TUNE_TYPE, ARG_PSY_TUNE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_TUNE, g_param_spec_flags ("tune", "Content tuning preset", "Preset name for non-psychovisual tuning options", - GST_X264_ENC_TUNE_TYPE, ARG_TUNE_DEFAULT, G_PARAM_READWRITE)); + GST_X264_ENC_TUNE_TYPE, ARG_TUNE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_PROFILE, g_param_spec_enum ("profile", "H.264 profile", "Apply restrictions to meet H.264 Profile constraints. This will " "override other properties if necessary.", - GST_X264_ENC_PROFILE_TYPE, ARG_PROFILE_DEFAULT, G_PARAM_READWRITE)); + GST_X264_ENC_PROFILE_TYPE, ARG_PROFILE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #endif /* X264_PRESETS */ g_object_class_install_property (gobject_class, ARG_OPTION_STRING, g_param_spec_string ("option-string", "Option string", "String of x264 options (overridden by element properties)", - ARG_OPTION_STRING_DEFAULT, G_PARAM_READWRITE)); + ARG_OPTION_STRING_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* options for which we _do_ use string equivalents */ g_object_class_install_property (gobject_class, ARG_THREADS, g_param_spec_uint ("threads", "Threads", "Number of threads used by the codec (0 for automatic)", - 0, 4, ARG_THREADS_DEFAULT, G_PARAM_READWRITE)); + 0, 4, ARG_THREADS_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* NOTE: this first string append doesn't require the ':' delimiter but the * rest do */ g_string_append_printf (x264enc_defaults, "threads=%d", ARG_THREADS_DEFAULT); @@ -597,54 +605,59 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_SLICED_THREADS, g_param_spec_boolean ("sliced-threads", "Sliced Threads", "Low latency but lower efficiency threading", - ARG_SLICED_THREADS_DEFAULT, G_PARAM_READWRITE)); + ARG_SLICED_THREADS_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":sliced-threads=%d", ARG_SLICED_THREADS_DEFAULT); g_object_class_install_property (gobject_class, ARG_SYNC_LOOKAHEAD, g_param_spec_int ("sync-lookahead", "Sync Lookahead", "Number of buffer frames for threaded lookahead (-1 for automatic)", - -1, 250, ARG_SYNC_LOOKAHEAD_DEFAULT, G_PARAM_READWRITE)); + -1, 250, ARG_SYNC_LOOKAHEAD_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":sync-lookahead=%d", ARG_SYNC_LOOKAHEAD_DEFAULT); #endif g_object_class_install_property (gobject_class, ARG_STATS_FILE, g_param_spec_string ("stats-file", "Stats File", "Filename for multipass statistics (deprecated, use multipass-cache-file)", - ARG_STATS_FILE_DEFAULT, G_PARAM_READWRITE)); + ARG_STATS_FILE_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_MULTIPASS_CACHE_FILE, g_param_spec_string ("multipass-cache-file", "Multipass Cache File", "Filename for multipass cache file", - ARG_MULTIPASS_CACHE_FILE_DEFAULT, G_PARAM_READWRITE)); + ARG_MULTIPASS_CACHE_FILE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":stats=%s", ARG_MULTIPASS_CACHE_FILE_DEFAULT); g_object_class_install_property (gobject_class, ARG_BYTE_STREAM, g_param_spec_boolean ("byte-stream", "Byte Stream", "Generate byte stream format of NALU", ARG_BYTE_STREAM_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":annexb=%d", ARG_BYTE_STREAM_DEFAULT); #ifdef X264_INTRA_REFRESH g_object_class_install_property (gobject_class, ARG_INTRA_REFRESH, g_param_spec_boolean ("intra-refresh", "Intra Refresh", "Use Periodic Intra Refresh instead of IDR frames", - ARG_INTRA_REFRESH_DEFAULT, G_PARAM_READWRITE)); + ARG_INTRA_REFRESH_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":intra-refresh=%d", ARG_INTRA_REFRESH_DEFAULT); #endif g_object_class_install_property (gobject_class, ARG_ME, g_param_spec_enum ("me", "Motion Estimation", "Integer pixel motion estimation method", GST_X264_ENC_ME_TYPE, - ARG_ME_DEFAULT, G_PARAM_READWRITE)); + ARG_ME_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":me=%s", x264_motion_est_names[ARG_ME_DEFAULT]); g_object_class_install_property (gobject_class, ARG_SUBME, g_param_spec_uint ("subme", "Subpixel Motion Estimation", "Subpixel motion estimation and partition decision quality: 1=fast, 6=best", - 1, 6, ARG_SUBME_DEFAULT, G_PARAM_READWRITE)); + 1, 6, ARG_SUBME_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":subme=%d", ARG_SUBME_DEFAULT); g_object_class_install_property (gobject_class, ARG_ANALYSE, g_param_spec_flags ("analyse", "Analyse", "Partitions to consider", - GST_X264_ENC_ANALYSE_TYPE, ARG_ANALYSE_DEFAULT, G_PARAM_READWRITE)); + GST_X264_ENC_ANALYSE_TYPE, ARG_ANALYSE_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); partitions = gst_x264_enc_build_partitions (ARG_ANALYSE_DEFAULT); if (partitions) { g_string_append_printf (x264enc_defaults, ":partitions=%s", partitions); @@ -653,27 +666,28 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_DCT8x8, g_param_spec_boolean ("dct8x8", "DCT8x8", "Adaptive spatial transform size", ARG_DCT8x8_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":8x8dct=%d", ARG_DCT8x8_DEFAULT); g_object_class_install_property (gobject_class, ARG_REF, g_param_spec_uint ("ref", "Reference Frames", "Number of reference frames", - 1, 12, ARG_REF_DEFAULT, G_PARAM_READWRITE)); + 1, 12, ARG_REF_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":ref=%d", ARG_REF_DEFAULT); g_object_class_install_property (gobject_class, ARG_BFRAMES, g_param_spec_uint ("bframes", "B-Frames", "Number of B-frames between I and P", - 0, 4, ARG_BFRAMES_DEFAULT, G_PARAM_READWRITE)); + 0, 4, ARG_BFRAMES_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":bframes=%d", ARG_BFRAMES_DEFAULT); g_object_class_install_property (gobject_class, ARG_B_ADAPT, g_param_spec_boolean ("b-adapt", "B-Adapt", "Automatically decide how many B-frames to use", - ARG_B_ADAPT_DEFAULT, G_PARAM_READWRITE)); + ARG_B_ADAPT_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":b-adapt=%d", ARG_B_ADAPT_DEFAULT); g_object_class_install_property (gobject_class, ARG_B_PYRAMID, g_param_spec_boolean ("b-pyramid", "B-Pyramid", "Keep some B-frames as references", ARG_B_PYRAMID_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #ifdef X264_B_PYRAMID g_string_append_printf (x264enc_defaults, ":b-pyramid=%s", x264_b_pyramid_names[ARG_B_PYRAMID_DEFAULT]); @@ -684,80 +698,89 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_WEIGHTB, g_param_spec_boolean ("weightb", "Weighted B-Frames", "Weighted prediction for B-frames", ARG_WEIGHTB_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":weightb=%d", ARG_WEIGHTB_DEFAULT); g_object_class_install_property (gobject_class, ARG_SPS_ID, g_param_spec_uint ("sps-id", "SPS ID", "SPS and PPS ID number", - 0, 31, ARG_SPS_ID_DEFAULT, G_PARAM_READWRITE)); + 0, 31, ARG_SPS_ID_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":sps-id=%d", ARG_SPS_ID_DEFAULT); g_object_class_install_property (gobject_class, ARG_AU_NALU, g_param_spec_boolean ("aud", "AUD", "Use AU (Access Unit) delimiter", ARG_AU_NALU_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":aud=%d", ARG_AU_NALU_DEFAULT); g_object_class_install_property (gobject_class, ARG_TRELLIS, g_param_spec_boolean ("trellis", "Trellis quantization", "Enable trellis searched quantization", ARG_TRELLIS_DEFAULT, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":trellis=%d", ARG_TRELLIS_DEFAULT); g_object_class_install_property (gobject_class, ARG_KEYINT_MAX, g_param_spec_uint ("key-int-max", "Key-frame maximal interval", "Maximal distance between two key-frames (0 for automatic)", - 0, G_MAXINT, ARG_KEYINT_MAX_DEFAULT, G_PARAM_READWRITE)); + 0, G_MAXINT, ARG_KEYINT_MAX_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":keyint=%d", ARG_KEYINT_MAX_DEFAULT); g_object_class_install_property (gobject_class, ARG_CABAC, g_param_spec_boolean ("cabac", "Use CABAC", "Enable CABAC entropy coding", - ARG_CABAC_DEFAULT, G_PARAM_READWRITE)); + ARG_CABAC_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":cabac=%d", ARG_CABAC_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_MIN, g_param_spec_uint ("qp-min", "Minimum Quantizer", - "Minimum quantizer", 1, 51, ARG_QP_MIN_DEFAULT, G_PARAM_READWRITE)); + "Minimum quantizer", 1, 51, ARG_QP_MIN_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpmin=%d", ARG_QP_MIN_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_MAX, g_param_spec_uint ("qp-max", "Maximum Quantizer", - "Maximum quantizer", 1, 51, ARG_QP_MAX_DEFAULT, G_PARAM_READWRITE)); + "Maximum quantizer", 1, 51, ARG_QP_MAX_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpmax=%d", ARG_QP_MAX_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_STEP, g_param_spec_uint ("qp-step", "Maximum Quantizer Difference", "Maximum quantizer difference between frames", - 1, 50, ARG_QP_STEP_DEFAULT, G_PARAM_READWRITE)); + 1, 50, ARG_QP_STEP_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpstep=%d", ARG_QP_STEP_DEFAULT); g_object_class_install_property (gobject_class, ARG_IP_FACTOR, g_param_spec_float ("ip-factor", "IP-Factor", "Quantizer factor between I- and P-frames", - 0, 2, ARG_IP_FACTOR_DEFAULT, G_PARAM_READWRITE)); + 0, 2, ARG_IP_FACTOR_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":ip-factor=%f", ARG_IP_FACTOR_DEFAULT); g_object_class_install_property (gobject_class, ARG_PB_FACTOR, g_param_spec_float ("pb-factor", "PB-Factor", "Quantizer factor between P- and B-frames", 0, 2, - ARG_PB_FACTOR_DEFAULT, G_PARAM_READWRITE)); + ARG_PB_FACTOR_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":pb-factor=%f", ARG_PB_FACTOR_DEFAULT); #ifdef X264_MB_RC g_object_class_install_property (gobject_class, ARG_RC_MB_TREE, g_param_spec_boolean ("mb-tree", "Macroblock Tree", "Macroblock-Tree ratecontrol", - ARG_RC_MB_TREE_DEFAULT, G_PARAM_READWRITE)); + ARG_RC_MB_TREE_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":mbtree=%d", ARG_RC_MB_TREE_DEFAULT); g_object_class_install_property (gobject_class, ARG_RC_LOOKAHEAD, g_param_spec_int ("rc-lookahead", "Rate Control Lookahead", "Number of frames for frametype lookahead", 0, 250, - ARG_RC_LOOKAHEAD_DEFAULT, G_PARAM_READWRITE)); + ARG_RC_LOOKAHEAD_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":rc-lookahead=%d", ARG_RC_LOOKAHEAD_DEFAULT); #endif g_object_class_install_property (gobject_class, ARG_NR, g_param_spec_uint ("noise-reduction", "Noise Reduction", "Noise reduction strength", - 0, 100000, ARG_NR_DEFAULT, G_PARAM_READWRITE)); + 0, 100000, ARG_NR_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":nr=%d", ARG_NR_DEFAULT); g_object_class_install_property (gobject_class, ARG_INTERLACED, g_param_spec_boolean ("interlaced", "Interlaced", - "Interlaced material", ARG_INTERLACED_DEFAULT, G_PARAM_READWRITE)); + "Interlaced material", ARG_INTERLACED_DEFAULT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":interlaced=%d", ARG_INTERLACED_DEFAULT);