From dacaccc8d4b02873e57fffca3d2fbdc8de140007 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 17 Jul 2018 18:07:45 +0200 Subject: Initialize repository with .gitignore, LICENSE, README.md Change-Id: I1477c81706bc2909edce03e753ad76d6ac8f275c Signed-off-by: Stephane Desneux --- .gitignore | 2 + LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 35 +++++++++++ 3 files changed, 238 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..945388b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp +.vscode diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..17b543b --- /dev/null +++ b/README.md @@ -0,0 +1,35 @@ +# 4a-tools + +This repository contains tools, scripts and data to test the 4A stack (Advanced AGL Audio Architecture). + +4A is related to [AGL project](https://www.automotivelinux.org/) + +## References + +### Presentation + +* [4a-proposal-Feb18] +* [4a-roadmap-Apr18] +* [4a-HALs-by-fiberdyne] +* [4a-presentation-by-audiokinetics] + +### 4A repositories + +Repositories related to 4A: + +* [agl-service-audio-4a]: high level API providing simple, unified entry point for all AGL audio applications +* [4a-hal-generic]: HAL manager and default HALs (hardware abstraction layers) +* [4a-alsa-core]: low level binding to wrap ALSA core operations +* [4a-softmixer]: reference software mixer using ALSA snd-aloop driver and a user space mixer +* [apps/mixer]: Mixer Application + +[4a-alsa-core]:https://git.automotivelinux.org/src/4a-alsa-core/ +[4a-hal-generic]:https://github.com/iotbzh/4a-hal-generic +[4a-softmixer]:https://github.com/iotbzh/4a-softmixer +[agl-service-audio-4a]:https://git.automotivelinux.org/apps/agl-service-audio-4a/ +[apps/mixer]:https://git.automotivelinux.org/apps/mixer/ + +[4a-proposal-Feb18]:https://iot.bzh/en/publications/32-2018/67-agl-audio-advanced-architecture +[4a-roadmap-Apr18]:https://iot.bzh/en/publications/32-2018/73-iotbzh-agl-4a-audio-roadmap-apr-18 +[4a-HALs-by-fiberdyne]:https://wiki.automotivelinux.org/_media/agl-distro/201804_aglf2f_fddsp-4a-audio-hal.pptx +[4a-presentation-by-audiokinetics]:https://schd.ws/hosted_files/aglammeu17/aa/HighLevelAudio_DresdenAMM_Final_0.pdf -- cgit From 5ff9151235a33e79e9f75f91b4f63e8dcd00f419 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 17 Jul 2018 23:18:32 +0200 Subject: data: add sample MP3 Change-Id: If1ba70781ef4b1045fe943aaa8512041725ccb11 Signed-off-by: Stephane Desneux --- share/OrchestralBackgroundMusic.mp3 | Bin 0 -> 2149250 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 share/OrchestralBackgroundMusic.mp3 diff --git a/share/OrchestralBackgroundMusic.mp3 b/share/OrchestralBackgroundMusic.mp3 new file mode 100644 index 0000000..0507784 Binary files /dev/null and b/share/OrchestralBackgroundMusic.mp3 differ -- cgit From 534c6d7633a566d117ec3a8cd4563283e85b1a77 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 18 Jul 2018 13:52:48 +0200 Subject: Add Make file Signed-off-by: Ronan Le Martret --- Makefile | 18 ++++++++++++++++++ media/OrchestralBackgroundMusic.mp3 | Bin 0 -> 2149250 bytes share/OrchestralBackgroundMusic.mp3 | Bin 2149250 -> 0 bytes 3 files changed, 18 insertions(+) create mode 100644 Makefile create mode 100644 media/OrchestralBackgroundMusic.mp3 delete mode 100644 share/OrchestralBackgroundMusic.mp3 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..46328b4 --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ +PREFIX=/usr/local + +MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +MEDIA=$(wildcard $(MAKEFILE_DIR)/media/*) + +all: help + +help: + @echo "Usage (root access required):" + @echo "* make install" + +install: $(MEDIA) + @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/media" + mkdir -p $(DESTDIR)/media + install $(MEDIA) -m 750 $(DESTDIR)/media + +clean: + @rm -vf $(SCRIPTS) diff --git a/media/OrchestralBackgroundMusic.mp3 b/media/OrchestralBackgroundMusic.mp3 new file mode 100644 index 0000000..0507784 Binary files /dev/null and b/media/OrchestralBackgroundMusic.mp3 differ diff --git a/share/OrchestralBackgroundMusic.mp3 b/share/OrchestralBackgroundMusic.mp3 deleted file mode 100644 index 0507784..0000000 Binary files a/share/OrchestralBackgroundMusic.mp3 and /dev/null differ -- cgit From 8afcd54b999813b220b7499d3b080373be25138e Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 19 Jul 2018 13:04:37 +0200 Subject: add script 4a-get_roles for elementary test of 4A high level API Change-Id: I61c9982e73fbc894307da8e29c5c062b136b4d84 Signed-off-by: Stephane Desneux --- Makefile | 14 +++++++++++--- TODO | 6 ++++++ bin/4a-get_roles | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 TODO create mode 100644 bin/4a-get_roles diff --git a/Makefile b/Makefile index 46328b4..65393e0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ -PREFIX=/usr/local +DESTDIR?=/usr/local MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +SCRIPTS=$(wildcard $(MAKEFILE_DIR)/bin/*) MEDIA=$(wildcard $(MAKEFILE_DIR)/media/*) all: help @@ -8,11 +10,17 @@ all: help help: @echo "Usage (root access required):" @echo "* make install" + @echo " will install scripts in $(DESTDIR)" + @echo "* make install DESTDIR=/usr" + @echo " changes the destination dir (in this example, the scripts will be installed in /usr/bin)" install: $(MEDIA) + @echo "Installing audio scripts $(notdir $(SCRIPTS)) into $(DESTDIR)/bin" + mkdir -p $(DESTDIR)/bin + install $(SCRIPTS) -m 750 $(DESTDIR)/bin @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/media" mkdir -p $(DESTDIR)/media - install $(MEDIA) -m 750 $(DESTDIR)/media + install $(MEDIA) -m 640 $(DESTDIR)/media clean: - @rm -vf $(SCRIPTS) + @echo "Cleanup done." diff --git a/TODO b/TODO new file mode 100644 index 0000000..56d4ec2 --- /dev/null +++ b/TODO @@ -0,0 +1,6 @@ +* push OGG file +* push WAV file +* add script for basic aplay on output card +* add script for basic aplay through loopback (softmixer) +* add script to play mp3 or ogg using gstreamer (gst-launch-1.0 ...) +* add script to play with mediaplayer api: list / play / stop / next / prev ... diff --git a/bin/4a-get_roles b/bin/4a-get_roles new file mode 100644 index 0000000..fc7f2d0 --- /dev/null +++ b/bin/4a-get_roles @@ -0,0 +1 @@ +afb-client-demo -d unix:/run/user/0/apis/ws/ahl-4a get_roles "" -- cgit From 15f0344df8bfbd8daf7a383bfccfa0d3cd7d75b9 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Fri, 20 Jul 2018 11:12:39 +0200 Subject: Added some tone wav to test audio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A 440Hz tone, encoded in 16, 24 and 32 bits, using a rate of 24Kz, 44.1Kzh and 48Kzh. Change-Id: I21b1ea2ace014df559c4c5f37ac9d8de3da49c01 Signed-off-by: Loïc Collignon --- media/tone-440-mono-24000-16bits.wav | Bin 0 -> 480044 bytes media/tone-440-mono-24000-24bits.wav | Bin 0 -> 720044 bytes media/tone-440-mono-24000-32bits.wav | Bin 0 -> 960080 bytes media/tone-440-mono-44100-16bits.wav | Bin 0 -> 882044 bytes media/tone-440-mono-44100-24bits.wav | Bin 0 -> 1323044 bytes media/tone-440-mono-44100-32bits.wav | Bin 0 -> 1764080 bytes media/tone-440-mono-48000-16bits.wav | Bin 0 -> 960044 bytes media/tone-440-mono-48000-24bits.wav | Bin 0 -> 1440044 bytes media/tone-440-mono-48000-32bits.wav | Bin 0 -> 1920080 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 media/tone-440-mono-24000-16bits.wav create mode 100644 media/tone-440-mono-24000-24bits.wav create mode 100644 media/tone-440-mono-24000-32bits.wav create mode 100644 media/tone-440-mono-44100-16bits.wav create mode 100644 media/tone-440-mono-44100-24bits.wav create mode 100644 media/tone-440-mono-44100-32bits.wav create mode 100644 media/tone-440-mono-48000-16bits.wav create mode 100644 media/tone-440-mono-48000-24bits.wav create mode 100644 media/tone-440-mono-48000-32bits.wav diff --git a/media/tone-440-mono-24000-16bits.wav b/media/tone-440-mono-24000-16bits.wav new file mode 100644 index 0000000..ce57beb Binary files /dev/null and b/media/tone-440-mono-24000-16bits.wav differ diff --git a/media/tone-440-mono-24000-24bits.wav b/media/tone-440-mono-24000-24bits.wav new file mode 100644 index 0000000..54d88b0 Binary files /dev/null and b/media/tone-440-mono-24000-24bits.wav differ diff --git a/media/tone-440-mono-24000-32bits.wav b/media/tone-440-mono-24000-32bits.wav new file mode 100644 index 0000000..6b6f5a5 Binary files /dev/null and b/media/tone-440-mono-24000-32bits.wav differ diff --git a/media/tone-440-mono-44100-16bits.wav b/media/tone-440-mono-44100-16bits.wav new file mode 100644 index 0000000..facb5d3 Binary files /dev/null and b/media/tone-440-mono-44100-16bits.wav differ diff --git a/media/tone-440-mono-44100-24bits.wav b/media/tone-440-mono-44100-24bits.wav new file mode 100644 index 0000000..ecb8475 Binary files /dev/null and b/media/tone-440-mono-44100-24bits.wav differ diff --git a/media/tone-440-mono-44100-32bits.wav b/media/tone-440-mono-44100-32bits.wav new file mode 100644 index 0000000..4237d49 Binary files /dev/null and b/media/tone-440-mono-44100-32bits.wav differ diff --git a/media/tone-440-mono-48000-16bits.wav b/media/tone-440-mono-48000-16bits.wav new file mode 100644 index 0000000..1baebde Binary files /dev/null and b/media/tone-440-mono-48000-16bits.wav differ diff --git a/media/tone-440-mono-48000-24bits.wav b/media/tone-440-mono-48000-24bits.wav new file mode 100644 index 0000000..abd6772 Binary files /dev/null and b/media/tone-440-mono-48000-24bits.wav differ diff --git a/media/tone-440-mono-48000-32bits.wav b/media/tone-440-mono-48000-32bits.wav new file mode 100644 index 0000000..1b262db Binary files /dev/null and b/media/tone-440-mono-48000-32bits.wav differ -- cgit From 24dd246d1ee3a53434dd1f21aa2afbeb55618ead Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Fri, 20 Jul 2018 15:56:23 +0200 Subject: Added a 4a-info script use to test if 4a can work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test various things to check if 4a can work in this environment. Change-Id: Ica4b739d7e8c6401db05a3b9b4d6ef9048ca1002 Signed-off-by: Loïc Collignon --- TODO | 9 +++++---- bin/4a-api | 23 +++++++++++++++++++++++ bin/4a-get_roles | 1 - bin/4a-gst | 3 +++ bin/4a-play | 1 + bin/4a-speaker-test | 1 + bin/4a-status | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 84 insertions(+), 5 deletions(-) create mode 100755 bin/4a-api delete mode 100644 bin/4a-get_roles create mode 100755 bin/4a-gst create mode 100644 bin/4a-play create mode 100644 bin/4a-speaker-test create mode 100755 bin/4a-status diff --git a/TODO b/TODO index 56d4ec2..436b8b3 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,7 @@ * push OGG file -* push WAV file -* add script for basic aplay on output card -* add script for basic aplay through loopback (softmixer) -* add script to play mp3 or ogg using gstreamer (gst-launch-1.0 ...) +* finish script 4a-api (calls to AHL/Hal-manager) +* add script for basic aplay on role or device +* add script for basic gst-launch on role or device +* add script for speaker test on role or device * add script to play with mediaplayer api: list / play / stop / next / prev ... +* add script to play with radio api diff --git a/bin/4a-api b/bin/4a-api new file mode 100755 index 0000000..4a26121 --- /dev/null +++ b/bin/4a-api @@ -0,0 +1,23 @@ +#!/bin/bash + +WS4A=unix:/run/user/0/apis/ws/ahl-4a + +afb-client-demo -H -d $WS4A get_roles "" + +# commandes HAL manager: +# 4a-hal-manager loaded +# 4a-hal-manager loaded { "verbose": true } <= +metadata +# 4a-hal-manager loaded { "all": true } <= hals avec un json +# 4a-hal-manager loaded { "all": true, "verbose":true } + +# open/close multimedia +#afb-client-demo -H -d $WS4A << EOF +#multimedia { "action":"open" } +#multimedia { "action":"close" } +#EOF + +# volume multimedia +#afb-client-demo -H -d $WS4A << EOF +#multimedia { "action":"open" } +#multimedia { "action":"close" } +#EOF diff --git a/bin/4a-get_roles b/bin/4a-get_roles deleted file mode 100644 index fc7f2d0..0000000 --- a/bin/4a-get_roles +++ /dev/null @@ -1 +0,0 @@ -afb-client-demo -d unix:/run/user/0/apis/ws/ahl-4a get_roles "" diff --git a/bin/4a-gst b/bin/4a-gst new file mode 100755 index 0000000..9a06c83 --- /dev/null +++ b/bin/4a-gst @@ -0,0 +1,3 @@ +#!/bin/bash + +gst-launch-1.0 -v uridecodebin uri=file:///media/OrchestralBackgroundMusic.mp3 ! audioconvert ! audioresample ! alsasink device=hw:Loopback,0,2 diff --git a/bin/4a-play b/bin/4a-play new file mode 100644 index 0000000..894ab7f --- /dev/null +++ b/bin/4a-play @@ -0,0 +1 @@ +# TODO: play using aplay diff --git a/bin/4a-speaker-test b/bin/4a-speaker-test new file mode 100644 index 0000000..770ddfd --- /dev/null +++ b/bin/4a-speaker-test @@ -0,0 +1 @@ +# TODO: run speaker test diff --git a/bin/4a-status b/bin/4a-status new file mode 100755 index 0000000..519f470 --- /dev/null +++ b/bin/4a-status @@ -0,0 +1,51 @@ +#!/bin/bash + +set -o pipefail + +ERR="\\e[31mERROR\\e[0m" +WRN="\\e[33mWARNING\\e[0m" +SUC="\\e[32mSUCCESS\\e[0m" + +function cout { + echo -e "$*" +} + +EXIT_CODE=0 + +SOUND_CARDS=$( LANG="C" aplay -l | grep -oEe "^card\\s+[^\\[]+" | cut -d':' -f2 | uniq ) + +cout " -- Is snd-aloop is available?" +if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=y" > /dev/null; then + cout " -- $SUC: Built into the kernel" +else + cout " -- $WRN: Not built into the kernel, devices order can randomly change!" + if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=m" > /dev/null; then + cout " -- $SUC: snd-aloop is provided!" + if lsmod | grep "snd_aloop" > /dev/null; then + cout " -- $SUC: snd-aloop is loaded!" + else + cout " -- $ERR: snd-aloop is not loaded! 4a-softmixer can't work, please load it using: modprobe snd-aloop" + fi + else + cout " -- $ERR: snd-aloop is not provided at all, 4a-softmixer can't work!" + EXIT_CODE=1 + fi +fi + +cout " -- Is 4a running?" +if ps x | grep "service-audio-4a" | grep -v "grep" > /dev/null; then + cout " -- $SUC: Service is currently running!" +else + cout " -- $WRN: Service is not currently running!" +fi + + +#SERVICE_FILE=$( basename "$( ls "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a--"* )" ) + +cout +cout "Found audio cards:" +for card in $SOUND_CARDS; do + cout " - $card" +done + +exit $EXIT_CODE -- cgit From f1d27f1cc790a80ec37b5faf20681c8bd8039351 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sat, 21 Jul 2018 02:17:40 +0200 Subject: Add sample OGG file Change-Id: I2bf85dce7a78be2980f4f487f8024cdb4f1ba26f Signed-off-by: Stephane Desneux --- media/Happy_MBB_75.ogg | Bin 0 -> 3635015 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 media/Happy_MBB_75.ogg diff --git a/media/Happy_MBB_75.ogg b/media/Happy_MBB_75.ogg new file mode 100644 index 0000000..331cba9 Binary files /dev/null and b/media/Happy_MBB_75.ogg differ -- cgit From 28e86894895d16d1a707fd218990a0a58403bee8 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sat, 21 Jul 2018 02:48:47 +0200 Subject: fix modes scripts Change-Id: I2c5d4ff7d6c3107d814bbcabe8870af18ac3c525 Signed-off-by: Stephane Desneux --- bin/4a-play | 0 bin/4a-speaker-test | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/4a-play mode change 100644 => 100755 bin/4a-speaker-test diff --git a/bin/4a-play b/bin/4a-play old mode 100644 new mode 100755 diff --git a/bin/4a-speaker-test b/bin/4a-speaker-test old mode 100644 new mode 100755 -- cgit From e8b23b37394800332baf1ffc9b9777c67dc664cd Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sat, 21 Jul 2018 16:17:44 +0200 Subject: change media paths Change-Id: I0d4783d37da25a315073eb847c7f525ed1b51d5c Signed-off-by: Stephane Desneux --- Makefile | 8 ++++---- bin/4a-api | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- bin/4a-play | 18 +++++++++++++++++- bin/4a-status | 53 ++++++++++++++++++++++++++--------------------------- bin/lib4a-tools.sh | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 34 deletions(-) create mode 100644 bin/lib4a-tools.sh diff --git a/Makefile b/Makefile index 65393e0..906432b 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,13 @@ help: @echo "* make install DESTDIR=/usr" @echo " changes the destination dir (in this example, the scripts will be installed in /usr/bin)" -install: $(MEDIA) +install: $(SCRIPTS) $(MEDIA) @echo "Installing audio scripts $(notdir $(SCRIPTS)) into $(DESTDIR)/bin" mkdir -p $(DESTDIR)/bin install $(SCRIPTS) -m 750 $(DESTDIR)/bin - @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/media" - mkdir -p $(DESTDIR)/media - install $(MEDIA) -m 640 $(DESTDIR)/media + @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/4a/media" + mkdir -p $(DESTDIR)/4a/media + install $(MEDIA) -m 640 $(DESTDIR)/4a/media clean: @echo "Cleanup done." diff --git a/bin/4a-api b/bin/4a-api index 4a26121..1e1bb39 100755 --- a/bin/4a-api +++ b/bin/4a-api @@ -1,8 +1,57 @@ #!/bin/bash -WS4A=unix:/run/user/0/apis/ws/ahl-4a +# load shell lib +. $(dirname $BASH_SOURCE)/lib4a-tools.sh -afb-client-demo -H -d $WS4A get_roles "" +cmd=$1 +shift + +function usage() { + log "Usage: $0 [opts]" + log "Commands:" + log " help: show this help" + log " api [args]: send direct request to API verb with args" + log " roles: get AHL roles" + log " hals [-a|--all] [-v|--verbose]: get HALs status" + log " mediaplayer ... : interact with mediaplayer service" + log " radio ... : interact with radio service" + exit 1 +} + +case $cmd in + roles) + 4a-client ahl-4a get_roles "" + ;; + api) + 4a-client "$@" + ;; + hals) + verbose=false + all=false + while [[ -n "$1" ]]; do + case $1 in + -a|--all) all=true;; + -v|--verbose) verbose=true;; + -av) all=true; verbose=true;; + esac + shift + done + 4a-client 4a-hal-manager loaded "{'verbose':$verbose,'all':$all}" + ;; + mediaplayer) + echo "TODO" + ;; + radio) + echo "TODO" + ;; + help|-h|--help) + usage + ;; + *) + error "Invalid command" + usage + ;; +esac # commandes HAL manager: # 4a-hal-manager loaded diff --git a/bin/4a-play b/bin/4a-play index 894ab7f..483b892 100755 --- a/bin/4a-play +++ b/bin/4a-play @@ -1 +1,17 @@ -# TODO: play using aplay +#!/bin/bash + +# load shell lib +. $(dirname $BASH_SOURCE)/lib4a-tools.sh + +function usage() { + log "Usage: $0 [role:file2 ...]" + log "Available roles:" + exit 1 +} + +[[ $# == 0 ]] && usage + +for x in "$@"; do + log "Playing $x ..." + aplay -D Loopback,0,2 $x +done diff --git a/bin/4a-status b/bin/4a-status index 519f470..c3e361e 100755 --- a/bin/4a-status +++ b/bin/4a-status @@ -1,51 +1,50 @@ #!/bin/bash -set -o pipefail +# load shell lib +. $(dirname $BASH_SOURCE)/lib4a-tools.sh -ERR="\\e[31mERROR\\e[0m" -WRN="\\e[33mWARNING\\e[0m" -SUC="\\e[32mSUCCESS\\e[0m" +set -o pipefail -function cout { - echo -e "$*" -} +ERR="${color_red}ERROR${color_none}" +WRN="${color_yellow}WARNING${color_none}" +SUC="${color_green}SUCCESS${color_none}" EXIT_CODE=0 -SOUND_CARDS=$( LANG="C" aplay -l | grep -oEe "^card\\s+[^\\[]+" | cut -d':' -f2 | uniq ) +# ------------------- enumerate sound cards ------------------------ + +log "---- Audio cards detected ----" +LANG="C" aplay -l | grep -oEe "^card\\s+[^\\[]+" | sort -u + +# -------------------- snd-aloop ------------------------ -cout " -- Is snd-aloop is available?" +log "" +log "---- snd-aloop driver availability ----" if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=y" > /dev/null; then - cout " -- $SUC: Built into the kernel" + log "$SUC: Built into the kernel" else - cout " -- $WRN: Not built into the kernel, devices order can randomly change!" + log "$WRN: Not built into the kernel, devices order can randomly change!" if zcat /proc/config.gz | grep "CONFIG_SND_ALOOP=m" > /dev/null; then - cout " -- $SUC: snd-aloop is provided!" + log "$SUC: snd-aloop is provided!" if lsmod | grep "snd_aloop" > /dev/null; then - cout " -- $SUC: snd-aloop is loaded!" + log "$SUC: snd-aloop is loaded!" else - cout " -- $ERR: snd-aloop is not loaded! 4a-softmixer can't work, please load it using: modprobe snd-aloop" + log "$ERR: snd-aloop is not loaded! 4a-softmixer can't work, please load it using: modprobe snd-aloop" fi else - cout " -- $ERR: snd-aloop is not provided at all, 4a-softmixer can't work!" + log "$ERR: snd-aloop is not provided at all, 4a-softmixer can't work!" EXIT_CODE=1 fi fi -cout " -- Is 4a running?" +log "" +log "---- 4a service status ----" if ps x | grep "service-audio-4a" | grep -v "grep" > /dev/null; then - cout " -- $SUC: Service is currently running!" + log "$SUC: Service is currently running!" else - cout " -- $WRN: Service is not currently running!" + log "$WRN: Service is not currently running!" + log "It can be started using the following command:" + log "systemctl restart *agl-service-audio-4a*.service" fi - -#SERVICE_FILE=$( basename "$( ls "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a--"* )" ) - -cout -cout "Found audio cards:" -for card in $SOUND_CARDS; do - cout " - $card" -done - exit $EXIT_CODE diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh new file mode 100644 index 0000000..4029046 --- /dev/null +++ b/bin/lib4a-tools.sh @@ -0,0 +1,35 @@ +stdout_in_terminal=0 +[[ -t 1 ]] && stdout_in_terminal=1 +function color { + [[ $stdout_in_terminal == 0 ]] && return + for k in $*; do + case $k in + bold) tput bold 2>/dev/null;; + none) tput sgr0 2>/dev/null;; + *) tput setaf $k 2>/dev/null;; + esac + done +} +color_green=$(color bold 2) +color_yellow=$(color bold 3) +color_red=$(color bold 1) +color_blue=$(color bold 4) +color_none=$(color none) + +function error() { echo "${color_red}$@${color_none}" >&2; } +function warning() { echo "${color_yellow}$@${color_none}" >&2; } +function info() { echo "${color_green}$@${color_none}" >&2; } +function log() { echo "$@" >&2; } +function debug() { [[ "$DEBUG" == 1 ]] && echo "${color_blue}DEBUG:" "$@" "${color_none}" >&2; } + +function 4a-client() { + # get port for audio service + local port=$(grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=') + + debug "Detected 4A service on port $port" + afb-client-demo -H "localhost:$port/api?token=HELLO&uuid=magic" "$@" +} + +function 4a-roles() { + 4a-client ahl-4a get_roles "" | tail -n +2 | jq '.response|.[]' +} -- cgit From 2dab36eb25c37d8c6534b3e181e8aea94f72e388 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Sun, 22 Jul 2018 16:15:49 +0200 Subject: Added a way to make 4a-api work on host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On host you can't detect the API port and token based on the systemd unit file. So when the file is not found, use API_4A_PORT and API_4A_TOKEN environment variable to allow users to make it work on host so they can still test 4a. Change-Id: I6379457c29c9e45db9cce8c78f6d646935b2caa5 Signed-off-by: Loïc Collignon --- bin/lib4a-tools.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh index 4029046..ab0ee18 100644 --- a/bin/lib4a-tools.sh +++ b/bin/lib4a-tools.sh @@ -24,10 +24,21 @@ function debug() { [[ "$DEBUG" == 1 ]] && echo "${color_blue}DEBUG:" "$@" "${col function 4a-client() { # get port for audio service - local port=$(grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=') + local port="" + local token="HELLO" - debug "Detected 4A service on port $port" - afb-client-demo -H "localhost:$port/api?token=HELLO&uuid=magic" "$@" + if [ -f "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service" ]; then + log "Detected systemd unit file!" + port=$( grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=' ) + log "Port detected: $port" + else + log "No systemd unit file detected, assuming running on host, please set 'API_4A_PORT' and 'API_4A_TOKEN' environment variables to correct values!" + port=${API_4A_PORT:-1234} + token=${API_4A_TOKEN:-"HELLO"} + log "Port: $port, token: $token" + fi + + afb-client-demo -H "localhost:$port/api?token=$token&uuid=magic" "$@" } function 4a-roles() { -- cgit From a7d8bd79006b87caf1af58ee4742f94fc59ea0d9 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Sun, 22 Jul 2018 17:51:13 +0200 Subject: Added a script to play any supported audio format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the gst-launch-1.0 command, play any supported audio format on specific device using a specific 4a role if any. Change-Id: I6fce14a5ccdb8aa5e0e1cb85ef365851427553b0 Signed-off-by: Loïc Collignon --- bin/gst-play | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 bin/gst-play diff --git a/bin/gst-play b/bin/gst-play new file mode 100755 index 0000000..46a6c4a --- /dev/null +++ b/bin/gst-play @@ -0,0 +1,56 @@ +#!/bin/bash + +# load shell lib +. $(dirname $BASH_SOURCE)/lib4a-tools.sh + +function usage() { + log "$0 [device] [role]" + log " - 'device' can be hw:X where X is a number or the device name." + log " It can also be hw:X,Y,Z, it is used when playing on the loopback card" + log " which is the 4a default sink." + log " Default: hw:Loopback,0,2" + log " - 'role' is the 4a role to use. In future version it will be guessed" + log " based on the device. Use '4a-api roles' to get a list of known roles" + log " Default: multimedia" +} + +if [ "$#" == "0" ]; then + error "No file to play!" + usage +fi + +FILEPATH="$( realpath "$1" )" +DEVICE=${2:-'hw:Loopback,0,2'} +ROLE=${3:-'multimedia'} + +CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 ) + +log "Play '$FILEPATH' on '$DEVICE'" + +LOOPBACK_CARDID=$( LANG="C" aplay -l | grep -oEe "^card\\s+[0-9]: Loopback" | uniq | grep -oEe "[0-9]+" ) +if [ "$CARDID" == "Loopback" ] || [ "$CARDID" == "$LOOPBACK_CARDID" ]; then + IS_4A_DEVICE=1 +else + IS_4A_DEVICE=0 +fi + +if [ "$IS_4A_DEVICE" == "1" ]; then + log "The selected card (hw:$CARDID) is handle by 4a, call open on '$ROLE'" + 4a-client ahl-4a "$ROLE" '{ "action": "open" }' + + # BUG: afb-client-demo does not exit an exit code different from zero when api return an error + #if [ "$?" -ne "0" ]; then + # exit -1 + #fi +fi + +if [ "$DEBUG" == "1" ]; then + gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" +else + gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" > /dev/null +fi + +if [ "$IS_4A_DEVICE" == "1" ]; then + log "The selected card (hw;$CARDID) is handled by 4a, call close on '$ROLE'" + 4a-client ahl-4a "$ROLE" '{ "action": "close" }' +fi -- cgit From f43f3cb73ff3f8f9c20e8e9efe533ff19e9d3fc6 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Mon, 23 Jul 2018 00:48:19 +0200 Subject: Fix issue with the unit file detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a bug introduced by the commit e4e0b9b, due to the wildcard in the unit file. Change-Id: Iddc47378207a0ced207861433cd0ec02a52bc1a5 Signed-off-by: Loïc Collignon --- TODO | 7 ----- bin/4a-gst | 3 -- bin/4a-play | 56 ++++++++++++++++++++++++++++----- bin/4a-speaker-test | 1 - bin/gst-play | 56 --------------------------------- bin/lib4a-tools.sh | 3 +- media/tone-440-mono-24000-16bits.wav | Bin 480044 -> 0 bytes media/tone-440-mono-24000-24bits.wav | Bin 720044 -> 0 bytes media/tone-440-mono-24000-32bits.wav | Bin 960080 -> 0 bytes media/tone-440-mono-44100-32bits.wav | Bin 1764080 -> 0 bytes media/tone-440-mono-48000-32bits.wav | Bin 1920080 -> 0 bytes media/tone-440-stereo-44100-16bits.wav | Bin 0 -> 1764044 bytes media/tone-440-stereo-44100-24bits.wav | Bin 0 -> 2646044 bytes media/tone-440-stereo-48000-16bits.wav | Bin 0 -> 1920044 bytes media/tone-440-stereo-48000-24bits.wav | Bin 0 -> 2880044 bytes 15 files changed, 50 insertions(+), 76 deletions(-) delete mode 100644 TODO delete mode 100755 bin/4a-gst delete mode 100755 bin/4a-speaker-test delete mode 100755 bin/gst-play delete mode 100644 media/tone-440-mono-24000-16bits.wav delete mode 100644 media/tone-440-mono-24000-24bits.wav delete mode 100644 media/tone-440-mono-24000-32bits.wav delete mode 100644 media/tone-440-mono-44100-32bits.wav delete mode 100644 media/tone-440-mono-48000-32bits.wav create mode 100644 media/tone-440-stereo-44100-16bits.wav create mode 100644 media/tone-440-stereo-44100-24bits.wav create mode 100644 media/tone-440-stereo-48000-16bits.wav create mode 100644 media/tone-440-stereo-48000-24bits.wav diff --git a/TODO b/TODO deleted file mode 100644 index 436b8b3..0000000 --- a/TODO +++ /dev/null @@ -1,7 +0,0 @@ -* push OGG file -* finish script 4a-api (calls to AHL/Hal-manager) -* add script for basic aplay on role or device -* add script for basic gst-launch on role or device -* add script for speaker test on role or device -* add script to play with mediaplayer api: list / play / stop / next / prev ... -* add script to play with radio api diff --git a/bin/4a-gst b/bin/4a-gst deleted file mode 100755 index 9a06c83..0000000 --- a/bin/4a-gst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gst-launch-1.0 -v uridecodebin uri=file:///media/OrchestralBackgroundMusic.mp3 ! audioconvert ! audioresample ! alsasink device=hw:Loopback,0,2 diff --git a/bin/4a-play b/bin/4a-play index 483b892..620f311 100755 --- a/bin/4a-play +++ b/bin/4a-play @@ -4,14 +4,54 @@ . $(dirname $BASH_SOURCE)/lib4a-tools.sh function usage() { - log "Usage: $0 [role:file2 ...]" - log "Available roles:" - exit 1 + log "$0 [device] [role]" + log " - 'device' can be hw:X where X is a number or the device name." + log " It can also be hw:X,Y,Z, it is used when playing on the loopback card" + log " which is the 4a default sink." + log " Default: hw:Loopback,0,2" + log " - 'role' is the 4a role to use. In future version it will be guessed" + log " based on the device. Use '4a-api roles' to get a list of known roles" + log " Default: multimedia" } -[[ $# == 0 ]] && usage +if [ "$#" == "0" ]; then + error "No file to play!" + usage +fi + +FILEPATH="$( realpath "$1" )" +DEVICE=${2:-'hw:Loopback,0,2'} +ROLE=${3:-'multimedia'} + +CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 ) + +log "Play '$FILEPATH' on '$DEVICE'" + +LOOPBACK_CARDID=$( LANG="C" aplay -l | grep -oEe "^card\\s+[0-9]: Loopback" | uniq | grep -oEe "[0-9]+" ) +if [ "$CARDID" == "Loopback" ] || [ "$CARDID" == "$LOOPBACK_CARDID" ]; then + IS_4A_DEVICE=1 +else + IS_4A_DEVICE=0 +fi + +if [ "$IS_4A_DEVICE" == "1" ]; then + log "The selected card (hw:$CARDID) is handle by 4a, call open on '$ROLE'" + 4a-client ahl-4a "$ROLE" '{ "action": "open" }' + + # BUG: afb-client-demo does not exit an exit code different from zero when api return an error + #if [ "$?" -ne "0" ]; then + # exit -1 + #fi +fi + +if [ "$DEBUG" == "1" ]; then + gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" +else + gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" > /dev/null +fi + +if [ "$IS_4A_DEVICE" == "1" ]; then + log "The selected card (hw;$CARDID) is handled by 4a, call close on '$ROLE'" + 4a-client ahl-4a "$ROLE" '{ "action": "close" }' +fi -for x in "$@"; do - log "Playing $x ..." - aplay -D Loopback,0,2 $x -done diff --git a/bin/4a-speaker-test b/bin/4a-speaker-test deleted file mode 100755 index 770ddfd..0000000 --- a/bin/4a-speaker-test +++ /dev/null @@ -1 +0,0 @@ -# TODO: run speaker test diff --git a/bin/gst-play b/bin/gst-play deleted file mode 100755 index 46a6c4a..0000000 --- a/bin/gst-play +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# load shell lib -. $(dirname $BASH_SOURCE)/lib4a-tools.sh - -function usage() { - log "$0 [device] [role]" - log " - 'device' can be hw:X where X is a number or the device name." - log " It can also be hw:X,Y,Z, it is used when playing on the loopback card" - log " which is the 4a default sink." - log " Default: hw:Loopback,0,2" - log " - 'role' is the 4a role to use. In future version it will be guessed" - log " based on the device. Use '4a-api roles' to get a list of known roles" - log " Default: multimedia" -} - -if [ "$#" == "0" ]; then - error "No file to play!" - usage -fi - -FILEPATH="$( realpath "$1" )" -DEVICE=${2:-'hw:Loopback,0,2'} -ROLE=${3:-'multimedia'} - -CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 ) - -log "Play '$FILEPATH' on '$DEVICE'" - -LOOPBACK_CARDID=$( LANG="C" aplay -l | grep -oEe "^card\\s+[0-9]: Loopback" | uniq | grep -oEe "[0-9]+" ) -if [ "$CARDID" == "Loopback" ] || [ "$CARDID" == "$LOOPBACK_CARDID" ]; then - IS_4A_DEVICE=1 -else - IS_4A_DEVICE=0 -fi - -if [ "$IS_4A_DEVICE" == "1" ]; then - log "The selected card (hw:$CARDID) is handle by 4a, call open on '$ROLE'" - 4a-client ahl-4a "$ROLE" '{ "action": "open" }' - - # BUG: afb-client-demo does not exit an exit code different from zero when api return an error - #if [ "$?" -ne "0" ]; then - # exit -1 - #fi -fi - -if [ "$DEBUG" == "1" ]; then - gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" -else - gst-launch-1.0 -v uridecodebin uri="file://$FILEPATH" ! audioconvert ! audioresample ! alsasink device="$DEVICE" > /dev/null -fi - -if [ "$IS_4A_DEVICE" == "1" ]; then - log "The selected card (hw;$CARDID) is handled by 4a, call close on '$ROLE'" - 4a-client ahl-4a "$ROLE" '{ "action": "close" }' -fi diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh index ab0ee18..776b1c0 100644 --- a/bin/lib4a-tools.sh +++ b/bin/lib4a-tools.sh @@ -26,8 +26,9 @@ function 4a-client() { # get port for audio service local port="" local token="HELLO" + local unitfile=$( ls /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service ) - if [ -f "/var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service" ]; then + if [ -f "$unitfile" ]; then log "Detected systemd unit file!" port=$( grep -sr X-AFM-http /var/local/lib/systemd/system/afm-service-agl-service-audio-4a*.service | cut -f2 -d'=' ) log "Port detected: $port" diff --git a/media/tone-440-mono-24000-16bits.wav b/media/tone-440-mono-24000-16bits.wav deleted file mode 100644 index ce57beb..0000000 Binary files a/media/tone-440-mono-24000-16bits.wav and /dev/null differ diff --git a/media/tone-440-mono-24000-24bits.wav b/media/tone-440-mono-24000-24bits.wav deleted file mode 100644 index 54d88b0..0000000 Binary files a/media/tone-440-mono-24000-24bits.wav and /dev/null differ diff --git a/media/tone-440-mono-24000-32bits.wav b/media/tone-440-mono-24000-32bits.wav deleted file mode 100644 index 6b6f5a5..0000000 Binary files a/media/tone-440-mono-24000-32bits.wav and /dev/null differ diff --git a/media/tone-440-mono-44100-32bits.wav b/media/tone-440-mono-44100-32bits.wav deleted file mode 100644 index 4237d49..0000000 Binary files a/media/tone-440-mono-44100-32bits.wav and /dev/null differ diff --git a/media/tone-440-mono-48000-32bits.wav b/media/tone-440-mono-48000-32bits.wav deleted file mode 100644 index 1b262db..0000000 Binary files a/media/tone-440-mono-48000-32bits.wav and /dev/null differ diff --git a/media/tone-440-stereo-44100-16bits.wav b/media/tone-440-stereo-44100-16bits.wav new file mode 100644 index 0000000..d5c685f Binary files /dev/null and b/media/tone-440-stereo-44100-16bits.wav differ diff --git a/media/tone-440-stereo-44100-24bits.wav b/media/tone-440-stereo-44100-24bits.wav new file mode 100644 index 0000000..e800d37 Binary files /dev/null and b/media/tone-440-stereo-44100-24bits.wav differ diff --git a/media/tone-440-stereo-48000-16bits.wav b/media/tone-440-stereo-48000-16bits.wav new file mode 100644 index 0000000..9c5d8c9 Binary files /dev/null and b/media/tone-440-stereo-48000-16bits.wav differ diff --git a/media/tone-440-stereo-48000-24bits.wav b/media/tone-440-stereo-48000-24bits.wav new file mode 100644 index 0000000..06b448f Binary files /dev/null and b/media/tone-440-stereo-48000-24bits.wav differ -- cgit From 15812b9f7092fe55e9558bd7c4eb22510e587423 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Mon, 23 Jul 2018 22:57:33 +0200 Subject: Makefile: fix install path Change-Id: I55decba4f946c42ac55689d94b0dcce651b426d5 Signed-off-by: Stephane Desneux --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 906432b..3d4ea57 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ install: $(SCRIPTS) $(MEDIA) @echo "Installing audio scripts $(notdir $(SCRIPTS)) into $(DESTDIR)/bin" mkdir -p $(DESTDIR)/bin install $(SCRIPTS) -m 750 $(DESTDIR)/bin - @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/4a/media" - mkdir -p $(DESTDIR)/4a/media - install $(MEDIA) -m 640 $(DESTDIR)/4a/media + @echo "Installing audio test files $(notdir $(MEDIA)) into $(DESTDIR)/share/4a/media" + mkdir -p $(DESTDIR)/share/4a/media + install $(MEDIA) -m 640 $(DESTDIR)/share/4a/media clean: @echo "Cleanup done." -- cgit From c3d43245f69639183766b10a530963129fa8d867 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 1 Aug 2018 12:07:54 +0200 Subject: 4a-api: add subcommands for mediaplayer and mediascanner Change-Id: Ib4933d68efe23c9f1dce0b190db713bc2001d057 Signed-off-by: Stephane Desneux --- bin/4a-api | 8 +++++++- bin/lib4a-tools.sh | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/4a-api b/bin/4a-api index 1e1bb39..694397f 100755 --- a/bin/4a-api +++ b/bin/4a-api @@ -13,7 +13,10 @@ function usage() { log " api [args]: send direct request to API verb with args" log " roles: get AHL roles" log " hals [-a|--all] [-v|--verbose]: get HALs status" + log " mediascanner ... : interact with mediascanner service" + log " example: 4a-api mediascanner media_result \"\"" log " mediaplayer ... : interact with mediaplayer service" + log " example: 4a-api mediaplayer playlist \"\"" log " radio ... : interact with radio service" exit 1 } @@ -38,8 +41,11 @@ case $cmd in done 4a-client 4a-hal-manager loaded "{'verbose':$verbose,'all':$all}" ;; + mediascanner) + mediascanner-client "$@" + ;; mediaplayer) - echo "TODO" + mediaplayer-client "$@" ;; radio) echo "TODO" diff --git a/bin/lib4a-tools.sh b/bin/lib4a-tools.sh index 776b1c0..f799cc2 100644 --- a/bin/lib4a-tools.sh +++ b/bin/lib4a-tools.sh @@ -45,3 +45,10 @@ function 4a-client() { function 4a-roles() { 4a-client ahl-4a get_roles "" | tail -n +2 | jq '.response|.[]' } + +function mediascanner-client() { + afb-client-demo -H -d unix:/run/user/0/apis/ws/mediascanner "$@" +} +function mediaplayer-client() { + afb-client-demo -H -d unix:/run/user/0/apis/ws/mediaplayer "$@" +} -- cgit From 4d67fb6cfb56d0abd8ec1c9149b88efd4828935d Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Wed, 24 Apr 2019 13:42:49 +0200 Subject: 4a-aplay: added avirt detection Adds the detection of avirt of electing the default playback device. Signed-off-by: Thierry Bultel --- bin/4a-play | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/4a-play b/bin/4a-play index 620f311..7650d4d 100755 --- a/bin/4a-play +++ b/bin/4a-play @@ -19,8 +19,15 @@ if [ "$#" == "0" ]; then usage fi +avirt=$(cat /proc/modules | grep avirt_ap_loopback | head -n1 | cut -d ' ' -f 1) +if [ x$avirt == x ]; then +hwdev=Loopback,0,2 +else +hwdev=avirt,0 +fi + FILEPATH="$( realpath "$1" )" -DEVICE=${2:-'hw:Loopback,0,2'} +DEVICE=${2:-"hw:$hwdev"} ROLE=${3:-'multimedia'} CARDID=$( echo "$DEVICE" | cut -d':' -f2 | cut -d',' -f1 ) -- cgit