From 4a138d957f7a3031cbe43b693fba4aa4647259fd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Jan 2014 00:35:05 +0100 Subject: highres timer breaks pulseaudio rtp stream sync on raspberry pi --- mk/modules.mk | 4 ---- target/arm/kernel/raspberry-pi | 3 +-- target/linux/config/Config.in.audio | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/mk/modules.mk b/mk/modules.mk index ef4870dd1..d959d7453 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1163,10 +1163,6 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) -$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\ - $(MODULES_DIR)/kernel/sound/core/snd-hrtimer \ -,41)) - $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index debb98417..2a1450ca3 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_FIQ=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_KUSER_HELPERS=y -CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y CONFIG_ARCH_BCM2708=y @@ -10,7 +10,6 @@ CONFIG_MACH_BCM2708=y CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y -CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_VFP=y CONFIG_DTC=y diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 8c4d7d751..dc2ff100f 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -31,9 +31,6 @@ config ADK_KERNEL_SND_MIXER_OSS config ADK_KERNEL_SND_PCM_OSS boolean -config ADK_KERNEL_SND_HRTIMER - boolean - config ADK_KPACKAGE_KMOD_SOUND tristate @@ -132,7 +129,6 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 tristate select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_HRTIMER depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -- cgit v1.2.3 From 4d9ef7d8607081d0825f4dd5ed4110fc5a7619c5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Jan 2014 01:09:52 +0100 Subject: finetune config, default receiver --- package/pulseaudio/files/daemon.conf | 14 +++++--------- package/pulseaudio/files/system.pa | 8 ++++++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf index cfb58724d..98eed108e 100644 --- a/package/pulseaudio/files/daemon.conf +++ b/package/pulseaudio/files/daemon.conf @@ -14,13 +14,9 @@ exit-idle-time = -1 load-default-script-file = yes default-script-file = /etc/pulse/system.pa log-target = syslog -log-level = error +log-level = 2 log-time = yes -; default-sample-format = s16le -; default-sample-rate = 44100 -; alternate-sample-rate = 48000 -; default-sample-channels = 2 -; default-channel-map = front-left,front-right - -; default-fragments = 4 -; default-fragment-size-msec = 25 +default-sample-rate = 48000 +resample-method = src-sinc-fastest +default-fragments = 10 +default-fragment-size-msec = 10 diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa index 035f4a6db..9b8dafc48 100644 --- a/package/pulseaudio/files/system.pa +++ b/package/pulseaudio/files/system.pa @@ -22,6 +22,10 @@ load-module module-always-sink ### Enable positioned event sounds load-module module-position-event-sounds -load-module module-null-sink sink_name=rtp format=s16be channels=2 -load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 +# configure as a rtp sender +#load-module module-null-sink sink_name=rtp format=s16be channels=2 +#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 +# configure as a rtp receiver +load-module module-rtp-recv sap_address=224.0.0.56 +load-module module-alsa-sink device=hw:0,0 -- cgit v1.2.3 From 6ff561a24d4e80858405223c4ef6802f39c0ccf2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Jan 2014 01:59:47 +0100 Subject: more examples, use rtp loop to make a single rpi a sender and receiver without echo --- package/pulseaudio/files/daemon.conf | 4 ++-- package/pulseaudio/files/system.pa | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf index 98eed108e..38b8d4c26 100644 --- a/package/pulseaudio/files/daemon.conf +++ b/package/pulseaudio/files/daemon.conf @@ -8,13 +8,13 @@ fail = yes system-instance = yes enable-shm = no realtime-scheduling = yes -realtime-priority = 5 +realtime-priority = 9 resample-method = src-sinc-fastest exit-idle-time = -1 load-default-script-file = yes default-script-file = /etc/pulse/system.pa log-target = syslog -log-level = 2 +log-level = 1 log-time = yes default-sample-rate = 48000 resample-method = src-sinc-fastest diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa index 9b8dafc48..671ddbec1 100644 --- a/package/pulseaudio/files/system.pa +++ b/package/pulseaudio/files/system.pa @@ -26,6 +26,17 @@ load-module module-position-event-sounds #load-module module-null-sink sink_name=rtp format=s16be channels=2 #load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 +# configure as a rtp receiver and sender +#load-module module-null-sink sink_name=rtp format=s16be channels=2 +#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 loop=1 +#load-module module-alsa-sink device=hw:0,0 sink_name=alsa +#load-module module-rtp-recv sap_address=224.0.0.56 sink=alsa + +# configure combine-sink (echo in the same room) +#load-module module-alsa-sink device=hw:0,0 sink_name=alsa +#load-module module-combine-sink slaves=rtp,alsa + # configure as a rtp receiver load-module module-rtp-recv sap_address=224.0.0.56 load-module module-alsa-sink device=hw:0,0 + -- cgit v1.2.3 From 610ad706c4c74a65a14b0e29dda22959855a2a57 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Jan 2014 02:01:45 +0100 Subject: set default samplerate to 44100 --- package/pulseaudio/files/daemon.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf index 38b8d4c26..69de9fdc6 100644 --- a/package/pulseaudio/files/daemon.conf +++ b/package/pulseaudio/files/daemon.conf @@ -16,7 +16,7 @@ default-script-file = /etc/pulse/system.pa log-target = syslog log-level = 1 log-time = yes -default-sample-rate = 48000 +default-sample-rate = 44100 resample-method = src-sinc-fastest default-fragments = 10 default-fragment-size-msec = 10 -- cgit v1.2.3