From 99bff2329eccea52bc6d60e1ebeb0f16daba17f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 5 Feb 2012 10:56:44 +0000 Subject: [PATCH] theoraenc: remove obsolete properties https://bugzilla.gnome.org/show_bug.cgi?id=669328 --- ext/theora/gsttheoraenc.c | 87 ----------------------------------------------- ext/theora/gsttheoraenc.h | 16 --------- 2 files changed, 103 deletions(-) diff --git a/ext/theora/gsttheoraenc.c b/ext/theora/gsttheoraenc.c index 6455991..0f287ba 100644 --- a/ext/theora/gsttheoraenc.c +++ b/ext/theora/gsttheoraenc.c @@ -66,25 +66,6 @@ #define GST_CAT_DEFAULT theoraenc_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -#define GST_TYPE_BORDER_MODE (gst_border_mode_get_type()) -static GType -gst_border_mode_get_type (void) -{ - static GType border_mode_type = 0; - static const GEnumValue border_mode[] = { - {BORDER_NONE, "No Border", "none"}, - {BORDER_BLACK, "Black Border", "black"}, - {BORDER_MIRROR, "Mirror image in borders", "mirror"}, - {0, NULL, NULL}, - }; - - if (!border_mode_type) { - border_mode_type = - g_enum_register_static ("GstTheoraEncBorderMode", border_mode); - } - return border_mode_type; -} - #define GST_TYPE_MULTIPASS_MODE (gst_multipass_mode_get_type()) static GType gst_multipass_mode_get_type (void) @@ -134,18 +115,11 @@ _ilog (unsigned int v) enum { PROP_0, - PROP_CENTER, - PROP_BORDER, PROP_BITRATE, PROP_QUALITY, - PROP_QUICK, PROP_KEYFRAME_AUTO, PROP_KEYFRAME_FREQ, PROP_KEYFRAME_FREQ_FORCE, - PROP_KEYFRAME_THRESHOLD, - PROP_KEYFRAME_MINDISTANCE, - PROP_NOISE_SENSITIVITY, - PROP_SHARPNESS, PROP_SPEEDLEVEL, PROP_VP3_COMPATIBLE, PROP_DROP_FRAMES, @@ -306,15 +280,6 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass) gobject_class->get_property = theora_enc_get_property; gobject_class->finalize = theora_enc_finalize; - g_object_class_install_property (gobject_class, PROP_CENTER, - g_param_spec_boolean ("center", "Center", - "ignored and kept for API compat only", TRUE, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_BORDER, - g_param_spec_enum ("border", "Border", - "ignored and kept for API compat only", - GST_TYPE_BORDER_MODE, BORDER_BLACK, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* general encoding stream options */ g_object_class_install_property (gobject_class, PROP_BITRATE, g_param_spec_int ("bitrate", "Bitrate", "Compressed video bitrate (kbps)", @@ -326,10 +291,6 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass) THEORA_DEF_QUALITY, (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_PLAYING)); - g_object_class_install_property (gobject_class, PROP_QUICK, - g_param_spec_boolean ("quick", "Quick", - "ignored and kept for API compat only", TRUE, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_KEYFRAME_AUTO, g_param_spec_boolean ("keyframe-auto", "Keyframe Auto", "Automatic keyframe detection", THEORA_DEF_KEYFRAME_AUTO, @@ -343,22 +304,6 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass) "Force keyframe every N frames", 1, 32768, THEORA_DEF_KEYFRAME_FREQ_FORCE, (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_KEYFRAME_THRESHOLD, - g_param_spec_int ("keyframe-threshold", "Keyframe threshold", - "ignored and kept for API compat only", 0, 32768, 80, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_KEYFRAME_MINDISTANCE, - g_param_spec_int ("keyframe-mindistance", "Keyframe mindistance", - "ignored and kept for API compat only", 1, 32768, 8, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_NOISE_SENSITIVITY, - g_param_spec_int ("noise-sensitivity", "Noise sensitivity", - "ignored and kept for API compat only", 0, 32768, 1, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_SHARPNESS, - g_param_spec_int ("sharpness", "Sharpness", - "ignored and kept for API compat only", 0, 2, 0, - (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_SPEEDLEVEL, g_param_spec_int ("speed-level", "Speed level", "Controls the amount of analysis performed when encoding." @@ -1726,17 +1671,6 @@ theora_enc_set_property (GObject * object, guint prop_id, GstTheoraEnc *enc = GST_THEORA_ENC (object); switch (prop_id) { - case PROP_CENTER: - case PROP_BORDER: - case PROP_QUICK: - case PROP_KEYFRAME_THRESHOLD: - case PROP_KEYFRAME_MINDISTANCE: - case PROP_NOISE_SENSITIVITY: - case PROP_SHARPNESS: - /* kept for API compat, but ignored */ - GST_WARNING_OBJECT (object, "Obsolete property '%s' ignored", - pspec->name); - break; case PROP_BITRATE: GST_OBJECT_LOCK (enc); enc->video_bitrate = g_value_get_int (value) * 1000; @@ -1808,12 +1742,6 @@ theora_enc_get_property (GObject * object, guint prop_id, GstTheoraEnc *enc = GST_THEORA_ENC (object); switch (prop_id) { - case PROP_CENTER: - g_value_set_boolean (value, TRUE); - break; - case PROP_BORDER: - g_value_set_enum (value, BORDER_BLACK); - break; case PROP_BITRATE: GST_OBJECT_LOCK (enc); g_value_set_int (value, enc->video_bitrate / 1000); @@ -1824,9 +1752,6 @@ theora_enc_get_property (GObject * object, guint prop_id, g_value_set_int (value, enc->video_quality); GST_OBJECT_UNLOCK (enc); break; - case PROP_QUICK: - g_value_set_boolean (value, TRUE); - break; case PROP_KEYFRAME_AUTO: g_value_set_boolean (value, enc->keyframe_auto); break; @@ -1836,18 +1761,6 @@ theora_enc_get_property (GObject * object, guint prop_id, case PROP_KEYFRAME_FREQ_FORCE: g_value_set_int (value, enc->keyframe_force); break; - case PROP_KEYFRAME_THRESHOLD: - g_value_set_int (value, 80); - break; - case PROP_KEYFRAME_MINDISTANCE: - g_value_set_int (value, 8); - break; - case PROP_NOISE_SENSITIVITY: - g_value_set_int (value, 1); - break; - case PROP_SHARPNESS: - g_value_set_int (value, 0); - break; case PROP_SPEEDLEVEL: g_value_set_int (value, enc->speed_level); break; diff --git a/ext/theora/gsttheoraenc.h b/ext/theora/gsttheoraenc.h index e375bdf..9379818 100644 --- a/ext/theora/gsttheoraenc.h +++ b/ext/theora/gsttheoraenc.h @@ -43,22 +43,6 @@ typedef struct _GstTheoraEnc GstTheoraEnc; typedef struct _GstTheoraEncClass GstTheoraEncClass; /** - * GstTheoraEncBorderMode: - * @BORDER_NONE: no border - * @BORDER_BLACK: black border - * @BORDER_MIRROR: Mirror image in border - * - * Border color to add when sizes not multiple of 16. - */ -typedef enum -{ - BORDER_NONE, - BORDER_BLACK, - BORDER_MIRROR -} -GstTheoraEncBorderMode; - -/** * GstTheoraEncMultipassMode: * @MULTIPASS_MODE_SINGLE_PASS: Single pass encoding * @MULTIPASS_MODE_FIRST_PASS: First pass of two pass encoding -- 2.7.4