theora: Disable keyframe-mindistance property

It's ignored by the current Theora library

https://bugzilla.gnome.org/show_bug.cgi?id=594729

diff --git a/ext/theora/gsttheoraenc.h b/ext/theora/gsttheoraenc.h
index 71088d3..d748fb2 100644 (file)
--- a/ext/theora/gsttheoraenc.h
+++ b/ext/theora/gsttheoraenc.h
@@ -81,7 +81,6 @@ struct _GstTheoraEnc
   gboolean keyframe_auto;
   gint keyframe_freq;
   gint keyframe_force;
-  gint keyframe_mindistance;
   gint noise_sensitivity;
   gint sharpness;
 

diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c
index 14a8b80..b2e4f9d 100644 (file)
--- a/ext/theora/theoraenc.c
+++ b/ext/theora/theoraenc.c
@@ -102,7 +102,6 @@ _ilog (unsigned int v)
 #define THEORA_DEF_KEYFRAME_AUTO        TRUE
 #define THEORA_DEF_KEYFRAME_FREQ        64
 #define THEORA_DEF_KEYFRAME_FREQ_FORCE  64
-#define THEORA_DEF_KEYFRAME_MINDISTANCE 8
 #define THEORA_DEF_NOISE_SENSITIVITY    1
 #define THEORA_DEF_SHARPNESS            0
 #define THEORA_DEF_SPEEDLEVEL           1
@@ -259,7 +258,7 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass)
           (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (gobject_class, ARG_KEYFRAME_MINDISTANCE,
       g_param_spec_int ("keyframe-mindistance", "Keyframe mindistance",
-          "Keyframe mindistance", 1, 32768, THEORA_DEF_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, ARG_NOISE_SENSITIVITY,
       g_param_spec_int ("noise-sensitivity", "Noise sensitivity",
@@ -303,7 +302,6 @@ gst_theora_enc_init (GstTheoraEnc * enc, GstTheoraEncClass * g_class)
   enc->keyframe_auto = THEORA_DEF_KEYFRAME_AUTO;
   enc->keyframe_freq = THEORA_DEF_KEYFRAME_FREQ;
   enc->keyframe_force = THEORA_DEF_KEYFRAME_FREQ_FORCE;
-  enc->keyframe_mindistance = THEORA_DEF_KEYFRAME_MINDISTANCE;
   enc->noise_sensitivity = THEORA_DEF_NOISE_SENSITIVITY;
   enc->sharpness = THEORA_DEF_SHARPNESS;
 
@@ -486,7 +484,6 @@ theora_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
   enc->info.keyframe_frequency = enc->keyframe_freq;
   enc->info.keyframe_frequency_force = enc->keyframe_force;
   enc->info.keyframe_data_target_bitrate = enc->video_bitrate * 1.5;
-  enc->info.keyframe_mindistance = enc->keyframe_mindistance;
   enc->info.noise_sensitivity = enc->noise_sensitivity;
   enc->info.sharpness = enc->sharpness;
 
@@ -1181,6 +1178,7 @@ theora_enc_set_property (GObject * object, guint prop_id,
     case ARG_BORDER:
     case ARG_QUICK:
     case ARG_KEYFRAME_THRESHOLD:
+    case ARG_KEYFRAME_MINDISTANCE:
       /* kept for API compat, but ignored */
       break;
     case ARG_BITRATE:
@@ -1200,9 +1198,6 @@ theora_enc_set_property (GObject * object, guint prop_id,
     case ARG_KEYFRAME_FREQ_FORCE:
       enc->keyframe_force = g_value_get_int (value);
       break;
-    case ARG_KEYFRAME_MINDISTANCE:
-      enc->keyframe_mindistance = g_value_get_int (value);
-      break;
     case ARG_NOISE_SENSITIVITY:
       enc->noise_sensitivity = g_value_get_int (value);
       break;
@@ -1255,7 +1250,7 @@ theora_enc_get_property (GObject * object, guint prop_id,
       g_value_set_int (value, 80);
       break;
     case ARG_KEYFRAME_MINDISTANCE:
-      g_value_set_int (value, enc->keyframe_mindistance);
+      g_value_set_int (value, 8);
       break;
     case ARG_NOISE_SENSITIVITY:
       g_value_set_int (value, enc->noise_sensitivity);