aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-12-18streams: inherits parameters from sourcesandbox/tbultel/bluealsaThierry Bultel2-19/+28
The capture parameters of a stream must be the ones of the capture source. The number of channel must typically match the one of the source microphone, else the configuration fails Change-Id: Ie8d0d85a65cb4a94a8698d1015d730e3c2a8b6a5 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-12-18Add support for bluetooth telephonyThierry Bultel24-1030/+2070
This adds support for bluetooth telephony. A big rework in the softmixer internals has been mandatory, in order to support dynamic streams creation and deletions. Bluetooth telephony relies on the recent evolutions of bluez-alsa, the most important one being the support of HFP over Ofono. The softmixer opens PCM ioplugs provided by bluez-alsa. Bluetooth SCO needs 2 streams, one for listening and the other for talking. These streams are created upon requests sent by the hal-manager. The hal manager subscribes for bluez-alsa events and request the list of availalble transports. For each "attach" transaction verb, the softmixer maintains a list of the all created objects (sources, sinks, zones, ramps, streams, and more) Additionnally, it creates a new verb when the attach succeeds, that verb is typically something like "sco_XX:XX:XX:XX:XX:XX", and the only supported action at the present time is {"action":"remove"}, that performs all the cleanup of the registered objects. Change-Id: I1b119e6c079e60daf771e63c083a1ef33a39f379 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-29Add gitreview file to 4a-softmixer repoguppy_6.99.2guppy/6.99.26.99.2Jan-Simon Möller1-0/+4
Allow git review to work. Bug-AGL: SPEC-1731 Change-Id: I80f723b268419911ec6e2cf9dc4942e33ca9ee45 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-13remove dead code and renamed unobvious variables6.9.0Thierry Bultel6-51/+41
Changed the ringbuffer "xxx_free" function to something more explicit, because it does not free anything. Changed "single letter" variables to nicer names Change-Id: I000c57aa5cc684d387105441889e011a45a6ccf3 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-08Fix the error string of attach actionsThierry Bultel6-17/+21
Fixes the "syntax-error" to something more explicit (SPEC-1906) Change-Id: I9d4c81ee1d62dcfb99799480c6dc910e2019a791 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-07Handle too small card PCM buffer when writingJonathan Aillet1-1/+15
In the writing thread, handle the case when 'writing threshold' was smaller than ALSA sound card's PCM buffer (defined in the driver). This avoids waiting indefinitely for a buffer to contain a wanted number of frames that it cannot contain. Change-Id: Ie1aa69ea1a93471ed46d571c669ec08a1b827476 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-11-07Tweaking debug printsJonathan Aillet3-13/+13
Replace some 'printf' by application framework debug functions. Improve 'ALSA_PCM_UID' macro. Correct minor errors in debug prints. Change-Id: I49899fd904d42b5b3bec46017eb319ed7d321dc5 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-11-07alsa-core-pcm: fixed the mute logicThierry Bultel1-4/+6
This fixes the mute/unmute logic. This was broken due to a forgotten push for a commit Change-Id: I6cbdedefc11ebd508d30ece71df364d9b69c74f0 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-07config.cmake: fixed a typoThierry Bultel1-1/+1
remoce extra parenthesis Change-Id: Ieeb5ca1a9064d97c9674dc855dc79aab36cadf3e Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-07Merge pull request #2 from iotbzh/app-templates-migrationtbultel3-10/+12
Migrate app-templates to CMake module
2018-10-31Migrate app-templates to CMake moduleapp-templates-migrationRomain Forlot3-10/+12
Bug-AGL SPEC-1682 Change-Id: Ia8d8bc6b614065d9cc9ab73a33d4643267686bcf Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2018-10-16Lower the verbosity when not in debug levelThierry Bultel2-17/+17
There were too many things printed in notice mode. Change-Id: Ia7841e219cb2e9ca71e0c4436a2048a812ef6b07 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-09-20removed the dependency to alsalib-1.1.6 for hostThierry Bultel6-2/+8
This fixes the compilation for hosts (Ubuntu, fedora, opensuse), that do not have alsalib-1.1.6 Notice that this fix needed another one in app-template, since the OS detection was broken. These are the changes brought by the bump of app-templates: (3dc85ec - Thierry Bultel) common.cmake: fixed erroneous search path for os-release (7fa5e5a - Romain Forlot) Fix: missing gcov symbol in compiled binaries (76e12e7 - CorentinLGS) app-templates doc: Changed doc to fit new format. (02f45f1 - Romain Forlot) Update Docs (52ae181 - Romain Forlot) Fix: typo (f0b24b0 - Romain Forlot) Rollback about TEST build type (e841a77 - Romain Forlot) Adding a TEST build type (994ebc1 - Romain Forlot) Change default compilation options. (85d5ffd - Romain Forlot) Test widget only if there are test materials (d14bdce - Romain Forlot) Handles more test LABELS. (70cf8fd - Romain Forlot) Missing flag for COVERAGE build type (3c99b8a - Romain Forlot) Create a test widget Change-Id: I788d8d0bf110dd9cdc11aac256bd535db0d90e4d Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-09-20Remove an unfilled response json objectJonathan Aillet1-3/+1
Remove an unfilled response json object when a call is received to change bluetooth streamed devbie. Change-Id: I72ad4cd71c29e3cdf1427813228f6c7df63b3144 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-09-12config.cmake: bump the needed version of alsalib to 1.1.6Thierry Bultel1-1/+1
It was kwown that the softmixer needs alsalib >= 1.1.6, for runtime reasons. Since the integration of bluetooth support, there is now also a compile error with older alsalib. Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-09-10bluez-alsa: fixed the null device logicThierry Bultel1-2/+1
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-09-07fixed crash upon misconfiguration of capture/playback devicesThierry Bultel6-16/+24
The null pcmplug case was not correctly handled in various places. Also fixed some typos in the log Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-09-07dmix: used device when in name of slaveThierry Bultel1-5/+27
When a sound card has multiple devices, it is invalid to set the slave name of the dmix as "hw:cardname" because alsa does not know which device to use. The fix consists in using the device number, when it is given. Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-08-31Added bluez sound playback supportThierry Bultel13-57/+271
This adds sound playback for incoming sound from connected bluetooth devices. In this version, the softmixer relies on a modified bluez-alsa version (https://github.com/iotbzh/bluez-alsa), that provides an ioplug PCM bluezalsa connection proxy. The softmixer api has a new verb to dynamically set the device to listen to: afb-client-demo ws://localhost:1234/api?token=\uuid=123 smixer bluezalsa_dev '{"interface":"hci0", "device":"F6:32:15:2A:80:70", "profile":"a2dp"}' In this way it is possible to switch from a bluezalsa audio source to another without any further configuration. For now, only interface hci0 is supported. This commit also migrates the softmixer binding to API v3 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-08-01Bump revisions for all submodulesStephane Desneux3-0/+0
Changes for app-afb-helpers-submodule: * f0ce5b6 wrap-json: Fix duplicated lines in header file * 764c355 Add '@' as binder middle name separator. * 74be4cc Enhance 'wrap_json_clone_depth' description * a37225f Fix: use of GetBindingDirPath without dynapi * 4f99d16 Retrieve directory list from environment variables * f46a0dc Remove the file .gitmodules Changes for app-controller-submodule: * 4e30eb1 New defaults useful functions on lua table * 61cbc9a More precise log message when loading a Lua file * 535df7f Fix: wrong legacy function signature * b79a761 Split loading JSON controller file. * c3d7de2 Release arguments once C function returned. * a58d83b Fix : typo introduced in a previous commit. * 86f65bd Fixed character counting that was shortening paths * e32d98c Keep json unmodified during action execution * 88892db Use prefix variable to find controller's plugins Changes for app-templates: * 9c1a0fb Fix: interpreted '&' character * 9202fac More accurate comment about widget template file. * f94e45e Align sample on actual default compile options * d0acc2a Add support to binding version 3. * 6fb3846 Warning if not using wgtpkg-pack to make a widget * 35f3af1 Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var * 332f377 Be able to overwrite BUILD_TYPE using CLI * 1ec7531 Use CACHE variable for other common CMAKE variable * 0880356 Fix:: wrong wgt using RELEASE BUILD TYPE Change-Id: If6597632b9f719fcfd476697d1fd2332742d9801 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-07-26Reduce verbosity of message "readThreadEntry..."Stephane Desneux1-6/+6
Moves the log level of the message from info to debug. Change-Id: I348421a17875b9061255c3b353e27070b0068c3b Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-07-20Updated the readme.mdThierry Bultel1-18/+30
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-20rework the sound capture & playback modelThierry Bultel4-254/+324
Now uses two threads for in the playing loop The first one reads from the capture device (ie, a phys. capture, or snd_aloop) and writes data to a circular buffer. The second one gets data from the circular buffer and outputs it to the playback. This model solves a lot of correlated timing bugs between read & write tasks. The read tasks only wakes up the write task when the buffer is 80% full. The buffer size big enough to hold 2 seconds of sound. The mute implementation has also been simplified, since it has been found out that it was possible to recover from an interrupted read, by calling snd_pcm_start additionnally to snd_pcm_prepare. Thus, the mute code consists in listening to an extra file descriptor in the read loop. Reading from that descriptor gives the mute or unmute command sent at higher level (in the PCM control event callback). When a 'mute' order is get, the capture sound fd is simply backup and replaced by '-1' in the set of the poll of the read task. When a 'unmute' order is get, the fd is simply restored. The start threshold is only computed for capture, and hardcoded to 1 for playback. This removes most of the remaining EPIPE on playback. The stop threshold has been removed. It had bad side effects on the amount of writeable data returned by snd_pcm_avail_update (was returning too small chunks) Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-20added ringbuffer and time utilsThierry Bultel7-1/+694
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-17alsa-core-pcm: sets sw start & stop thresholdsThierry Bultel1-12/+90
Uses the same logic as 'aplay' to set the start & stop thresholds. With this fix, there are no more periodic EPIPE errors when writing to playback Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-11stops the read/write loop when the stream is mutedThierry Bultel9-109/+295
when the stream is muted (due to the configuration, or due to a HAL request), the read/write loop is stopped. The benefit is that muting will work with capture devices that do not implement the mute in their driver. The inconvenient of stopping the read loop is that it has made appear an unexpected side-effect: the poll on capture does not trig for further incoming frames. The workaround is to completely close, then reopen and configure the capture PCM. Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-10Use latest version of app-controller-submodule submodule.sandbox/tbultel/4a_masterThierry Bultel1-0/+0
Changes of app-controller-submodule: (440be09 - Jonathan Aillet) Use binding version to set controller definitions (67b6d49 - Clément Bénier) ctl-lua: typo fix (bac7d6d - Clément Bénier) asynchronism for test: LockWait added Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-10Use latest version of app-afb-helpers-submodule.Thierry Bultel1-0/+0
Changes of app-afb-helpers-submodule: (52f0478 - Jonathan Aillet) Remove unnecessary 'AFB_DEBUG' redefinition (fc1c62a - Jonathan Aillet) Use binding version to handle dynapi Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-10Use latest version of app-controller-submodule submodule.Thierry Bultel1-0/+0
Changes of app-controller-submodule: (b575a4b - Thierry Bultel) No longer set the API version (4a72073 - Romain Forlot) Fix: plugin api assignement order Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-05Update version of app-controller-submodule submodule.Stephane Desneux1-0/+0
Changes of app-controller-submodule: * af15da8 No longer set the API version * e45d063 Execute ConfigExec only if section is existing * 2d1c3d2 Always set the api member even if NULL. * 9622138 Ability to add a plugin after the initial load Change-Id: Id7317eb97a623438d9c7857315144ca7d7242d2d Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-07-05Use latest version of app-templates submodule.Thierry Bultel1-0/+0
Changes of app-templates: (eec9f07 - Romain Forlot) Fix: SYSROOT location detection... Wrong test. (291aa4e - Romain Forlot) Change the default debug compilation options. (22a2cbf - Romain Forlot) Clearer coverage compilation options configuration (aa68dbd - Romain Forlot) Don't overwrite the autobuild script if it exists (a13e7b9 - Romain Forlot) Disable the in-tree build method. (51026d2 - Romain Forlot) Detect Yocto as OS distribution (1f2944e - Romain Forlot) Fix: wrong compile options added (92646f6 - Romain Forlot) Fallback using zip format if no wgtpkg-pack found (f65761c - José Bollo) 02-variables.cmake: Avoid checking CXX version if not required (3965d37 - José Bollo) config.cmake.sample: Remove dependency to libsystemd (a45ae0c - José Bollo) config.cmake.sample: Remove dependency to libmicrohttpd (9b17efe - Thierry Bultel) Added -D_FORTIFY_SOURCE=2 to CFLAGS Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-03Use latest version of app-afb-helpers-submodule submodule.Thierry Bultel1-0/+0
Changes of app-afb-helpers-submodule: (2c1edf4 - Thierry Bultel) No longer sets the API version (5811a53 - Jonathan Aillet) At search, use the prefix parameter as a prefix (2c29f15 - Loïc Collignon) Remove deprecated use of cmake/Qt macro (797d04f - Thierry Bultel) No longer sets the API version (5bec8c5 - Loïc Collignon) Rename method to avoid conflict with Qt's one Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-07-03Uses the APIv3 compatibility to vdynThierry Bultel5-15/+2
Uses the new compatibility for vdyn based on V3 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-29Update version of app-controller-submodule submodule.Loïc Collignon2-1/+1
Changes of app-controller-submodule: (0f3063b - Romain Forlot) Be able to dispatch required api at the wanted time (1ff524b - Romain Forlot) Change LUA package path at LUA interpreter load (738ae54 - Romain Forlot) Don't load two times a plugin even for LUA (c04f029 - Sebastien Douheret) Fixed hidden bound variable (apiHandle) (cfe3919 - Sebastien Douheret) Fixed null value when push Lua arguments (69c0585 - José Bollo) Adjust to compile with incoming bindings v3 (d7e260c - José Bollo) Remove declaration to not existing functions (8ac6625 - Romain Forlot) Add 2 lua utilities function (d3504bb - Jonathan Aillet) Update README.md for new metadata keys. Change-Id: I794ed0ca3a054e7baf11769207007ef733854474 Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
2018-06-26Rework the pcm copy loop and save a lot of CPUeelThierry Bultel2-142/+188
- removed the systemd polling usage - uses a while loop for reading - improved the write loop, leveraging the available space at each iteration Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22plugins: code & log cleanupThierry Bultel7-20/+21
2018-06-22pcm core: fixed spurious XRUN issuesThierry Bultel2-95/+257
This fixes the numerous XRUN issues seen on some cards. The trick is to set the buffer_size & period size in hw parameters. These ones are calculated from an expected maximum latency. Also, the writei is done in a loop to be robust to overruns and partial writes. Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22route plugin:fixed mismatch with several sound cardsThierry Bultel1-16/+40
Also sets the right number of channels. Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22set the correct number of channels in dmixThierry Bultel1-9/+40
The value set was wrong, and attempting to bump to an higher value later seems to be forbidden by the alsalib (led to EINVAL when getting parameters of PCM) Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22alsa-plug-vol: code & log cleanupThierry Bultel1-5/+11
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22alsa-utils-bypath: code & log cleanupThierry Bultel1-6/+15
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22.gitignore: ignore build with wildcardThierry Bultel1-1/+1
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22alsa-utils-dump: added log upon failing parameters retrievalThierry Bultel1-5/+9
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22zones: fixed index mismatch when multiple sound cards are declaredThierry Bultel1-12/+19
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22alsa-api-mixer: code & log cleanupThierry Bultel1-14/+42
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22alsa-api-streams: code & log cleanupThierry Bultel1-27/+103
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22sinks: fixed index mismatch when multiple sound cards are declaredThierry Bultel1-6/+6
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-22pcm: return volume value with null set requestThierry Bultel1-4/+18
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-06-16Use correct chanel number when creating PCMhal-rc2-sandboxJonathan Aillet1-2/+2
Use correct chanel number when creating PCM. Change-Id: I17ac0273f9a6eec1d3b49845f579495f2cdcf9d7 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-06-14smixer-4a-default.json: add target runtime path for plugin lookupStephane Desneux1-1/+1
Change-Id: I760e1a1b30db924babe5def22c8984719c607d1b Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>