From 69f9dea7c5d67f63b0ad602ee0cf46c2bedb5119 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Fri, 1 Feb 2008 23:25:05 +1100 Subject: [PATCH] couple fixes to Ogg encoder/decoder --- tools/celtdec.c | 7 ------- tools/celtenc.c | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/celtdec.c b/tools/celtdec.c index 87480e3c..4160ec68 100644 --- a/tools/celtdec.c +++ b/tools/celtdec.c @@ -264,11 +264,6 @@ void usage() printf (" (nothing) Will be played to soundcard\n"); printf ("\n"); printf ("Options:\n"); - printf (" --enh Enable perceptual enhancement (default)\n"); - printf (" --no-enh Disable perceptual enhancement\n"); - printf (" --force-nb Force decoding in narrowband\n"); - printf (" --force-wb Force decoding in wideband\n"); - printf (" --force-uwb Force decoding in ultra-wideband\n"); printf (" --mono Force decoding in mono\n"); printf (" --stereo Force decoding in stereo\n"); printf (" --rate n Force decoding at sampling rate n Hz\n"); @@ -276,8 +271,6 @@ void usage() printf (" -V Verbose mode (show bit-rate)\n"); printf (" -h, --help This help\n"); printf (" -v, --version Version information\n"); - printf (" --pf Deprecated, use --enh instead\n"); - printf (" --no-pf Deprecated, use --no-enh instead\n"); printf ("\n"); } diff --git a/tools/celtenc.c b/tools/celtenc.c index 4d3c1f1d..03bf2e59 100644 --- a/tools/celtenc.c +++ b/tools/celtenc.c @@ -210,7 +210,7 @@ void usage() printf (" - stdout\n"); printf ("\n"); printf ("Options:\n"); - printf (" --bitrate n Encoding bit-rate (use bit-rate n or lower)\n"); + printf (" --bitrate n Encoding bit-rate\n"); printf (" --skeleton Outputs ogg skeleton metadata (may cause incompatibilities)\n"); printf (" --comment Add the given string as an extra comment. This may be\n"); printf (" used multiple times\n"); @@ -440,6 +440,10 @@ int main(int argc, char **argv) } celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size); + if (bitrate>250) + bitrate = 150; + if (bitrate<40) + bitrate = 40; bytes_per_packet = (bitrate*1000*frame_size/rate+4)/8; celt_header_init(&header, rate, 1, mode);