diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-06-26 21:04:24 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-06-26 21:09:36 -0400 |
| commit | 9c3a673987e169539c75e6b57d80dd61f8eb78d9 (patch) | |
| tree | 5356bb580b42c5ad4455b26d63ace901709fb0dc /recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch | |
| parent | d61b4d3a028d7abc74cbcb9bad4cf1d21eb3f087 (diff) | |
ondemandnavi: add patches for pipewire and running as non-roothalibut_7.99.2halibut/7.99.27.99.2
Changes include:
* Add a patch to replace the use of 4A via 4a-play with just using
ALSA via a gst-launch pipeline. gstreamer is used to provide the
flexibility to easily switch to a pipewire output sink and likely
add back setting a role via a property.
* Add a patch to set the new audio and display permissions for running
as non-root.
These patches should be removed when they get upstream.
Bug-AGL: SPEC-2576
Change-Id: I5d24bb7c1d263a664d1c924f01d118d6d351d232
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch')
| -rw-r--r-- | recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch b/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch new file mode 100644 index 000000000..a93e8f987 --- /dev/null +++ b/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch @@ -0,0 +1,34 @@ +ondemandnavi: Switch to ALSA output + +Update the talk scripts to use ALSA output via gst-launch-1.0 instead +of 4A's 4a-play. gstreamer is used since it is likely that a further +revision will change to a pipewire output sink and add back setting a +role property. + +Upstream-Status: pending + +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +diff --git a/package/flite b/package/flite +index 4c17b80..c837149 100755 +--- a/package/flite ++++ b/package/flite +@@ -1,5 +1,4 @@ + #!/bin/sh + TMP=/tmp/navi.wav + echo "$1" | flite_hts_engine -m /usr/share/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP +-4a-play $TMP hw:0,0,3 navigation +- ++gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink +diff --git a/package/jtalk b/package/jtalk +index ed82281..c075317 100755 +--- a/package/jtalk ++++ b/package/jtalk +@@ -1,6 +1,4 @@ + #!/bin/sh + TMP=/tmp/navi.wav + echo "$1" | open_jtalk -ow $TMP -m /usr/share/Voice/mei/mei_normal.htsvoice -x /usr/share/dic/ +-4a-play $TMP hw:0,0,3 navigation +- +- ++gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink |