ext/faac/gstfaac.c: Fix bitrate ranges and change enum nick for low complexity profil...

Original commit message from CVS:
* ext/faac/gstfaac.c: (gst_faac_profile_get_type),
(gst_faac_class_init), (gst_faac_init):
Fix bitrate ranges and change enum nick for low complexity
profile from LOW to LC for consistency (#490060).

diff --git a/ChangeLog b/ChangeLog
index f0775b4..369599d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/faac/gstfaac.c: (gst_faac_profile_get_type),
+         (gst_faac_class_init), (gst_faac_init):
+         Fix bitrate ranges and change enum nick for low complexity
+         profile from LOW to LC for consistency (#490060).
+
 2007-10-27  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/interleave/interleave.c: (gst_interleave_request_new_pad):

diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 959e5d1..143cc3b 100644 (file)
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -150,7 +150,7 @@ gst_faac_profile_get_type (void)
   if (!gst_faac_profile_type) {
     static GEnumValue gst_faac_profile[] = {
       {MAIN, "MAIN", "Main profile"},
-      {LOW, "LOW", "Low complexity profile"},
+      {LOW, "LC", "Low complexity profile"},
       {SSR, "SSR", "Scalable sampling rate profile"},
       {LTP, "LTP", "Long term prediction profile"},
       {0, NULL, NULL},
@@ -218,7 +218,7 @@ gst_faac_class_init (GstFaacClass * klass)
   /* properties */
   g_object_class_install_property (gobject_class, ARG_BITRATE,
       g_param_spec_int ("bitrate", "Bitrate (bps)", "Bitrate in bits/sec",
-          8 * 1024, 320 * 1024, 128 * 1024, G_PARAM_READWRITE));
+          8 * 1000, 320 * 1000, 128 * 1000, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, ARG_PROFILE,
       g_param_spec_enum ("profile", "Profile", "MPEG/AAC encoding profile",
           GST_TYPE_FAAC_PROFILE, MAIN, G_PARAM_READWRITE));
@@ -265,7 +265,7 @@ gst_faac_init (GstFaac * faac)
   gst_element_add_pad (GST_ELEMENT (faac), faac->srcpad);
 
   /* default properties */
-  faac->bitrate = 1024 * 128;
+  faac->bitrate = 1000 * 128;
   faac->profile = MAIN;
   faac->shortctl = SHORTCTL_NORMAL;
   faac->outputformat = 0;