From 7b432aec88bd84e848a9a2712f579527d2907624 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 5 Sep 2022 12:21:20 +0200
Subject: [PATCH] spa: make default samplerate 48000

Remove some 44100 default rates and use 48000 instead.
---
 spa/plugins/alsa/acp/acp.c              | 2 +-
 spa/plugins/audiomixer/audiomixer.c     | 9 +++++++--
 spa/plugins/audiotestsrc/audiotestsrc.c | 9 +++++++--
 spa/plugins/support/null-audio-sink.c   | 2 +-
 spa/plugins/volume/volume.c             | 9 +++++++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/spa/plugins/alsa/acp/acp.c b/spa/plugins/alsa/acp/acp.c
index aea4b440d..f23232ed3 100644
--- a/spa/plugins/alsa/acp/acp.c
+++ b/spa/plugins/alsa/acp/acp.c
@@ -1546,7 +1546,7 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
 	}
 
 	impl->ucm.default_sample_spec.format = PA_SAMPLE_S16NE;
-	impl->ucm.default_sample_spec.rate = 44100;
+	impl->ucm.default_sample_spec.rate = 48000;
 	impl->ucm.default_sample_spec.channels = 2;
 	pa_channel_map_init_extend(&impl->ucm.default_channel_map,
 			impl->ucm.default_sample_spec.channels, PA_CHANNEL_MAP_ALSA);
diff --git a/spa/plugins/audiomixer/audiomixer.c b/spa/plugins/audiomixer/audiomixer.c
index 5e682bba5..6aba1a012 100644
--- a/spa/plugins/audiomixer/audiomixer.c
+++ b/spa/plugins/audiomixer/audiomixer.c
@@ -45,6 +45,9 @@
 #define SPA_LOG_TOPIC_DEFAULT log_topic
 static struct spa_log_topic *log_topic = &SPA_LOG_TOPIC(0, "spa.audiomixer");
 
+#define DEFAULT_RATE		48000
+#define DEFAULT_CHANNELS	2
+
 #define MAX_BUFFERS     64
 #define MAX_PORTS       128
 #define MAX_CHANNELS    64
@@ -353,8 +356,10 @@ static int port_enum_formats(void *object,
 								SPA_AUDIO_FORMAT_U24_32,
 								SPA_AUDIO_FORMAT_F32,
 								SPA_AUDIO_FORMAT_F64),
-				SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX),
-				SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX));
+				SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(
+								DEFAULT_RATE, 1, INT32_MAX),
+				SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
+								DEFAULT_CHANNELS, 1, INT32_MAX));
 		}
 		break;
 	default:
diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c
index d02b73580..ff58e6a2a 100644
--- a/spa/plugins/audiotestsrc/audiotestsrc.c
+++ b/spa/plugins/audiotestsrc/audiotestsrc.c
@@ -55,6 +55,9 @@ enum wave_type {
 	WAVE_SQUARE,
 };
 
+#define DEFAULT_RATE		48000
+#define DEFAULT_CHANNELS	2
+
 #define DEFAULT_LIVE true
 #define DEFAULT_WAVE WAVE_SINE
 #define DEFAULT_FREQ 440.0
@@ -583,8 +586,10 @@ port_enum_formats(struct impl *this,
 							SPA_AUDIO_FORMAT_S32,
 							SPA_AUDIO_FORMAT_F32,
 							SPA_AUDIO_FORMAT_F64),
-			SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX),
-			SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX));
+			SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(
+							DEFAULT_RATE, 1, INT32_MAX),
+			SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
+							DEFAULT_CHANNELS, 1, INT32_MAX));
 		break;
 	default:
 		return 0;
diff --git a/spa/plugins/support/null-audio-sink.c b/spa/plugins/support/null-audio-sink.c
index abee4bedd..4c000f3eb 100644
--- a/spa/plugins/support/null-audio-sink.c
+++ b/spa/plugins/support/null-audio-sink.c
@@ -71,7 +71,7 @@ static void reset_props(struct props *props)
 }
 
 #define DEFAULT_CHANNELS	2
-#define DEFAULT_RATE		44100
+#define DEFAULT_RATE		48000
 
 #define MAX_BUFFERS	16
 #define MAX_PORTS	1
diff --git a/spa/plugins/volume/volume.c b/spa/plugins/volume/volume.c
index 40556a33c..fe6fcc4f4 100644
--- a/spa/plugins/volume/volume.c
+++ b/spa/plugins/volume/volume.c
@@ -39,6 +39,9 @@
 
 #define NAME "volume"
 
+#define DEFAULT_RATE		48000
+#define DEFAULT_CHANNELS	2
+
 #define DEFAULT_VOLUME 1.0
 #define DEFAULT_MUTE false
 
@@ -322,8 +325,10 @@ static int port_enum_formats(void *object,
 							SPA_AUDIO_FORMAT_S16,
 							SPA_AUDIO_FORMAT_S16,
 							SPA_AUDIO_FORMAT_S32),
-			SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX),
-			SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX));
+			SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_RANGE_Int(
+							DEFAULT_RATE, 1, INT32_MAX),
+			SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
+							DEFAULT_CHANNELS, 1, INT32_MAX));
 		break;
 	default:
 		return 0;