From 17ab21dae3e1b44562aba361c003991571dab544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philipj@opera.com>
Date: Fri, 21 May 2010 15:17:46 +0200
Subject: [PATCH] vp8enc: add mode property to switch between CBR/VBR

Always using CBR when bitrate is used isn't that great, VBR mode
can produce meaningful results too.
---
 ext/vp8/gstvp8enc.c | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index f390af3d55..07a14bf08d 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -72,6 +72,7 @@ struct _GstVP8Enc
 
   /* properties */
   int bitrate;
+  enum vpx_rc_mode mode;
   double quality;
   gboolean error_resilient;
   int max_latency;
@@ -108,6 +109,7 @@ enum
 };
 
 #define DEFAULT_BITRATE 0
+#define DEFAULT_MODE VPX_VBR
 #define DEFAULT_QUALITY 5
 #define DEFAULT_ERROR_RESILIENT FALSE
 #define DEFAULT_MAX_LATENCY 10
@@ -118,6 +120,7 @@ enum
 {
   PROP_0,
   PROP_BITRATE,
+  PROP_MODE,
   PROP_QUALITY,
   PROP_ERROR_RESILIENT,
   PROP_MAX_LATENCY,
@@ -125,6 +128,28 @@ enum
   PROP_SPEED
 };
 
+#define GST_VP8_ENC_MODE_TYPE (gst_vp8_enc_mode_get_type())
+static GType
+gst_vp8_enc_mode_get_type (void)
+{
+  static const GEnumValue values[] = {
+    {VPX_VBR, "Variable Bit Rate (VBR) mode", "vbr"},
+    {VPX_CBR, "Constant Bit Rate (CBR) mode", "cbr"},
+    {0, NULL, NULL}
+  };
+  static volatile GType id = 0;
+
+  if (g_once_init_enter ((gsize *) & id)) {
+    GType _id;
+
+    _id = g_enum_register_static ("GstVP8EncMode", values);
+
+    g_once_init_leave ((gsize *) & id, _id);
+  }
+
+  return id;
+}
+
 static void gst_vp8_enc_finalize (GObject * object);
 static void gst_vp8_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -226,6 +251,12 @@ gst_vp8_enc_class_init (GstVP8EncClass * klass)
           0, 1000000000, DEFAULT_BITRATE,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+  g_object_class_install_property (gobject_class, PROP_MODE,
+      g_param_spec_enum ("mode", "Mode",
+          "Mode",
+          GST_VP8_ENC_MODE_TYPE, DEFAULT_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
   g_object_class_install_property (gobject_class, PROP_QUALITY,
       g_param_spec_double ("quality", "Quality",
           "Quality",
@@ -266,6 +297,7 @@ gst_vp8_enc_init (GstVP8Enc * gst_vp8_enc, GstVP8EncClass * klass)
   GST_DEBUG_OBJECT (gst_vp8_enc, "init");
 
   gst_vp8_enc->bitrate = DEFAULT_BITRATE;
+  gst_vp8_enc->mode = DEFAULT_MODE;
   gst_vp8_enc->quality = DEFAULT_QUALITY;
   gst_vp8_enc->error_resilient = DEFAULT_ERROR_RESILIENT;
   gst_vp8_enc->max_latency = DEFAULT_MAX_LATENCY;
@@ -306,6 +338,9 @@ gst_vp8_enc_set_property (GObject * object, guint prop_id,
     case PROP_BITRATE:
       gst_vp8_enc->bitrate = g_value_get_int (value);
       break;
+    case PROP_MODE:
+      gst_vp8_enc->mode = g_value_get_enum (value);
+      break;
     case PROP_QUALITY:
       gst_vp8_enc->quality = g_value_get_double (value);
       break;
@@ -339,6 +374,9 @@ gst_vp8_enc_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_BITRATE:
       g_value_set_int (value, gst_vp8_enc->bitrate);
       break;
+    case PROP_MODE:
+      g_value_set_enum (value, gst_vp8_enc->mode);
+      break;
     case PROP_QUALITY:
       g_value_set_double (value, gst_vp8_enc->quality);
       break;
@@ -634,11 +672,10 @@ gst_vp8_enc_handle_frame (GstBaseVideoEncoder * base_video_encoder,
     cfg.g_pass = VPX_RC_ONE_PASS;
     cfg.g_lag_in_frames = encoder->max_latency;
 
+    cfg.rc_end_usage = encoder->mode;
     if (encoder->bitrate) {
-      cfg.rc_end_usage = VPX_CBR;
       cfg.rc_target_bitrate = encoder->bitrate / 1000;
     } else {
-      cfg.rc_end_usage = VPX_VBR;
       cfg.rc_min_quantizer = 63 - encoder->quality * 5.0;
       cfg.rc_max_quantizer = 63 - encoder->quality * 5.0;
       cfg.rc_target_bitrate = encoder->bitrate;