From 1b3ec3c8ca5f0e2cdaef2a9ccb5950b5a1d89a96 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sat, 11 Jun 2022 20:13:00 +0200 Subject: [PATCH] avdevice/pulse_audio_dec: deprecate frame_size option It does not do anything. Frame sizes can be controlled by using fragment_size. Signed-off-by: Marton Balint --- doc/indevs.texi | 2 +- libavdevice/pulse_audio_dec.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 1141da26d1..8a198c4b44 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -1289,7 +1289,7 @@ Specify the samplerate in Hz, by default 48kHz is used. Specify the channels in use, by default 2 (stereo) is set. @item frame_size -Specify the number of bytes per frame, by default it is set to 1024. +This option does nothing and is deprecated. @item fragment_size Specify the size in bytes of the minimal buffering fragment in PulseAudio, it diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index 2355b91776..2545462939 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -371,6 +371,7 @@ static int pulse_get_device_list(AVFormatContext *h, AVDeviceInfoList *device_li #define OFFSET(a) offsetof(PulseData, a) #define D AV_OPT_FLAG_DECODING_PARAM +#define DEPR AV_OPT_FLAG_DEPRECATED static const AVOption options[] = { { "server", "set PulseAudio server", OFFSET(server), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, D }, @@ -378,7 +379,7 @@ static const AVOption options[] = { { "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 }, + { "frame_size", "set number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D | DEPR }, { "fragment_size", "set buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D }, { "wallclock", "set the initial pts using the current time", OFFSET(wallclock), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, D }, { NULL },