From: Andre Noll Date: Mon, 28 Feb 2011 13:05:31 +0000 (+0100) Subject: audiod: Update --no_default_filters help text. X-Git-Tag: v0.4.6~25 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=02b4964346686a2e50f75d57a22b4cb209c259b9;p=paraslash.git audiod: Update --no_default_filters help text. This was quite outdated: We got the defaults right for udp and dccp streams at least since commit 28f8405e (April 2010). Moreover, two new audio formats (wma and spx) are supported now but are not mentioned in the help text. Describe that the corresponding decoder is used as the default filter rather than listing all supported audio formats. --- diff --git a/ggo/audiod.m4 b/ggo/audiod.m4 index 289917c3..2659b93a 100644 --- a/ggo/audiod.m4 +++ b/ggo/audiod.m4 @@ -136,22 +136,23 @@ option "no_default_filters" D #~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Configure filters manually" flag off -details=" +details = " If (and only if) this option is set, the --filter options - (see below) take effect. Otherwise, the compiled-in default - filters mp3dec, oggdec and aacdec are activated for mp3, ogg, - aac streams respectively. - - You have to configure filters manually if you want to use - the amp filter or the compress filter which are not activated - by default. - - Playing udp streams also requires that the output of the udp - receiver must be fed into the fecdec filter first to produce - a stream which can be decoded by the appropriate decoder - (mp3dec, oggdec, aacdec, wmadec). In other words, the fecdec - filter should be specified as the first filter of the filter - configuration for udp streaming. + (see below) take effect. Otherwise, the compiled-in defaults + apply. These defaults depend on the receiver being used as + described below. + + For http streams, only a single filter per audio format, + the decoder for that format, is activated. On the other hand, + since udp and dccp streams are sent fec-encoded by para_server, + the client side must feed the output of the receiver into + the fecdec filter first. Therefore the default for udp and + dccp streams is to activate the fecdec filter, followed by + the appropriate decoder. + + You must give this option if you want to use any other filter, + for example the amp or the compress filter. + " option "filter" f