diff options
Diffstat (limited to 'recipes-multimedia/pulseaudio/pulseaudio')
-rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch | 32 | ||||
-rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch (renamed from recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch) | 0 | ||||
-rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf | 2 | ||||
-rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa | 2 |
4 files changed, 35 insertions, 1 deletions
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch new file mode 100644 index 00000000..12a04cb7 --- /dev/null +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From c21e24f5c53e81fc715905c54a6c82b69e397e63 Mon Sep 17 00:00:00 2001 | ||
2 | From: "shengjiu.wang" <b02247@freescale.com> | ||
3 | Date: Thu, 3 Apr 2014 14:22:02 +0800 | ||
4 | Subject: [PATCH] Fix pulseaudio mutex issue when do pause in gstreamer | ||
5 | |||
6 | The error log is "Assertion 'pthread_mutex_unlock(&m->mutex) == 0' | ||
7 | failed at pulsecore/mutex-posix.c:106, function pa_mutex_unlock(). Aborting" | ||
8 | |||
9 | This fix is a workaround base on the solution from this link " | ||
10 | https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/932096" | ||
11 | |||
12 | Upstream status: Inappropriate [i.MX specific] | ||
13 | Signed-off-by: shengjiu.wang <b02247@freescale.com> | ||
14 | --- | ||
15 | src/pulsecore/mutex-posix.c | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c | ||
19 | index 36c2787..d592501 100644 | ||
20 | --- a/src/pulsecore/mutex-posix.c | ||
21 | +++ b/src/pulsecore/mutex-posix.c | ||
22 | @@ -30,6 +30,7 @@ | ||
23 | #include <pulsecore/macro.h> | ||
24 | |||
25 | #include "mutex.h" | ||
26 | +#undef HAVE_PTHREAD_PRIO_INHERIT | ||
27 | |||
28 | struct pa_mutex { | ||
29 | pthread_mutex_t mutex; | ||
30 | -- | ||
31 | 1.7.9.5 | ||
32 | |||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch index 57c28741..57c28741 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch | |||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf index 9eb954bb..b9f533a0 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf | |||
@@ -76,6 +76,8 @@ rlimit-rttime = 4000000 | |||
76 | ; default-sample-format = s16le | 76 | ; default-sample-format = s16le |
77 | ; default-sample-rate = 44100 | 77 | ; default-sample-rate = 44100 |
78 | ; alternate-sample-rate = 48000 | 78 | ; alternate-sample-rate = 48000 |
79 | # Disable alternate-sample-rate by setting same as default | ||
80 | alternate-sample-rate = 44100 | ||
79 | ; default-sample-channels = 2 | 81 | ; default-sample-channels = 2 |
80 | ; default-channel-map = front-left,front-right | 82 | ; default-channel-map = front-left,front-right |
81 | 83 | ||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa index 83a6ba8d..b6c646b9 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa | |||
@@ -72,7 +72,7 @@ load-module module-bluetooth-policy | |||
72 | .endif | 72 | .endif |
73 | 73 | ||
74 | .ifexists module-bluetooth-discover.so | 74 | .ifexists module-bluetooth-discover.so |
75 | load-module module-bluetooth-discover | 75 | load-module module-bluetooth-discover headset=auto |
76 | .endif | 76 | .endif |
77 | 77 | ||
78 | ### Load several protocols | 78 | ### Load several protocols |