ref: 9b1b621c6d1239b6db0ce1106d946505e7db7224
parent: 82f157f08a10bcf6892d207988d07f6ef1e7883b
author: Kat Walsh <kat@wikimedia.org>
date: Mon May 28 00:14:00 EDT 2012
proofreading
--- a/man/opusdec.1
+++ b/man/opusdec.1
@@ -21,7 +21,7 @@
] [
.B --packet-loss pct
] [
-.B --save-rae file
+.B --save-range file
]
[
.B output.wav
@@ -47,16 +47,18 @@
.SH "OPTIONS"
.IP "-h, --help"
-Print help message.
+Print help message
.IP "-V, --version"
-Display version information.
+Display version information
.IP "--quiet"
-Suppresses program output.
+Suppresses program output
.IP "--mono"
+.br
Force decoding in mono
.IP "--stereo"
Force decoding in stereo
.IP "--rate"
+.br
Force decoding at sampling rate n Hz
.IP "--no-dither"
Do not dither 16-bit output
@@ -84,12 +86,12 @@
opusdec --rate 48000 input.opus
.RE
-Reencode a high bitrate Opus file to a lower rate
+Re-encode a high bitrate Opus file to a lower rate
.RS
opusdec input.opus - | opusenc --bitrate 64 - output.opus
.RE
-Play a http stream
+Play an http stream
.B http://icecast.somwhere.org:8000/stream.opus
with the help of curl on a system with pulseaudio
.br
@@ -101,6 +103,7 @@
.SH AUTHORS
.br
Jean-Marc Valin <jmvalin@jmvalin.ca>
+.br
Gregory Maxwell <greg@xiph.org>
.SH BUGS
@@ -107,7 +110,7 @@
Opusdec does not currently reject all invalid files which it should reject.
It also doesn't provide very helpful output for the corrupted files it
-does reject, use \fBopusinfo\fR(1) for somewhat better diagnostics.
+does reject. Use \fBopusinfo\fR(1) for somewhat better diagnostics.
.SH SEE ALSO
--- a/man/opusenc.1
+++ b/man/opusenc.1
@@ -79,8 +79,8 @@
.SH DESCRIPTION
.B opusenc
reads audio data in either raw, Wave, or AIFF format and encodes it into an
-Opus stream. If the input file is "-" audio data is read from stdin,
-likewise if the output file is "-" opus data is written to stdout.
+Opus stream. If the input file is "-" audio data is read from stdin.
+Likewise, if the output file is "-" opus data is written to stdout.
Unless quieted
.B opusenc
@@ -88,15 +88,15 @@
.SH OPTIONS
.IP "-h, --help"
-Show command help.
+Show command help
.IP "-v, --version"
-Show the version number.
+Show the version number
.IP "--speech"
Optimize for speech
.IP "--music"
Optimize for music
.IP "--bitrate N.nnn"
-Encoding bit-rate in kbit/sec (6-256 per-channel)
+Encoding bitrate in kbit/sec (6-256 per channel)
.IP "--vbr"
Use variable bitrate encoding (default)
.IP "--cvbr"
@@ -118,7 +118,7 @@
.IP "--downmix-mono"
Downmix to mono
.IP "--downmix-stereo"
-Downmix to to stereo (if >2 channels input)
+Downmix to stereo (if >2 channels input)
.IP "--max-ogg-delay N"
Maximum container delay in milliseconds (0-1000, default: 1000)
.IP "--save-range file"
@@ -126,6 +126,7 @@
.IP "--set-ctl-int x=y"
Pass the encoder control x with value y (advanced)
Preface with s: to direct the ctl to multistream s
+.br
This may be used multiple times
.IP "--uncoupled"
Use one mono stream per channel
@@ -137,10 +138,10 @@
http://www.xiph.org/vorbis/doc/v-comment.html
.IP "--artist artist"
Set the artist comment field in the comments to
-.I artist.
+.I artist
.IP "--title title"
Set the track title comment field to
-.I title.
+.I title
.IP "--raw"
Raw (headerless) PCM input
.IP "--raw-bits N"
@@ -150,7 +151,7 @@
.IP "--raw-chan N"
Set number of channels for raw input (default: 2)
.IP "--raw-endianness [0/1]"
-Set the endianness for raw input 1 for bigendian, 0 for little (defaults to 0)
+Set the endianness for raw input: 1 for bigendian, 0 for little (defaults to 0)
.SH EXAMPLES
--- a/man/opusinfo.1
+++ b/man/opusinfo.1
@@ -44,13 +44,13 @@
Show a help and usage message.
.IP -q
Quiet mode. This may be specified multiple times. Doing so once will remove
-the detailed informative messages, twice will remove warnings as well.
+the detailed informative messages; twice will remove warnings as well.
.IP -v
Verbose mode. At the current time, this does not do anything.
.SH NOTES
-There are many kinds of errored, invalid, non-normative or otherwise
+There are many kinds of errored, invalid, non-normative, or otherwise
unwise stream constructions which opusinfo will not produce warnings
on. Passing opusinfo with flying colors is not certification of the
correctness of a stream. Future versions may detect more error
--- a/src/opusdec.c
+++ b/src/opusdec.c
@@ -370,7 +370,7 @@
printf ("\n"); printf ("output_file can be:\n"); printf (" filename.wav Wav file\n");- printf (" filename.* Raw PCM file (any extension other that .wav)\n");+ printf (" filename.* Raw PCM file (any extension other than .wav)\n"); printf (" - stdout\n"); printf (" (nothing) Will be played to soundcard\n"); printf ("\n");@@ -381,7 +381,7 @@
printf (" --no-dither Do not dither 16-bit output\n"); printf (" --packet-loss n Simulate n %% random packet loss\n"); printf (" --save-range file Saves check values for every frame to a file\n");- printf (" -V Verbose mode (show bit-rate)\n");+ printf (" -V Verbose mode (show bitrate)\n"); printf (" -h, --help This help\n"); printf (" -v, --version Version information\n"); printf (" --quiet Quiet mode\n");--- a/src/opusenc.c
+++ b/src/opusenc.c
@@ -122,7 +122,7 @@
printf("\nEncoding options:\n"); printf(" --speech Optimize for speech\n"); printf(" --music Optimize for music\n");- printf(" --bitrate n.nnn Encoding bit-rate in kbit/sec (6-256 per-channel)\n");+ printf(" --bitrate n.nnn Encoding bitrate in kbit/sec (6-256 per channel)\n"); printf(" --vbr Use variable bitrate encoding (default)\n"); printf(" --cvbr Use constrained variable bitrate encoding\n"); printf(" --hard-cbr Use hard constant bitrate encoding\n");@@ -131,7 +131,7 @@
printf(" (2.5, 5, 10, 20, 40, 60, default: 20)\n"); printf(" --expect-loss Percentage packet loss to expect (default: 0)\n"); printf(" --downmix-mono Downmix to mono\n");- printf(" --downmix-stereo Downmix to to stereo (if >2 channels)\n");+ printf(" --downmix-stereo Downmix to stereo (if >2 channels)\n"); printf(" --max-ogg-delay n Maximum container delay in milliseconds\n"); printf(" (0-1000, default: 1000)\n"); printf("\nDiagnostic options:\n");--- a/src/opusinfo.c
+++ b/src/opusinfo.c
@@ -572,15 +572,15 @@
printf(_("(c) 2003-2005 Michael Smith <msmith@xiph.org>\n""(c) 2012 Gregory Maxwell <greg@xiph.org>\n\n"
"Opusinfo is a fork of ogginfo from the vorbis-tools package\n"
- "which has been cut down to only support opus file.\n\n"
- "Usage: opusinfo [flags] file1.opua [file2.opua ... fileN.opus]\n"
+ "which has been cut down to only support opus files.\n\n"
+ "Usage: opusinfo [flags] file1.opus [file2.opus ... fileN.opus]\n"
"Flags supported:\n"
- "\t-h Show this help message\n"
+ "\t-h Show this help message.\n"
"\t-q Make less verbose. Once will remove detailed informative\n"
- "\t messages, two will remove warnings\n"
+ "\t messages, twice will remove warnings.\n"
"\t-v Make more verbose. This may enable more detailed checks\n"
"\t for some stream types.\n"));
- printf (_("\t-V Output version information and exit\n"));+ printf (_("\t-V Output version information and exit.\n"));}
int main(int argc, char **argv) {