mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: make default samplerate 48000

Browse source 
Remove some 44100 default rates and use 48000 instead.
This commit is contained in:
Wim Taymans 2022-09-05 12:21:20 +02:00
parent cad7db9f58
commit 7b432aec88
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/alsa/acp/acp.c
View file

@ -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.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; impl->ucm.default_sample_spec.channels = 2;
pa_channel_map_init_extend(&impl->ucm.default_channel_map, pa_channel_map_init_extend(&impl->ucm.default_channel_map,
impl->ucm.default_sample_spec.channels, PA_CHANNEL_MAP_ALSA); impl->ucm.default_sample_spec.channels, PA_CHANNEL_MAP_ALSA);

9
spa/plugins/audiomixer/audiomixer.c
View file

@ -45,6 +45,9 @@
#define SPA_LOG_TOPIC_DEFAULT log_topic #define SPA_LOG_TOPIC_DEFAULT log_topic
static struct spa_log_topic *log_topic = &SPA_LOG_TOPIC(0, "spa.audiomixer"); 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_BUFFERS 64
#define MAX_PORTS 128 #define MAX_PORTS 128
#define MAX_CHANNELS 64 #define MAX_CHANNELS 64
@ -353,8 +356,10 @@ static int port_enum_formats(void *object,
SPA_AUDIO_FORMAT_U24_32, SPA_AUDIO_FORMAT_U24_32,
SPA_AUDIO_FORMAT_F32, SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F64), SPA_AUDIO_FORMAT_F64),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX), SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX)); DEFAULT_RATE, 1, INT32_MAX),
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
DEFAULT_CHANNELS, 1, INT32_MAX));
} }
break; break;
default: default:

9
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -55,6 +55,9 @@ enum wave_type {
WAVE_SQUARE, WAVE_SQUARE,
}; };
#define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS 2
#define DEFAULT_LIVE true #define DEFAULT_LIVE true
#define DEFAULT_WAVE WAVE_SINE #define DEFAULT_WAVE WAVE_SINE
#define DEFAULT_FREQ 440.0 #define DEFAULT_FREQ 440.0
@ -583,8 +586,10 @@ port_enum_formats(struct impl *this,
SPA_AUDIO_FORMAT_S32, SPA_AUDIO_FORMAT_S32,
SPA_AUDIO_FORMAT_F32, SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F64), SPA_AUDIO_FORMAT_F64),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX), SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX)); DEFAULT_RATE, 1, INT32_MAX),
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
DEFAULT_CHANNELS, 1, INT32_MAX));
break; break;
default: default:
return 0; return 0;

2
spa/plugins/support/null-audio-sink.c
View file

@ -71,7 +71,7 @@ static void reset_props(struct props *props)
} }
#define DEFAULT_CHANNELS 2 #define DEFAULT_CHANNELS 2
#define DEFAULT_RATE 44100 #define DEFAULT_RATE 48000
#define MAX_BUFFERS 16 #define MAX_BUFFERS 16
#define MAX_PORTS 1 #define MAX_PORTS 1

9
spa/plugins/volume/volume.c
View file

@ -39,6 +39,9 @@
#define NAME "volume" #define NAME "volume"
#define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS 2
#define DEFAULT_VOLUME 1.0 #define DEFAULT_VOLUME 1.0
#define DEFAULT_MUTE false #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_S16, SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_S32), SPA_AUDIO_FORMAT_S32),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(44100, 1, INT32_MAX), SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, INT32_MAX)); DEFAULT_RATE, 1, INT32_MAX),
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(
DEFAULT_CHANNELS, 1, INT32_MAX));
break; break;
default: default:
return 0; return 0;