From: Tim-Philipp Müller Date: Sun, 28 Oct 2007 15:22:06 +0000 (+0000) Subject: ext/faac/gstfaac.c: Fix bitrate ranges and change enum nick for low complexity profil... X-Git-Tag: 1.19.3~507^2~20759 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e3b2d2bf60dfa3d4401386169c9193a0826b3bb;p=platform%2Fupstream%2Fgstreamer.git ext/faac/gstfaac.c: Fix bitrate ranges and change enum nick for low complexity profile from LOW to LC for consistency... 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-28 Tim-Philipp Müller + + * 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 * 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 --- 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;