From 22b149d1fb2513554c19e131c404466ebc7a6976 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 25 Jul 2019 14:43:27 -0400 Subject: navigation: Switch to pipewire output Update patch for the navigation app's talk scripts to use the gstreamer pipewire output sink, and set the media role stream property appropriately. Bug-AGL: SPEC-2634 Change-Id: Ibb1e588688be8af9eff9c8e3efa1ca4983920df7 Signed-off-by: Scott Murray (cherry picked from commit 6f3f6139089e2f283b785bb31a222e1290d12eb0) --- .../navigation/0001-switch-to-alsa-output.patch | 35 ---------------------- .../0001-switch-to-pipewire-output.patch | 34 +++++++++++++++++++++ recipes-demo-hmi/navigation/navigation_git.bb | 2 +- 3 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 recipes-demo-hmi/navigation/navigation/0001-switch-to-alsa-output.patch create mode 100644 recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch diff --git a/recipes-demo-hmi/navigation/navigation/0001-switch-to-alsa-output.patch b/recipes-demo-hmi/navigation/navigation/0001-switch-to-alsa-output.patch deleted file mode 100644 index 4ce9a430..00000000 --- a/recipes-demo-hmi/navigation/navigation/0001-switch-to-alsa-output.patch +++ /dev/null @@ -1,35 +0,0 @@ -gpsnavi: Switch to ALSA output - -Update the talk scripts to use ALSA output via gst-launch-1.0 instead -of PulseAudio's paplay. 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: Inappropriate [no upstream] - -Signed-off-by: Scott Murray - -diff --git a/flite_agl.in b/flite_agl.in -index 28b512c..67a09e5 100644 ---- a/flite_agl.in -+++ b/flite_agl.in -@@ -1,6 +1,6 @@ - #!/bin/sh - TMP=/tmp/navi.wav - echo "$1" | flite_hts_engine -m @datadir@/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP --paplay --property='media.role=Navi' $TMP -+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink - rm -f $TMP - -diff --git a/jtalk_agl.in b/jtalk_agl.in -index 76900f4..73c87e5 100644 ---- a/jtalk_agl.in -+++ b/jtalk_agl.in -@@ -1,6 +1,6 @@ - #!/bin/sh - TMP=/tmp/navi.wav - echo "$1" | open_jtalk -ow $TMP -m @exec_prefix@/share/Voice/mei/mei_normal.htsvoice -x @exec_prefix@/share/dic/ --paplay --property='media.role=Navi' $TMP -+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink - rm -f $TMP - diff --git a/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch b/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch new file mode 100644 index 00000000..53c1165d --- /dev/null +++ b/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch @@ -0,0 +1,34 @@ +gpsnavi: Switch to pipewire output + +Update the talk scripts to use pipewire output via gst-launch-1.0 +instead of PulseAudio's paplay. gstreamer is used to allow using the +pipewire output sink and set its media role property. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Scott Murray + +diff --git a/flite_agl.in b/flite_agl.in +index 28b512c..be41d66 100644 +--- a/flite_agl.in ++++ b/flite_agl.in +@@ -1,6 +1,6 @@ + #!/bin/sh + TMP=/tmp/navi.wav + echo "$1" | flite_hts_engine -m @datadir@/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP +-paplay --property='media.role=Navi' $TMP ++gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! pwaudiosink stream-properties="p,media.role=Navigation" + rm -f $TMP + +diff --git a/jtalk_agl.in b/jtalk_agl.in +index 76900f4..0ca6975 100644 +--- a/jtalk_agl.in ++++ b/jtalk_agl.in +@@ -1,6 +1,6 @@ + #!/bin/sh + TMP=/tmp/navi.wav + echo "$1" | open_jtalk -ow $TMP -m @exec_prefix@/share/Voice/mei/mei_normal.htsvoice -x @exec_prefix@/share/dic/ +-paplay --property='media.role=Navi' $TMP ++gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! pwaudiosink stream-properties="p,media.role=Navigation" + rm -f $TMP + diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb index 0a5f7579..fefc0584 100644 --- a/recipes-demo-hmi/navigation/navigation_git.bb +++ b/recipes-demo-hmi/navigation/navigation_git.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} += " agl-service-navigation " SRCREV="89dc0052aced411ef09f8e0034fb5cf2c96ee637" SRC_URI="git://github.com/AGLExport/gpsnavi.git;branch=agl \ - file://0001-switch-to-alsa-output.patch \ + file://0001-switch-to-pipewire-output.patch \ file://0002-openssl-1.1-fixes.patch \ file://0003-update-permissions.patch \ file://download_mapdata_jp.sh \ -- cgit 1.2.3-korg