[vlc-commits] amem: fix inconsistency in supported sampling rate

[Farid Hammane]

vlc/vlc-3.0 | branch: master | Farid Hammane <farid.hammane at gmail.com> | Fri Jan  3 23:27:10 2020 +0100| [048382d23fc189adf15fcafb22a54a7080957a0f] | committer: Tristan Matthews

amem: fix inconsistency in supported sampling rate

fixes a consistency issue between the module
descriptor and the test that ensures that the
sample rate is supported.

Signed-off-by: Tristan Matthews <tmatth at videolan.org>
(cherry picked from commit a14b99a1b230771acb675ea81b45763cdb5f2480)
Signed-off-by: Tristan Matthews <tmatth at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=048382d23fc189adf15fcafb22a54a7080957a0f
---

 modules/audio_output/amem.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/amem.c b/modules/audio_output/amem.c
index 8732d2c16c..0aacf7d6c7 100644
--- a/modules/audio_output/amem.c
+++ b/modules/audio_output/amem.c
@@ -30,6 +30,8 @@
 static int Open (vlc_object_t *);
 static void Close (vlc_object_t *);
 
+#define AMEM_SAMPLE_RATE_MAX 384000
+
 vlc_module_begin ()
     set_shortname (N_("Audio memory"))
     set_description (N_("Audio memory output"))
@@ -43,7 +45,7 @@ vlc_module_begin ()
         change_private()
     add_integer ("amem-rate", 44100,
                  N_("Sample rate"), N_("Sample rate"), false)
-        change_integer_range (1, 384000)
+        change_integer_range (1, AMEM_SAMPLE_RATE_MAX)
         change_private()
     add_integer ("amem-channels", 2,
                  N_("Channels count"), N_("Channels count"), false)
@@ -186,7 +188,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *fmt)
         sys->set_volume(sys->opaque, sys->volume, sys->mute);
 
     /* Ensure that format is supported */
-    if (fmt->i_rate == 0 || fmt->i_rate > 192000
+    if (fmt->i_rate == 0 || fmt->i_rate > AMEM_SAMPLE_RATE_MAX
      || channels == 0 || channels > AOUT_CHAN_MAX
      || strcmp(format, "S16N") /* TODO: amem-format */)
     {