From fb74c7e0446f7ac92aeb734126e2e405e16bc9d1 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 18 Oct 2013 22:12:15 +0200 Subject: [PATCH] lavd/pulse_audio_dec: apply cosmetic changes In particular, fix punctuation in docs and make option help messages grammatically consistent. Signed-off-by: Lukasz Marek Signed-off-by: Stefano Sabatini --- doc/indevs.texi | 5 ++++- libavdevice/pulse_audio_dec.c | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 1d70138907e..72b14935221 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -495,10 +495,13 @@ string "default" To list the PulseAudio source devices and their properties you can invoke the command @command{pactl list sources}. +More information about PulseAudio can be found on @url{http://www.pulseaudio.org}. + @subsection Options @table @option @item server -Connect to a specific server. Default server is used when not provided. +Connect to a specific PulseAudio server, specified by an IP address. +Default server is used when not provided. @item name Specify the application name PulseAudio will use when showing active clients, diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index 21b3caa1c88..9cfc1447e0f 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -144,13 +144,13 @@ static av_cold int pulse_close(AVFormatContext *s) #define D AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "server", "pulse server name", OFFSET(server), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, D }, - { "name", "application name", OFFSET(name), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, D }, - { "stream_name", "stream description", OFFSET(stream_name), AV_OPT_TYPE_STRING, {.str = "record"}, 0, 0, D }, - { "sample_rate", "sample rate in Hz", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 1, INT_MAX, D }, - { "channels", "number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, D }, - { "frame_size", "number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D }, - { "fragment_size", "buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D }, + { "server", "set PulseAudio server", OFFSET(server), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, D }, + { "name", "set application name", OFFSET(name), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, D }, + { "stream_name", "set stream description", OFFSET(stream_name), AV_OPT_TYPE_STRING, {.str = "record"}, 0, 0, D }, + { "sample_rate", "set sample rate in Hz", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 1, INT_MAX, D }, + { "channels", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, D }, + { "frame_size", "set number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D }, + { "fragment_size", "set buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D }, { NULL }, }; -- 2.39.2