From ecbe93fd5b51e34553d710a00a03e1f9b9a6bab3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 19 Oct 2017 11:48:48 +0200 Subject: [PATCH 01/38] Initial commit --- LICENSE | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 2 files changed, 506 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..19e307187 --- /dev/null +++ b/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +(This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.) + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + {signature of Ty Coon}, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/README.md b/README.md new file mode 100644 index 000000000..4e0f3a40d --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# pipewire-alsa +ALSA plugin for pipewire From 7365677116cd8dd091cad41ed11d96ea5b0794ec Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 19 Oct 2017 11:50:14 +0200 Subject: [PATCH 02/38] Add alsa plugin --- alsa-plugins/meson.build | 17 + alsa-plugins/pcm_pipewire.c | 780 ++++++++++++++++++++++++++++++++++++ 2 files changed, 797 insertions(+) create mode 100644 alsa-plugins/meson.build create mode 100644 alsa-plugins/pcm_pipewire.c diff --git a/alsa-plugins/meson.build b/alsa-plugins/meson.build new file mode 100644 index 000000000..9777acc89 --- /dev/null +++ b/alsa-plugins/meson.build @@ -0,0 +1,17 @@ +pipewire_alsa_plugin_sources = [ + 'pcm_pipewire.c', +] + +pipewire_alsa_plugin_c_args = [ + '-DHAVE_CONFIG_H', + '-DPIC', +] + +pipewire_alsa_plugin = shared_library('asound_module_pcm_pipewire', + pipewire_alsa_plugin_sources, + c_args : pipewire_alsa_plugin_c_args, + include_directories : [configinc], + dependencies : [pipewire_dep, alsa_dep], + install : true, + install_dir : join_paths(pipewire_libdir, 'alsa-lib'), +) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c new file mode 100644 index 000000000..504132c4e --- /dev/null +++ b/alsa-plugins/pcm_pipewire.c @@ -0,0 +1,780 @@ +/* + * PCM - PipeWire plugin + * + * Copyright (c) 2017 Wim Taymans + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#define __USE_GNU + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +struct type { + uint32_t format; + uint32_t props; + struct spa_type_meta meta; + struct spa_type_data data; + struct spa_type_media_type media_type; + struct spa_type_media_subtype media_subtype; + struct spa_type_format_audio format_audio; + struct spa_type_audio_format audio_format; +}; + +static inline void init_type(struct type *type, struct spa_type_map *map) +{ + type->format = spa_type_map_get_id(map, SPA_TYPE__Format); + type->props = spa_type_map_get_id(map, SPA_TYPE__Props); + spa_type_meta_map(map, &type->meta); + spa_type_data_map(map, &type->data); + spa_type_media_type_map(map, &type->media_type); + spa_type_media_subtype_map(map, &type->media_subtype); + spa_type_format_audio_map(map, &type->format_audio); + spa_type_audio_format_map(map, &type->audio_format); +} + +struct buffer { + struct spa_buffer *buffer; + struct spa_list link; + void *ptr; + size_t size; + bool mapped; + bool used; +}; + +typedef enum _pipewire_format { + SND_PCM_PIPEWIRE_FORMAT_RAW +} snd_pcm_pipewire_format_t; + +typedef struct { + snd_pcm_ioplug_t io; + + int fd; + int activated; /* PipeWire is activated? */ + + unsigned int num_ports; + unsigned int hw_ptr; + unsigned int sample_bits; + snd_pcm_uframes_t min_avail; + + struct type type; + struct pw_loop *loop; + struct pw_thread_loop *main_loop; + struct pw_core *core; + struct pw_type *t; + + struct pw_remote *remote; + struct spa_hook remote_listener; + + struct pw_node *node; + + struct spa_node impl_node; + const struct spa_node_callbacks *callbacks; + void *callbacks_data; + struct spa_port_io *port_io; + struct spa_port_info port_info; + + uint8_t buffer[1024]; + struct spa_audio_info_raw format; + + uint8_t params_buffer[1024]; + struct spa_param *params[2]; + + struct buffer buffers[32]; + int n_buffers; + struct spa_list empty; + +} snd_pcm_pipewire_t; + +static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io); + +static int pcm_poll_block_check(snd_pcm_ioplug_t *io) +{ + uint64_t val; + snd_pcm_sframes_t avail; + snd_pcm_pipewire_t *pw = io->private_data; + + if (io->state == SND_PCM_STATE_RUNNING || + (io->state == SND_PCM_STATE_PREPARED && io->stream == SND_PCM_STREAM_CAPTURE)) { + avail = snd_pcm_avail_update(io->pcm); + if (avail >= 0 && avail < pw->min_avail) { + read(io->poll_fd, &val, sizeof(val)); + return 1; + } + } + + return 0; +} + +static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) +{ + uint64_t val = 1; + snd_pcm_sframes_t avail; + snd_pcm_pipewire_t *pw = io->private_data; + + avail = snd_pcm_avail_update(io->pcm); + if (avail < 0 || avail >= pw->min_avail) { + write(pw->fd, &val, sizeof(val)); + return 1; + } + + return 0; +} + +static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw) +{ + if (pw) { + if (pw->core) + pw_core_destroy(pw->core); + if (pw->main_loop) + pw_thread_loop_destroy(pw->main_loop); + if (pw->loop) + pw_loop_destroy(pw->loop); + if (pw->fd >= 0) + close(pw->fd); + free(pw); + } +} + +static int snd_pcm_pipewire_close(snd_pcm_ioplug_t *io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + snd_pcm_pipewire_free(pw); + return 0; +} + +static int snd_pcm_pipewire_poll_revents(snd_pcm_ioplug_t *io, + struct pollfd *pfds, unsigned int nfds, + unsigned short *revents) +{ + assert(pfds && nfds == 1 && revents); + + *revents = pfds[0].revents & ~(POLLIN | POLLOUT); + if (pfds[0].revents & POLLIN && !pcm_poll_block_check(io)) + *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN; + return 0; +} + +static snd_pcm_sframes_t snd_pcm_pipewire_pointer(snd_pcm_ioplug_t *io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + return pw->hw_ptr; +} + +static int +snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) +{ + snd_pcm_ioplug_t *io = &pw->io; + const snd_pcm_channel_area_t *areas; + snd_pcm_channel_area_t *pwareas; + snd_pcm_uframes_t xfer = 0; + unsigned int channel, bps; + snd_pcm_uframes_t nframes; + + bps = io->channels * pw->sample_bits; + nframes = b->buffer->datas[0].chunk->size / (bps / 8); + + pwareas = alloca(io->channels * sizeof(snd_pcm_channel_area_t)); + + for (channel = 0; channel < io->channels; channel++) { + pwareas[channel].addr = b->ptr; + pwareas[channel].first = channel * pw->sample_bits; + pwareas[channel].step = bps; + } + + if (io->state != SND_PCM_STATE_RUNNING) { + if (io->stream == SND_PCM_STREAM_PLAYBACK) { + for (channel = 0; channel < io->channels; channel++) + snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); + return 0; + } + } + + areas = snd_pcm_ioplug_mmap_areas(io); + + while (xfer < nframes) { + snd_pcm_uframes_t frames = nframes - xfer; + snd_pcm_uframes_t offset = pw->hw_ptr; + snd_pcm_uframes_t cont = io->buffer_size - offset; + + if (cont < frames) + frames = cont; + + if (io->stream == SND_PCM_STREAM_PLAYBACK) + snd_pcm_areas_copy(pwareas, xfer, + areas, offset, + io->channels, frames, io->format); + else + snd_pcm_areas_copy(areas, offset, + pwareas, xfer, + io->channels, frames, io->format); + + pw->hw_ptr += frames; + pw->hw_ptr %= io->buffer_size; + xfer += frames; + } + + pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ + + return 0; +} + +static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + snd_pcm_sw_params_t *swparams; + int err; + + pw->hw_ptr = 0; + + pw->min_avail = io->period_size; + snd_pcm_sw_params_alloca(&swparams); + err = snd_pcm_sw_params_current(io->pcm, swparams); + if (err == 0) { + snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail); + } + + /* deactivate PipeWire connections if this is XRUN recovery */ + snd_pcm_pipewire_stop(io); + + if (io->stream == SND_PCM_STREAM_PLAYBACK) + pcm_poll_unblock_check(io); /* playback pcm initially accepts writes */ + else + pcm_poll_block_check(io); /* block capture pcm if that's XRUN recovery */ + + return 0; +} + +static int snd_pcm_pipewire_start(snd_pcm_ioplug_t *io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + + pw_node_set_active(pw->node, true); + pw->activated = 1; + + return 0; +} + +static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + + if (pw->activated) { + pw_node_set_active(pw->node, false); + pw->activated = 0; + } + return 0; +} + +static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { + .close = snd_pcm_pipewire_close, + .start = snd_pcm_pipewire_start, + .stop = snd_pcm_pipewire_stop, + .pointer = snd_pcm_pipewire_pointer, + .prepare = snd_pcm_pipewire_prepare, + .poll_revents = snd_pcm_pipewire_poll_revents, +}; + +#define ARRAY_SIZE(ary) (sizeof(ary)/sizeof(ary[0])) + +static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) +{ + unsigned int access_list[] = { + SND_PCM_ACCESS_MMAP_INTERLEAVED, + SND_PCM_ACCESS_MMAP_NONINTERLEAVED, + SND_PCM_ACCESS_RW_INTERLEAVED, + SND_PCM_ACCESS_RW_NONINTERLEAVED + }; + unsigned int format = SND_PCM_FORMAT_S16_LE; + unsigned int rate = 44100; + int err; + + pw->sample_bits = snd_pcm_format_physical_width(format); + if ((err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_ACCESS, + ARRAY_SIZE(access_list), access_list)) < 0 || + (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_FORMAT, + 1, &format)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_CHANNELS, + 2, 2)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, + rate, rate)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, + 128, 64*1024)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIODS, + 2, 64)) < 0) + return err; + + return 0; +} + +static int impl_send_command(struct spa_node *node, const struct spa_command *command) +{ + return SPA_RESULT_OK; +} + +static int impl_set_callbacks(struct spa_node *node, + const struct spa_node_callbacks *callbacks, void *data) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + d->callbacks = callbacks; + d->callbacks_data = data; + return SPA_RESULT_OK; +} + +static int impl_get_n_ports(struct spa_node *node, + uint32_t *n_input_ports, + uint32_t *max_input_ports, + uint32_t *n_output_ports, + uint32_t *max_output_ports) +{ + *n_input_ports = *max_input_ports = 0; + *n_output_ports = *max_output_ports = 1; + return SPA_RESULT_OK; +} + +static int impl_get_port_ids(struct spa_node *node, + uint32_t n_input_ports, + uint32_t *input_ids, + uint32_t n_output_ports, + uint32_t *output_ids) +{ + if (n_output_ports > 0) + output_ids[0] = 0; + return SPA_RESULT_OK; +} + +static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + struct spa_port_io *io) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + d->port_io = io; + return SPA_RESULT_OK; +} + +static int impl_port_enum_formats(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + struct spa_format **format, + const struct spa_format *filter, + uint32_t index) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer)); + + if (index != 0) + return SPA_RESULT_ENUM_END; + + *format = spa_pod_builder_format(&b, d->type.format, + d->type.media_type.audio, d->type.media_subtype.raw, + ":", d->type.format_audio.format, "I", d->type.audio_format.S16, + ":", d->type.format_audio.channels, "i", 2, + ":", d->type.format_audio.rate, "i", 44100); + + return SPA_RESULT_OK; +} + +static int impl_port_set_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + uint32_t flags, const struct spa_format *format) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct pw_type *t = d->t; + struct spa_pod_builder b = { NULL }; + + if (format == NULL) + return SPA_RESULT_OK; + + if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0) + return SPA_RESULT_INVALID_MEDIA_TYPE; + + if (d->format.format != d->type.audio_format.S16) + return SPA_RESULT_ERROR; + + spa_pod_builder_init(&b, d->params_buffer, sizeof(d->params_buffer)); + d->params[0] = spa_pod_builder_param(&b, + t->param_alloc_buffers.Buffers, + ":", t->param_alloc_buffers.size, "iru", 1024, + 2, 32, 4096, + ":", t->param_alloc_buffers.stride, "i", 0, + ":", t->param_alloc_buffers.buffers, "iru", 2, + 2, 2, 32, + ":", t->param_alloc_buffers.align, "i", 16); + + d->params[1] = spa_pod_builder_param(&b, + t->param_alloc_meta_enable.MetaEnable, + ":", t->param_alloc_meta_enable.type, "I", t->meta.Header, + ":", t->param_alloc_meta_enable.size, "i", sizeof(struct spa_meta_header)); + + return SPA_RESULT_OK; +} + +static int impl_port_get_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + const struct spa_format **format) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer)); + + *format = spa_pod_builder_format(&b, d->type.format, + d->type.media_type.audio, d->type.media_subtype.raw, + ":", d->type.format_audio.format, "I", d->format.format, + ":", d->type.format_audio.channels, "i", d->format.channels, + ":", d->type.format_audio.rate, "i", d->format.rate); + + return SPA_RESULT_OK; +} + +static int impl_port_get_info(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + const struct spa_port_info **info) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + + d->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS; + d->port_info.rate = 0; + d->port_info.props = NULL; + + *info = &d->port_info; + + return SPA_RESULT_OK; +} + +static int impl_port_enum_params(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + uint32_t index, struct spa_param **param) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + + if (index >= 2) + return SPA_RESULT_ENUM_END; + + *param = d->params[index]; + + return SPA_RESULT_OK; +} + +static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id, + struct spa_buffer **buffers, uint32_t n_buffers) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + int i; + for (i = 0; i < n_buffers; i++) { + struct buffer *b = &d->buffers[i]; + struct spa_data *datas = buffers[i]->datas; + + if (datas[0].data != NULL) { + b->ptr = datas[0].data; + b->mapped = false; + } + else if (datas[0].type == d->type.data.MemFd || + datas[0].type == d->type.data.DmaBuf) { + b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE, + MAP_SHARED, datas[0].fd, 0); + if (b->ptr == MAP_FAILED) { + pw_log_error("failed to buffer mem"); + return SPA_RESULT_ERROR; + + } + b->ptr = SPA_MEMBER(b->ptr, datas[0].mapoffset, void); + b->mapped = true; + } + else { + pw_log_error("invalid buffer mem"); + return SPA_RESULT_ERROR; + } + b->size = datas[0].maxsize; + b->buffer = buffers[i]; + pw_log_info("got buffer %d size %zd", i, b->size); + spa_list_append(&d->empty, &b->link); + b->used = false; + } + d->n_buffers = n_buffers; + return SPA_RESULT_OK; +} + +static inline void reuse_buffer(snd_pcm_pipewire_t *d, uint32_t id) +{ + struct buffer *b = &d->buffers[id]; + if (b->used) { + pw_log_trace("reuse buffer %d", id); + spa_list_append(&d->empty, &b->link); + b->used = false; + } +} + +static int impl_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint32_t buffer_id) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + reuse_buffer(d, buffer_id); + return SPA_RESULT_OK; +} + +static int impl_node_process_input(struct spa_node *node) +{ + return SPA_RESULT_OK; +} + +static int impl_node_process_output(struct spa_node *node) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct buffer *b; + struct spa_port_io *io = d->port_io; + + if (io->buffer_id < d->n_buffers) { + reuse_buffer(d, io->buffer_id); + io->buffer_id = SPA_ID_INVALID; + } + if (spa_list_is_empty(&d->empty)) { + pw_log_error("alsa-pipewire %p: out of buffers", d); + return SPA_RESULT_OUT_OF_BUFFERS; + } + b = spa_list_first(&d->empty, struct buffer, link); + spa_list_remove(&b->link); + b->used = true; + + snd_pcm_pipewire_process(d, b); + + io->buffer_id = b->buffer->id; + io->status = SPA_RESULT_HAVE_BUFFER; + + return SPA_RESULT_HAVE_BUFFER; +} + +static const struct spa_node impl_node = { + SPA_VERSION_NODE, + .send_command = impl_send_command, + .set_callbacks = impl_set_callbacks, + .get_n_ports = impl_get_n_ports, + .get_port_ids = impl_get_port_ids, + .port_set_io = impl_port_set_io, + .port_enum_formats = impl_port_enum_formats, + .port_set_format = impl_port_set_format, + .port_get_format = impl_port_get_format, + .port_get_info = impl_port_get_info, + .port_enum_params = impl_port_enum_params, + .port_use_buffers = impl_port_use_buffers, + .port_reuse_buffer = impl_port_reuse_buffer, + .process_output = impl_node_process_output, + .process_input = impl_node_process_input, +}; + + +static void on_state_changed(void *data, enum pw_remote_state old, + enum pw_remote_state state, const char *error) +{ + snd_pcm_pipewire_t *pw = data; + + switch (state) { + case PW_REMOTE_STATE_ERROR: + case PW_REMOTE_STATE_CONNECTED: + pw_thread_loop_signal(pw->main_loop, false); + break; + default: + break; + } +} + +static const struct pw_remote_events remote_events = { + PW_VERSION_REMOTE_EVENTS, + .state_changed = on_state_changed, +}; + +static int pipewire_node_create(snd_pcm_pipewire_t *pw, + const char *node_name, + const char *target, + bool can_fallback) +{ + const char *error = NULL; + enum pw_remote_state state; + + pw_thread_loop_lock(pw->main_loop); + + if (pw_remote_connect(pw->remote) < 0) { + error = "connect failed"; + goto error; + } + + while (true) { + state = pw_remote_get_state(pw->remote, &error); + if (state == PW_REMOTE_STATE_ERROR) + goto error; + + if (state == PW_REMOTE_STATE_CONNECTED) + break; + + pw_thread_loop_wait(pw->main_loop); + } + pw_log_debug("node %s", target); + pw->node = pw_node_new(pw->core, + node_name, + pw_properties_new(PW_NODE_PROP_AUTOCONNECT, "1", + PW_NODE_PROP_TARGET_NODE, target, + NULL), + 0); + pw->impl_node = impl_node; + pw_node_set_implementation(pw->node, &pw->impl_node); + pw_node_register(pw->node, NULL, NULL); + + pw_remote_export(pw->remote, pw->node); + pw_thread_loop_unlock(pw->main_loop); + + return 0; + + error: + if (!can_fallback) + SNDERR("PipeWire: Unable to connect: %s\n", error); + + pw_thread_loop_unlock(pw->main_loop); + + return -ECONNREFUSED; + +} + +static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, + const char *node_name, + const char *playback_node, + const char *capture_node, + snd_pcm_stream_t stream, int mode) +{ + snd_pcm_pipewire_t *pw; + int err; + static unsigned int num = 0; + char pipewire_node_name[32]; + const char *target; + + assert(pcmp); + pw = calloc(1, sizeof(*pw)); + if (!pw) + return -ENOMEM; + + pw->fd = -1; + pw->io.poll_fd = -1; + spa_list_init(&pw->empty); + + if (node_name == NULL) + err = snprintf(pipewire_node_name, sizeof(pipewire_node_name), + "alsa-pipewire.%s%s.%d.%d", name, + stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", + getpid(), num++); + else + err = snprintf(pipewire_node_name, sizeof(pipewire_node_name), + "%s", node_name); + + if (stream == SND_PCM_STREAM_PLAYBACK) + target = playback_node; + else + target = capture_node; + + pw->loop = pw_loop_new(NULL); + pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); + pw->core = pw_core_new(pw->loop, NULL); + pw->t = pw_core_get_type(pw->core); + init_type(&pw->type, pw->t->map); + spa_debug_set_type_map(pw->t->map); + + pw->remote = pw_remote_new(pw->core, NULL, 0); + pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); + + err = pw_thread_loop_start(pw->main_loop); + if (err < 0) { + snd_pcm_pipewire_free(pw); + return err; + } + + err = pipewire_node_create(pw, pipewire_node_name, target, false); + if (err < 0) { + snd_pcm_pipewire_free(pw); + return err; + } + + pw->fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); + + pw->io.version = SND_PCM_IOPLUG_VERSION; + pw->io.name = "ALSA <-> PipeWire PCM I/O Plugin"; + pw->io.callback = &pipewire_pcm_callback; + pw->io.private_data = pw; + pw->io.poll_fd = pw->fd; + pw->io.poll_events = POLLIN; + pw->io.mmap_rw = 1; + + err = snd_pcm_ioplug_create(&pw->io, name, stream, mode); + if (err < 0) { + snd_pcm_pipewire_free(pw); + return err; + } + + err = pipewire_set_hw_constraint(pw); + if (err < 0) { + snd_pcm_ioplug_delete(&pw->io); + return err; + } + + *pcmp = pw->io.pcm; + + return 0; +} + + +SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) +{ + snd_config_iterator_t i, next; + const char *node_name = NULL; + const char *playback_node = NULL; + const char *capture_node = NULL; + int err; + + pw_init(NULL, NULL); + + snd_config_for_each(i, next, conf) { + snd_config_t *n = snd_config_iterator_entry(i); + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; + if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "name") == 0) { + snd_config_get_string(n, &node_name); + continue; + } + if (strcmp(id, "playback_node") == 0) { + snd_config_get_string(n, &playback_node); + continue; + } + if (strcmp(id, "capture_node") == 0) { + snd_config_get_string(n, &capture_node); + continue; + } + SNDERR("Unknown field %s", id); + return -EINVAL; + } + + err = snd_pcm_pipewire_open(pcmp, name, node_name, playback_node, capture_node, stream, mode); + + return err; +} + +SND_PCM_PLUGIN_SYMBOL(pipewire); From 9b38d1af27c37a2b459e0d2dfd471a78b646d13f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 19 Oct 2017 11:55:36 +0200 Subject: [PATCH 03/38] Add example conf --- conf/50-pipewire.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 conf/50-pipewire.conf diff --git a/conf/50-pipewire.conf b/conf/50-pipewire.conf new file mode 100644 index 000000000..adbcb60f6 --- /dev/null +++ b/conf/50-pipewire.conf @@ -0,0 +1,11 @@ +# Add a specific named PipeWire pcm + +pcm.pipewire { + type pipewire + playback_node "5" + capture_node "4" + hint { + show on + description "PipeWire Sound Server" + } +} From 5786cae78f235d16217279ab7448c75e6078d655 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 10 Nov 2017 13:39:59 +0100 Subject: [PATCH 04/38] Updates Error reporting Add support for ringbuffers --- alsa-plugins/pcm_pipewire.c | 335 +++++++++++++++++++++++++----------- 1 file changed, 230 insertions(+), 105 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 504132c4e..5663b84e4 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -31,11 +31,10 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -66,6 +65,8 @@ static inline void init_type(struct type *type, struct spa_type_map *map) struct buffer { struct spa_buffer *buffer; struct spa_list link; + struct spa_meta_header *h; + struct spa_meta_ringbuffer *rb; void *ptr; size_t size; bool mapped; @@ -81,6 +82,7 @@ typedef struct { int fd; int activated; /* PipeWire is activated? */ + bool error; unsigned int num_ports; unsigned int hw_ptr; @@ -107,9 +109,6 @@ typedef struct { uint8_t buffer[1024]; struct spa_audio_info_raw format; - uint8_t params_buffer[1024]; - struct spa_param *params[2]; - struct buffer buffers[32]; int n_buffers; struct spa_list empty; @@ -143,7 +142,7 @@ static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) snd_pcm_pipewire_t *pw = io->private_data; avail = snd_pcm_avail_update(io->pcm); - if (avail < 0 || avail >= pw->min_avail) { + if (avail < 0 || avail >= pw->min_avail || pw->error) { write(pw->fd, &val, sizeof(val)); return 1; } @@ -154,6 +153,8 @@ static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw) { if (pw) { + if (pw->main_loop) + pw_thread_loop_stop(pw->main_loop); if (pw->core) pw_core_destroy(pw->core); if (pw->main_loop) @@ -177,11 +178,17 @@ static int snd_pcm_pipewire_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { + snd_pcm_pipewire_t *pw = io->private_data; + assert(pfds && nfds == 1 && revents); + if (pw->error) + return -EBADFD; + *revents = pfds[0].revents & ~(POLLIN | POLLOUT); if (pfds[0].revents & POLLIN && !pcm_poll_block_check(io)) *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN; + return 0; } @@ -200,14 +207,38 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) snd_pcm_uframes_t xfer = 0; unsigned int channel, bps; snd_pcm_uframes_t nframes; + uint32_t index = 0, nbytes, maxsize, avail; + void *ptr; bps = io->channels * pw->sample_bits; - nframes = b->buffer->datas[0].chunk->size / (bps / 8); pwareas = alloca(io->channels * sizeof(snd_pcm_channel_area_t)); + do { + + if (b->rb) { + int32_t filled; + uint32_t offset; + + filled = spa_ringbuffer_get_write_index(&b->rb->ringbuffer, &index); + avail = b->rb->ringbuffer.size - filled; + offset = index % b->rb->ringbuffer.size; + nbytes = SPA_MIN(avail, b->rb->ringbuffer.size - offset); + + ptr = SPA_MEMBER(b->ptr, offset, void); + pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); + } + else { + avail = b->buffer->datas[0].chunk->size; + maxsize = b->buffer->datas[0].maxsize; + nbytes = SPA_MIN(avail, maxsize); + ptr = b->ptr; + } + nframes = nbytes / (bps / 8); + nframes = SPA_MIN(nframes, pw->min_avail); + for (channel = 0; channel < io->channels; channel++) { - pwareas[channel].addr = b->ptr; + pwareas[channel].addr = ptr; pwareas[channel].first = channel * pw->sample_bits; pwareas[channel].step = bps; } @@ -216,12 +247,13 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) if (io->stream == SND_PCM_STREAM_PLAYBACK) { for (channel = 0; channel < io->channels; channel++) snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); - return 0; + goto done; } } areas = snd_pcm_ioplug_mmap_areas(io); + xfer = 0; while (xfer < nframes) { snd_pcm_uframes_t frames = nframes - xfer; snd_pcm_uframes_t offset = pw->hw_ptr; @@ -246,6 +278,13 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ + done: + if (b->rb) + spa_ringbuffer_write_update(&b->rb->ringbuffer, index + nbytes); + + avail -= nbytes; + } while (avail > 0); + return 0; } @@ -357,8 +396,17 @@ static int impl_get_n_ports(struct spa_node *node, uint32_t *n_output_ports, uint32_t *max_output_ports) { - *n_input_ports = *max_input_ports = 0; - *n_output_ports = *max_output_ports = 1; + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + + pw_log_debug("%d %d", d->io.stream, SND_PCM_STREAM_PLAYBACK); + if (d->io.stream == SND_PCM_STREAM_PLAYBACK) { + *n_input_ports = *max_input_ports = 0; + *n_output_ports = *max_output_ports = 1; + } + else { + *n_input_ports = *max_input_ports = 1; + *n_output_ports = *max_output_ports = 0; + } return SPA_RESULT_OK; } @@ -368,8 +416,17 @@ static int impl_get_port_ids(struct spa_node *node, uint32_t n_output_ports, uint32_t *output_ids) { - if (n_output_ports > 0) - output_ids[0] = 0; + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + + pw_log_debug("%d %d", d->io.stream, SND_PCM_STREAM_PLAYBACK); + if (d->io.stream == SND_PCM_STREAM_PLAYBACK) { + if (n_output_ports > 0) + output_ids[0] = 0; + } + else { + if (n_input_ports > 0) + input_ids[0] = 0; + } return SPA_RESULT_OK; } @@ -381,75 +438,6 @@ static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, return SPA_RESULT_OK; } -static int impl_port_enum_formats(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - struct spa_format **format, - const struct spa_format *filter, - uint32_t index) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer)); - - if (index != 0) - return SPA_RESULT_ENUM_END; - - *format = spa_pod_builder_format(&b, d->type.format, - d->type.media_type.audio, d->type.media_subtype.raw, - ":", d->type.format_audio.format, "I", d->type.audio_format.S16, - ":", d->type.format_audio.channels, "i", 2, - ":", d->type.format_audio.rate, "i", 44100); - - return SPA_RESULT_OK; -} - -static int impl_port_set_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - uint32_t flags, const struct spa_format *format) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct pw_type *t = d->t; - struct spa_pod_builder b = { NULL }; - - if (format == NULL) - return SPA_RESULT_OK; - - if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0) - return SPA_RESULT_INVALID_MEDIA_TYPE; - - if (d->format.format != d->type.audio_format.S16) - return SPA_RESULT_ERROR; - - spa_pod_builder_init(&b, d->params_buffer, sizeof(d->params_buffer)); - d->params[0] = spa_pod_builder_param(&b, - t->param_alloc_buffers.Buffers, - ":", t->param_alloc_buffers.size, "iru", 1024, - 2, 32, 4096, - ":", t->param_alloc_buffers.stride, "i", 0, - ":", t->param_alloc_buffers.buffers, "iru", 2, - 2, 2, 32, - ":", t->param_alloc_buffers.align, "i", 16); - - d->params[1] = spa_pod_builder_param(&b, - t->param_alloc_meta_enable.MetaEnable, - ":", t->param_alloc_meta_enable.type, "I", t->meta.Header, - ":", t->param_alloc_meta_enable.size, "i", sizeof(struct spa_meta_header)); - - return SPA_RESULT_OK; -} - -static int impl_port_get_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - const struct spa_format **format) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer)); - - *format = spa_pod_builder_format(&b, d->type.format, - d->type.media_type.audio, d->type.media_subtype.raw, - ":", d->type.format_audio.format, "I", d->format.format, - ":", d->type.format_audio.channels, "i", d->format.channels, - ":", d->type.format_audio.rate, "i", d->format.rate); - - return SPA_RESULT_OK; -} - static int impl_port_get_info(struct spa_node *node, enum spa_direction direction, uint32_t port_id, const struct spa_port_info **info) { @@ -464,19 +452,138 @@ static int impl_port_get_info(struct spa_node *node, enum spa_direction directio return SPA_RESULT_OK; } -static int impl_port_enum_params(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - uint32_t index, struct spa_param **param) +static int impl_port_enum_params(struct spa_node *node, + enum spa_direction direction, uint32_t port_id, + uint32_t id, uint32_t *index, + const struct spa_pod_object *filter, + struct spa_pod_builder *builder) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct pw_type *t = d->t; + int bps; + + bps = d->io.channels * (d->sample_bits / 8); + + if (id == t->param.idList) { + uint32_t list[] = { t->param.idEnumFormat, + t->param.idFormat, + t->param.idBuffers, + t->param.idMeta }; + + if (*index < SPA_N_ELEMENTS(list)) + spa_pod_builder_object(builder, + id, t->param.List, + ":", t->param.listId, "I", list[*index]); + else + return SPA_RESULT_ENUM_END; + } + else if (id == t->param.idEnumFormat) { + if (*index != 0) + return SPA_RESULT_ENUM_END; + + spa_pod_builder_object(builder, + id, d->type.format, + "I", d->type.media_type.audio, + "I", d->type.media_subtype.raw, + ":", d->type.format_audio.format, "I", d->type.audio_format.S16, + ":", d->type.format_audio.channels, "i", 2, + ":", d->type.format_audio.rate, "i", 44100); + } + else if (id == t->param.idFormat) { + if (*index != 0 || d->format.format == 0) + return SPA_RESULT_ENUM_END; + + spa_pod_builder_object(builder, + id, d->type.format, + "I", d->type.media_type.audio, + "I", d->type.media_subtype.raw, + ":", d->type.format_audio.format, "I", d->format.format, + ":", d->type.format_audio.channels, "i", d->format.channels, + ":", d->type.format_audio.rate, "i", d->format.rate); + } + else if (id == t->param.idBuffers) { + if (*index != 0 || d->format.format == 0) + return SPA_RESULT_ENUM_END; + + spa_pod_builder_object(builder, + id, t->param_buffers.Buffers, + ":", t->param_buffers.size, "iru", d->min_avail * bps, + 2, d->min_avail * bps, INT32_MAX / bps, + ":", t->param_buffers.stride, "i", 0, + ":", t->param_buffers.buffers, "iru", d->io.buffer_size / d->min_avail, + 2, 2, 32, + ":", t->param_buffers.align, "i", 16); + } + else if (id == t->param.idMeta) { + if (d->format.format == 0) + return SPA_RESULT_ENUM_END; + + switch (*index) { + case 0: + spa_pod_builder_object(builder, + id, t->param_meta.Meta, + ":", t->param_meta.type, "I", t->meta.Header, + ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); + break; + case 1: + spa_pod_builder_object(builder, + id, t->param_meta.Meta, + ":", t->param_meta.type, "I", t->meta.Ringbuffer, + ":", t->param_meta.size, "i", sizeof(struct spa_meta_ringbuffer), + ":", t->param_meta.ringbufferSize, "iru", d->io.buffer_size * bps, + 2, d->min_avail * bps, INT32_MAX / bps, + ":", t->param_meta.ringbufferStride, "i", 0, + ":", t->param_meta.ringbufferBlocks, "i", 1, + ":", t->param_meta.ringbufferAlign, "i", 16); + break; + break; + default: + return SPA_RESULT_ENUM_END; + } + } + else + return SPA_RESULT_UNKNOWN_PARAM; + + (*index)++; + + return SPA_RESULT_OK; +} + +static int port_set_format(struct spa_node *node, + enum spa_direction direction, uint32_t port_id, + uint32_t flags, const struct spa_pod_object *format) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - if (index >= 2) - return SPA_RESULT_ENUM_END; + if (format == NULL) { + d->format.format = 0; + return SPA_RESULT_OK; + } - *param = d->params[index]; + if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0) + return SPA_RESULT_INVALID_MEDIA_TYPE; + + if (d->format.format != d->type.audio_format.S16) + return SPA_RESULT_ERROR; return SPA_RESULT_OK; } +static int impl_port_set_param(struct spa_node *node, + enum spa_direction direction, uint32_t port_id, + uint32_t id, uint32_t flags, + const struct spa_pod_object *param) +{ + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct pw_type *t = d->t; + + if (id == t->param.idFormat) { + return port_set_format(node, direction, port_id, flags, param); + } + else + return SPA_RESULT_UNKNOWN_PARAM; +} + static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id, struct spa_buffer **buffers, uint32_t n_buffers) { @@ -508,6 +615,8 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc } b->size = datas[0].maxsize; b->buffer = buffers[i]; + b->h = spa_buffer_find_meta(b->buffer, d->type.meta.Header); + b->rb = spa_buffer_find_meta(b->buffer, d->type.meta.Ringbuffer); pw_log_info("got buffer %d size %zd", i, b->size); spa_list_append(&d->empty, &b->link); b->used = false; @@ -535,7 +644,19 @@ static int impl_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint3 static int impl_node_process_input(struct spa_node *node) { - return SPA_RESULT_OK; + snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); + struct spa_port_io *io = d->port_io; + struct buffer *b; + + if (io->buffer_id >= d->n_buffers) { + io->status = SPA_RESULT_INVALID_BUFFER_ID; + return SPA_RESULT_INVALID_BUFFER_ID; + } + b = &d->buffers[io->buffer_id]; + + snd_pcm_pipewire_process(d, b); + + return io->status = SPA_RESULT_NEED_BUFFER; } static int impl_node_process_output(struct spa_node *node) @@ -554,14 +675,14 @@ static int impl_node_process_output(struct spa_node *node) } b = spa_list_first(&d->empty, struct buffer, link); spa_list_remove(&b->link); - b->used = true; + b->used = true; + io->buffer_id = b->buffer->id; + + pw_log_trace("alsa-pipewire %p: process buffer %d", d, io->buffer_id); snd_pcm_pipewire_process(d, b); - io->buffer_id = b->buffer->id; - io->status = SPA_RESULT_HAVE_BUFFER; - - return SPA_RESULT_HAVE_BUFFER; + return io->status = SPA_RESULT_HAVE_BUFFER; } static const struct spa_node impl_node = { @@ -571,11 +692,9 @@ static const struct spa_node impl_node = { .get_n_ports = impl_get_n_ports, .get_port_ids = impl_get_port_ids, .port_set_io = impl_port_set_io, - .port_enum_formats = impl_port_enum_formats, - .port_set_format = impl_port_set_format, - .port_get_format = impl_port_get_format, .port_get_info = impl_port_get_info, .port_enum_params = impl_port_enum_params, + .port_set_param = impl_port_set_param, .port_use_buffers = impl_port_use_buffers, .port_reuse_buffer = impl_port_reuse_buffer, .process_output = impl_node_process_output, @@ -590,6 +709,9 @@ static void on_state_changed(void *data, enum pw_remote_state old, switch (state) { case PW_REMOTE_STATE_ERROR: + pw->error = true; + pcm_poll_unblock_check(&pw->io); + /** FALLTHROUGH */ case PW_REMOTE_STATE_CONNECTED: pw_thread_loop_signal(pw->main_loop, false); break; @@ -671,6 +793,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, if (!pw) return -ENOMEM; + pw_log_debug("open %s %d %d", name, stream, mode); + pw->fd = -1; pw->io.poll_fd = -1; spa_list_init(&pw->empty); @@ -705,12 +829,6 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, return err; } - err = pipewire_node_create(pw, pipewire_node_name, target, false); - if (err < 0) { - snd_pcm_pipewire_free(pw); - return err; - } - pw->fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); pw->io.version = SND_PCM_IOPLUG_VERSION; @@ -726,6 +844,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, snd_pcm_pipewire_free(pw); return err; } + pw_log_debug("open %s %d %d", name, pw->io.stream, mode); err = pipewire_set_hw_constraint(pw); if (err < 0) { @@ -733,6 +852,12 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, return err; } + err = pipewire_node_create(pw, pipewire_node_name, target, false); + if (err < 0) { + snd_pcm_pipewire_free(pw); + return err; + } + *pcmp = pw->io.pcm; return 0; From f4ab376a08d1b6ab838b092b3919b081bdbaa432 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 14 Nov 2017 17:28:46 +0100 Subject: [PATCH 05/38] update to new API Also don't try to read avail_min from the alsa ringbuffer --- alsa-plugins/pcm_pipewire.c | 78 +++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 5663b84e4..77224e464 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -106,7 +106,6 @@ typedef struct { struct spa_port_io *port_io; struct spa_port_info port_info; - uint8_t buffer[1024]; struct spa_audio_info_raw format; struct buffer buffers[32]; @@ -224,6 +223,7 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) avail = b->rb->ringbuffer.size - filled; offset = index % b->rb->ringbuffer.size; nbytes = SPA_MIN(avail, b->rb->ringbuffer.size - offset); + nbytes = SPA_MIN(nbytes, pw->min_avail); ptr = SPA_MEMBER(b->ptr, offset, void); pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); @@ -245,6 +245,7 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) if (io->state != SND_PCM_STATE_RUNNING) { if (io->stream == SND_PCM_STREAM_PLAYBACK) { + pw_log_trace("slience %lu frames", nframes); for (channel = 0; channel < io->channels; channel++) snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); goto done; @@ -378,7 +379,7 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) static int impl_send_command(struct spa_node *node, const struct spa_command *command) { - return SPA_RESULT_OK; + return 0; } static int impl_set_callbacks(struct spa_node *node, @@ -387,7 +388,7 @@ static int impl_set_callbacks(struct spa_node *node, snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); d->callbacks = callbacks; d->callbacks_data = data; - return SPA_RESULT_OK; + return 0; } static int impl_get_n_ports(struct spa_node *node, @@ -407,7 +408,7 @@ static int impl_get_n_ports(struct spa_node *node, *n_input_ports = *max_input_ports = 1; *n_output_ports = *max_output_ports = 0; } - return SPA_RESULT_OK; + return 0; } static int impl_get_port_ids(struct spa_node *node, @@ -427,7 +428,7 @@ static int impl_get_port_ids(struct spa_node *node, if (n_input_ports > 0) input_ids[0] = 0; } - return SPA_RESULT_OK; + return 0; } static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id, @@ -435,7 +436,7 @@ static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); d->port_io = io; - return SPA_RESULT_OK; + return 0; } static int impl_port_get_info(struct spa_node *node, enum spa_direction direction, uint32_t port_id, @@ -449,13 +450,14 @@ static int impl_port_get_info(struct spa_node *node, enum spa_direction directio *info = &d->port_info; - return SPA_RESULT_OK; + return 0; } static int impl_port_enum_params(struct spa_node *node, enum spa_direction direction, uint32_t port_id, uint32_t id, uint32_t *index, - const struct spa_pod_object *filter, + const struct spa_pod *filter, + struct spa_pod **result, struct spa_pod_builder *builder) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); @@ -471,17 +473,17 @@ static int impl_port_enum_params(struct spa_node *node, t->param.idMeta }; if (*index < SPA_N_ELEMENTS(list)) - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, t->param.List, ":", t->param.listId, "I", list[*index]); else - return SPA_RESULT_ENUM_END; + return 0; } else if (id == t->param.idEnumFormat) { if (*index != 0) - return SPA_RESULT_ENUM_END; + return 0; - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, d->type.format, "I", d->type.media_type.audio, "I", d->type.media_subtype.raw, @@ -491,9 +493,9 @@ static int impl_port_enum_params(struct spa_node *node, } else if (id == t->param.idFormat) { if (*index != 0 || d->format.format == 0) - return SPA_RESULT_ENUM_END; + return 0; - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, d->type.format, "I", d->type.media_type.audio, "I", d->type.media_subtype.raw, @@ -503,9 +505,9 @@ static int impl_port_enum_params(struct spa_node *node, } else if (id == t->param.idBuffers) { if (*index != 0 || d->format.format == 0) - return SPA_RESULT_ENUM_END; + return 0; - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, t->param_buffers.Buffers, ":", t->param_buffers.size, "iru", d->min_avail * bps, 2, d->min_avail * bps, INT32_MAX / bps, @@ -516,17 +518,17 @@ static int impl_port_enum_params(struct spa_node *node, } else if (id == t->param.idMeta) { if (d->format.format == 0) - return SPA_RESULT_ENUM_END; + return 0; switch (*index) { case 0: - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, t->param_meta.Meta, ":", t->param_meta.type, "I", t->meta.Header, ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); break; case 1: - spa_pod_builder_object(builder, + *result = spa_pod_builder_object(builder, id, t->param_meta.Meta, ":", t->param_meta.type, "I", t->meta.Ringbuffer, ":", t->param_meta.size, "i", sizeof(struct spa_meta_ringbuffer), @@ -538,41 +540,41 @@ static int impl_port_enum_params(struct spa_node *node, break; break; default: - return SPA_RESULT_ENUM_END; + return 0; } } else - return SPA_RESULT_UNKNOWN_PARAM; + return -ENOENT; (*index)++; - return SPA_RESULT_OK; + return 1; } static int port_set_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - uint32_t flags, const struct spa_pod_object *format) + uint32_t flags, const struct spa_pod *format) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); if (format == NULL) { d->format.format = 0; - return SPA_RESULT_OK; + return 0; } if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0) - return SPA_RESULT_INVALID_MEDIA_TYPE; + return -EINVAL; if (d->format.format != d->type.audio_format.S16) - return SPA_RESULT_ERROR; + return -EINVAL; - return SPA_RESULT_OK; + return 0; } static int impl_port_set_param(struct spa_node *node, enum spa_direction direction, uint32_t port_id, uint32_t id, uint32_t flags, - const struct spa_pod_object *param) + const struct spa_pod *param) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); struct pw_type *t = d->t; @@ -581,7 +583,7 @@ static int impl_port_set_param(struct spa_node *node, return port_set_format(node, direction, port_id, flags, param); } else - return SPA_RESULT_UNKNOWN_PARAM; + return -ENOENT; } static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id, @@ -603,7 +605,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc MAP_SHARED, datas[0].fd, 0); if (b->ptr == MAP_FAILED) { pw_log_error("failed to buffer mem"); - return SPA_RESULT_ERROR; + return -errno; } b->ptr = SPA_MEMBER(b->ptr, datas[0].mapoffset, void); @@ -611,7 +613,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc } else { pw_log_error("invalid buffer mem"); - return SPA_RESULT_ERROR; + return -EINVAL; } b->size = datas[0].maxsize; b->buffer = buffers[i]; @@ -622,7 +624,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc b->used = false; } d->n_buffers = n_buffers; - return SPA_RESULT_OK; + return 0; } static inline void reuse_buffer(snd_pcm_pipewire_t *d, uint32_t id) @@ -639,7 +641,7 @@ static int impl_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint3 { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); reuse_buffer(d, buffer_id); - return SPA_RESULT_OK; + return 0; } static int impl_node_process_input(struct spa_node *node) @@ -649,14 +651,14 @@ static int impl_node_process_input(struct spa_node *node) struct buffer *b; if (io->buffer_id >= d->n_buffers) { - io->status = SPA_RESULT_INVALID_BUFFER_ID; - return SPA_RESULT_INVALID_BUFFER_ID; + io->status = -EINVAL; + return -EINVAL; } b = &d->buffers[io->buffer_id]; snd_pcm_pipewire_process(d, b); - return io->status = SPA_RESULT_NEED_BUFFER; + return io->status = SPA_STATUS_NEED_BUFFER; } static int impl_node_process_output(struct spa_node *node) @@ -671,7 +673,7 @@ static int impl_node_process_output(struct spa_node *node) } if (spa_list_is_empty(&d->empty)) { pw_log_error("alsa-pipewire %p: out of buffers", d); - return SPA_RESULT_OUT_OF_BUFFERS; + return -EPIPE; } b = spa_list_first(&d->empty, struct buffer, link); spa_list_remove(&b->link); @@ -682,7 +684,7 @@ static int impl_node_process_output(struct spa_node *node) pw_log_trace("alsa-pipewire %p: process buffer %d", d, io->buffer_id); snd_pcm_pipewire_process(d, b); - return io->status = SPA_RESULT_HAVE_BUFFER; + return io->status = SPA_STATUS_HAVE_BUFFER; } static const struct spa_node impl_node = { From 4270e867ed2d9cca4e46aa04814e017234727323 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 14 Nov 2017 18:00:55 +0100 Subject: [PATCH 06/38] alsa: limit the size we copy to min_avail --- alsa-plugins/pcm_pipewire.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 77224e464..6b050d314 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -204,12 +204,13 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) const snd_pcm_channel_area_t *areas; snd_pcm_channel_area_t *pwareas; snd_pcm_uframes_t xfer = 0; - unsigned int channel, bps; + unsigned int channel, bps, bpf; snd_pcm_uframes_t nframes; uint32_t index = 0, nbytes, maxsize, avail; void *ptr; bps = io->channels * pw->sample_bits; + bpf = bps / 8; pwareas = alloca(io->channels * sizeof(snd_pcm_channel_area_t)); @@ -219,23 +220,24 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) int32_t filled; uint32_t offset; - filled = spa_ringbuffer_get_write_index(&b->rb->ringbuffer, &index); - avail = b->rb->ringbuffer.size - filled; + filled = spa_ringbuffer_get_write_index(&b->rb->ringbuffer, &index); + avail = b->rb->ringbuffer.size - filled; offset = index % b->rb->ringbuffer.size; - nbytes = SPA_MIN(avail, b->rb->ringbuffer.size - offset); - nbytes = SPA_MIN(nbytes, pw->min_avail); + avail = SPA_MIN(avail, b->rb->ringbuffer.size - offset); + avail = SPA_MIN(avail, pw->min_avail * bpf); + nbytes = avail; ptr = SPA_MEMBER(b->ptr, offset, void); pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); } else { avail = b->buffer->datas[0].chunk->size; + avail = SPA_MIN(avail, pw->min_avail * bpf); maxsize = b->buffer->datas[0].maxsize; - nbytes = SPA_MIN(avail, maxsize); + nbytes = SPA_MIN(avail, maxsize); ptr = b->ptr; } - nframes = nbytes / (bps / 8); - nframes = SPA_MIN(nframes, pw->min_avail); + nframes = nbytes / bpf; for (channel = 0; channel < io->channels; channel++) { pwareas[channel].addr = ptr; From d2261dc1d66a96dffb753df0ce28af35e86357d6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 24 Nov 2017 12:43:10 +0100 Subject: [PATCH 07/38] port to new API --- alsa-plugins/pcm_pipewire.c | 206 +++++++++++++++++++++++------------- 1 file changed, 135 insertions(+), 71 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 6b050d314..6d286b72a 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -42,8 +43,6 @@ struct type { uint32_t format; uint32_t props; - struct spa_type_meta meta; - struct spa_type_data data; struct spa_type_media_type media_type; struct spa_type_media_subtype media_subtype; struct spa_type_format_audio format_audio; @@ -54,8 +53,6 @@ static inline void init_type(struct type *type, struct spa_type_map *map) { type->format = spa_type_map_get_id(map, SPA_TYPE__Format); type->props = spa_type_map_get_id(map, SPA_TYPE__Props); - spa_type_meta_map(map, &type->meta); - spa_type_data_map(map, &type->data); spa_type_media_type_map(map, &type->media_type); spa_type_media_subtype_map(map, &type->media_subtype); spa_type_format_audio_map(map, &type->format_audio); @@ -66,9 +63,7 @@ struct buffer { struct spa_buffer *buffer; struct spa_list link; struct spa_meta_header *h; - struct spa_meta_ringbuffer *rb; void *ptr; - size_t size; bool mapped; bool used; }; @@ -103,7 +98,7 @@ typedef struct { struct spa_node impl_node; const struct spa_node_callbacks *callbacks; void *callbacks_data; - struct spa_port_io *port_io; + struct spa_io_buffers *port_io; struct spa_port_info port_info; struct spa_audio_info_raw format; @@ -198,7 +193,7 @@ static snd_pcm_sframes_t snd_pcm_pipewire_pointer(snd_pcm_ioplug_t *io) } static int -snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) +snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct buffer *b) { snd_pcm_ioplug_t *io = &pw->io; const snd_pcm_channel_area_t *areas; @@ -206,7 +201,92 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) snd_pcm_uframes_t xfer = 0; unsigned int channel, bps, bpf; snd_pcm_uframes_t nframes; - uint32_t index = 0, nbytes, maxsize, avail; + uint32_t offset, index = 0, nbytes, avail, maxsize; + int32_t filled; + void *ptr; + struct spa_data *d; + + bps = io->channels * pw->sample_bits; + bpf = bps / 8; + + pwareas = alloca(io->channels * sizeof(snd_pcm_channel_area_t)); + + d = b->buffer->datas; + + maxsize = d[0].maxsize; + + filled = 0; + index = 0; + avail = maxsize - filled; + avail = SPA_MIN(avail, pw->min_avail * bpf); + + do { + offset = index % maxsize; + nbytes = SPA_MIN(avail, maxsize - offset); + + ptr = SPA_MEMBER(b->ptr, offset, void); + pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); + + nframes = nbytes / bpf; + + for (channel = 0; channel < io->channels; channel++) { + pwareas[channel].addr = ptr; + pwareas[channel].first = channel * pw->sample_bits; + pwareas[channel].step = bps; + } + + if (io->state != SND_PCM_STATE_RUNNING) { + pw_log_trace("silence %lu frames", nframes); + for (channel = 0; channel < io->channels; channel++) + snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); + goto done; + } + + areas = snd_pcm_ioplug_mmap_areas(io); + + xfer = 0; + while (xfer < nframes) { + snd_pcm_uframes_t frames = nframes - xfer; + snd_pcm_uframes_t offset = pw->hw_ptr; + snd_pcm_uframes_t cont = io->buffer_size - offset; + + if (cont < frames) + frames = cont; + + snd_pcm_areas_copy(pwareas, xfer, + areas, offset, + io->channels, frames, io->format); + + pw->hw_ptr += frames; + pw->hw_ptr %= io->buffer_size; + xfer += frames; + } + + pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ + + done: + index += nbytes; + avail -= nbytes; + } while (avail > 0); + + d[0].chunk->offset = 0; + d[0].chunk->size = index; + d[0].chunk->stride = 0; + + return 0; +} + +static int +snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct buffer *b) +{ + snd_pcm_ioplug_t *io = &pw->io; + const snd_pcm_channel_area_t *areas; + snd_pcm_channel_area_t *pwareas; + snd_pcm_uframes_t xfer = 0; + unsigned int channel, bps, bpf; + snd_pcm_uframes_t nframes; + uint32_t offset, index = 0, nbytes, avail, maxsize; + struct spa_data *d; void *ptr; bps = io->channels * pw->sample_bits; @@ -214,29 +294,19 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) pwareas = alloca(io->channels * sizeof(snd_pcm_channel_area_t)); + d = b->buffer->datas; + + maxsize = d[0].chunk->size; + avail = maxsize; + index = d[0].chunk->offset; + do { + avail = SPA_MIN(avail, pw->min_avail * bpf); + offset = index % maxsize; + nbytes = SPA_MIN(avail, maxsize - offset); + ptr = SPA_MEMBER(b->ptr, offset, void); - if (b->rb) { - int32_t filled; - uint32_t offset; - - filled = spa_ringbuffer_get_write_index(&b->rb->ringbuffer, &index); - avail = b->rb->ringbuffer.size - filled; - offset = index % b->rb->ringbuffer.size; - avail = SPA_MIN(avail, b->rb->ringbuffer.size - offset); - avail = SPA_MIN(avail, pw->min_avail * bpf); - nbytes = avail; - - ptr = SPA_MEMBER(b->ptr, offset, void); - pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); - } - else { - avail = b->buffer->datas[0].chunk->size; - avail = SPA_MIN(avail, pw->min_avail * bpf); - maxsize = b->buffer->datas[0].maxsize; - nbytes = SPA_MIN(avail, maxsize); - ptr = b->ptr; - } + pw_log_trace("%d %d %d %p", nbytes, avail, offset, ptr); nframes = nbytes / bpf; for (channel = 0; channel < io->channels; channel++) { @@ -282,10 +352,8 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct buffer *b) pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ done: - if (b->rb) - spa_ringbuffer_write_update(&b->rb->ringbuffer, index + nbytes); - avail -= nbytes; + index += nbytes; } while (avail > 0); return 0; @@ -347,10 +415,13 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .poll_revents = snd_pcm_pipewire_poll_revents, }; -#define ARRAY_SIZE(ary) (sizeof(ary)/sizeof(ary[0])) - static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) { + /* period and buffer bytes must be power of two */ + static const unsigned int bytes_list[] = { + 1U<<5, 1U<<6, 1U<<7, 1U<<8, 1U<<9, 1U<<10, 1U<<11, 1U<<12, 1U<<13, + 1U<<14, 1U<<15, 1U<<16, 1U<<17,1U<<18, 1U<<19, 1U<<20 + }; unsigned int access_list[] = { SND_PCM_ACCESS_MMAP_INTERLEAVED, SND_PCM_ACCESS_MMAP_NONINTERLEAVED, @@ -363,15 +434,17 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) pw->sample_bits = snd_pcm_format_physical_width(format); if ((err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_ACCESS, - ARRAY_SIZE(access_list), access_list)) < 0 || + SPA_N_ELEMENTS(access_list), access_list)) < 0 || (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_FORMAT, 1, &format)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_CHANNELS, 2, 2)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, rate, rate)) < 0 || - (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, - 128, 64*1024)) < 0 || + (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, + SPA_N_ELEMENTS(bytes_list), bytes_list)) < 0 || + (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, + SPA_N_ELEMENTS(bytes_list), bytes_list)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIODS, 2, 64)) < 0) return err; @@ -414,30 +487,35 @@ static int impl_get_n_ports(struct spa_node *node, } static int impl_get_port_ids(struct spa_node *node, - uint32_t n_input_ports, uint32_t *input_ids, - uint32_t n_output_ports, - uint32_t *output_ids) + uint32_t n_input_ids, + uint32_t *output_ids, + uint32_t n_output_ids) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); pw_log_debug("%d %d", d->io.stream, SND_PCM_STREAM_PLAYBACK); if (d->io.stream == SND_PCM_STREAM_PLAYBACK) { - if (n_output_ports > 0) + if (n_output_ids > 0) output_ids[0] = 0; } else { - if (n_input_ports > 0) + if (n_input_ids > 0) input_ids[0] = 0; } return 0; } static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - struct spa_port_io *io) + uint32_t id, void *data, size_t size) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - d->port_io = io; + + if (id == d->t->io.Buffers) + d->port_io = data; + else + return -ENOENT; + return 0; } @@ -511,11 +589,11 @@ static int impl_port_enum_params(struct spa_node *node, *result = spa_pod_builder_object(builder, id, t->param_buffers.Buffers, - ":", t->param_buffers.size, "iru", d->min_avail * bps, + ":", t->param_buffers.size, "iru", d->io.buffer_size * bps, 2, d->min_avail * bps, INT32_MAX / bps, ":", t->param_buffers.stride, "i", 0, - ":", t->param_buffers.buffers, "iru", d->io.buffer_size / d->min_avail, - 2, 2, 32, + ":", t->param_buffers.buffers, "iru", 1, + 2, 1, 32, ":", t->param_buffers.align, "i", 16); } else if (id == t->param.idMeta) { @@ -529,18 +607,6 @@ static int impl_port_enum_params(struct spa_node *node, ":", t->param_meta.type, "I", t->meta.Header, ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); break; - case 1: - *result = spa_pod_builder_object(builder, - id, t->param_meta.Meta, - ":", t->param_meta.type, "I", t->meta.Ringbuffer, - ":", t->param_meta.size, "i", sizeof(struct spa_meta_ringbuffer), - ":", t->param_meta.ringbufferSize, "iru", d->io.buffer_size * bps, - 2, d->min_avail * bps, INT32_MAX / bps, - ":", t->param_meta.ringbufferStride, "i", 0, - ":", t->param_meta.ringbufferBlocks, "i", 1, - ":", t->param_meta.ringbufferAlign, "i", 16); - break; - break; default: return 0; } @@ -601,8 +667,8 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc b->ptr = datas[0].data; b->mapped = false; } - else if (datas[0].type == d->type.data.MemFd || - datas[0].type == d->type.data.DmaBuf) { + else if (datas[0].type == d->t->data.MemFd || + datas[0].type == d->t->data.DmaBuf) { b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE, MAP_SHARED, datas[0].fd, 0); if (b->ptr == MAP_FAILED) { @@ -617,11 +683,10 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc pw_log_error("invalid buffer mem"); return -EINVAL; } - b->size = datas[0].maxsize; b->buffer = buffers[i]; - b->h = spa_buffer_find_meta(b->buffer, d->type.meta.Header); - b->rb = spa_buffer_find_meta(b->buffer, d->type.meta.Ringbuffer); - pw_log_info("got buffer %d size %zd", i, b->size); + b->h = spa_buffer_find_meta(b->buffer, d->t->meta.Header); + + pw_log_info("got buffer %d size %d", i, datas[0].maxsize); spa_list_append(&d->empty, &b->link); b->used = false; } @@ -649,7 +714,7 @@ static int impl_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint3 static int impl_node_process_input(struct spa_node *node) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct spa_port_io *io = d->port_io; + struct spa_io_buffers *io = d->port_io; struct buffer *b; if (io->buffer_id >= d->n_buffers) { @@ -658,7 +723,7 @@ static int impl_node_process_input(struct spa_node *node) } b = &d->buffers[io->buffer_id]; - snd_pcm_pipewire_process(d, b); + snd_pcm_pipewire_process_record(d, b); return io->status = SPA_STATUS_NEED_BUFFER; } @@ -667,7 +732,7 @@ static int impl_node_process_output(struct spa_node *node) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); struct buffer *b; - struct spa_port_io *io = d->port_io; + struct spa_io_buffers *io = d->port_io; if (io->buffer_id < d->n_buffers) { reuse_buffer(d, io->buffer_id); @@ -683,8 +748,7 @@ static int impl_node_process_output(struct spa_node *node) b->used = true; io->buffer_id = b->buffer->id; - pw_log_trace("alsa-pipewire %p: process buffer %d", d, io->buffer_id); - snd_pcm_pipewire_process(d, b); + snd_pcm_pipewire_process_playback(d, b); return io->status = SPA_STATUS_HAVE_BUFFER; } From 407ba179272d7156c96fc95a30d55335e176fa2a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 12 Jan 2018 15:46:16 +0100 Subject: [PATCH 08/38] add node and server argument --- alsa-plugins/pcm_pipewire.c | 5 +++++ conf/50-pipewire.conf | 35 ++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 6d286b72a..dd3d4ce1c 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -936,6 +936,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) { snd_config_iterator_t i, next; const char *node_name = NULL; + const char *server_name = NULL; const char *playback_node = NULL; const char *capture_node = NULL; int err; @@ -953,6 +954,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) snd_config_get_string(n, &node_name); continue; } + if (strcmp(id, "server") == 0) { + snd_config_get_string(n, &server_name); + continue; + } if (strcmp(id, "playback_node") == 0) { snd_config_get_string(n, &playback_node); continue; diff --git a/conf/50-pipewire.conf b/conf/50-pipewire.conf index adbcb60f6..0e34a1908 100644 --- a/conf/50-pipewire.conf +++ b/conf/50-pipewire.conf @@ -1,11 +1,32 @@ # Add a specific named PipeWire pcm +defaults.pipewire.server "pipewire-0" +defaults.pipewire.node "13" + pcm.pipewire { - type pipewire - playback_node "5" - capture_node "4" - hint { - show on - description "PipeWire Sound Server" - } + @args [ SERVER NODE ] + @args.SERVER { + type string + default { + @func refer + name defaults.pipewire.server + } + } + @args.NODE { + type string + default { + @func refer + name defaults.pipewire.node + } + } + + + type pipewire + server $SERVER + playback_node $NODE + capture_node "6" + hint { + show on + description "PipeWire Sound Server" + } } From 89200d6bdaf13bea45ccf0f91fdc4806bccfee40 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 24 Jan 2018 16:30:43 +0100 Subject: [PATCH 09/38] alsa: update --- alsa-plugins/pcm_pipewire.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index dd3d4ce1c..f9ead42f2 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -827,7 +827,7 @@ static int pipewire_node_create(snd_pcm_pipewire_t *pw, 0); pw->impl_node = impl_node; pw_node_set_implementation(pw->node, &pw->impl_node); - pw_node_register(pw->node, NULL, NULL); + pw_node_register(pw->node, NULL, NULL, NULL); pw_remote_export(pw->remote, pw->node); pw_thread_loop_unlock(pw->main_loop); From 7e1ec8b4809b2f6c55b6d732415e8e403dd39fd5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 26 Feb 2018 17:32:37 +0100 Subject: [PATCH 10/38] alsa-pipewire: small fixes --- alsa-plugins/pcm_pipewire.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index f9ead42f2..115086ce6 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -104,7 +104,7 @@ typedef struct { struct spa_audio_info_raw format; struct buffer buffers[32]; - int n_buffers; + uint32_t n_buffers; struct spa_list empty; } snd_pcm_pipewire_t; @@ -120,7 +120,7 @@ static int pcm_poll_block_check(snd_pcm_ioplug_t *io) if (io->state == SND_PCM_STATE_RUNNING || (io->state == SND_PCM_STATE_PREPARED && io->stream == SND_PCM_STREAM_CAPTURE)) { avail = snd_pcm_avail_update(io->pcm); - if (avail >= 0 && avail < pw->min_avail) { + if (avail >= 0 && avail < (snd_pcm_sframes_t)pw->min_avail) { read(io->poll_fd, &val, sizeof(val)); return 1; } @@ -136,7 +136,7 @@ static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) snd_pcm_pipewire_t *pw = io->private_data; avail = snd_pcm_avail_update(io->pcm); - if (avail < 0 || avail >= pw->min_avail || pw->error) { + if (avail < 0 || avail >= (snd_pcm_sframes_t)pw->min_avail || pw->error) { write(pw->fd, &val, sizeof(val)); return 1; } @@ -658,7 +658,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc struct spa_buffer **buffers, uint32_t n_buffers) { snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - int i; + uint32_t i; for (i = 0; i < n_buffers; i++) { struct buffer *b = &d->buffers[i]; struct spa_data *datas = buffers[i]->datas; @@ -673,6 +673,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc MAP_SHARED, datas[0].fd, 0); if (b->ptr == MAP_FAILED) { pw_log_error("failed to buffer mem"); + b->ptr = NULL; return -errno; } @@ -779,7 +780,7 @@ static void on_state_changed(void *data, enum pw_remote_state old, case PW_REMOTE_STATE_ERROR: pw->error = true; pcm_poll_unblock_check(&pw->io); - /** FALLTHROUGH */ + /* fallthrough */ case PW_REMOTE_STATE_CONNECTED: pw_thread_loop_signal(pw->main_loop, false); break; From 8f8687b71d5ea34c0e8d9c3e4d51a2737650e6cf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 14 Mar 2018 12:00:45 +0100 Subject: [PATCH 11/38] cleanups --- alsa-plugins/pcm_pipewire.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 115086ce6..6e50d7541 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -40,6 +40,8 @@ #include +#define MAX_BUFFERS 8 + struct type { uint32_t format; uint32_t props; @@ -103,7 +105,7 @@ typedef struct { struct spa_audio_info_raw format; - struct buffer buffers[32]; + struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; struct spa_list empty; @@ -590,10 +592,10 @@ static int impl_port_enum_params(struct spa_node *node, *result = spa_pod_builder_object(builder, id, t->param_buffers.Buffers, ":", t->param_buffers.size, "iru", d->io.buffer_size * bps, - 2, d->min_avail * bps, INT32_MAX / bps, + SPA_POD_PROP_MIN_MAX(d->min_avail * bps, INT32_MAX / bps), ":", t->param_buffers.stride, "i", 0, - ":", t->param_buffers.buffers, "iru", 1, - 2, 1, 32, + ":", t->param_buffers.buffers, "iru", 2, + SPA_POD_PROP_MIN_MAX(2, MAX_BUFFERS), ":", t->param_buffers.align, "i", 16); } else if (id == t->param.idMeta) { From 9255640f5fb91a64a1196dfe6246ce4f5b5277de Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 23 Mar 2018 13:35:39 +0100 Subject: [PATCH 12/38] alsa: rewrite with pw_stream --- alsa-plugins/pcm_pipewire.c | 669 +++++++++++++----------------------- 1 file changed, 236 insertions(+), 433 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 6e50d7541..a6b773c53 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -20,6 +20,7 @@ */ #define __USE_GNU +#define _GNU_SOURCE #include #include @@ -41,10 +42,10 @@ #include #define MAX_BUFFERS 8 +#define MAX_CHANNELS 32 +#define MAX_RATE (48000*8) struct type { - uint32_t format; - uint32_t props; struct spa_type_media_type media_type; struct spa_type_media_subtype media_subtype; struct spa_type_format_audio format_audio; @@ -53,23 +54,12 @@ struct type { static inline void init_type(struct type *type, struct spa_type_map *map) { - type->format = spa_type_map_get_id(map, SPA_TYPE__Format); - type->props = spa_type_map_get_id(map, SPA_TYPE__Props); spa_type_media_type_map(map, &type->media_type); spa_type_media_subtype_map(map, &type->media_subtype); spa_type_format_audio_map(map, &type->format_audio); spa_type_audio_format_map(map, &type->audio_format); } -struct buffer { - struct spa_buffer *buffer; - struct spa_list link; - struct spa_meta_header *h; - void *ptr; - bool mapped; - bool used; -}; - typedef enum _pipewire_format { SND_PCM_PIPEWIRE_FORMAT_RAW } snd_pcm_pipewire_format_t; @@ -77,8 +67,11 @@ typedef enum _pipewire_format { typedef struct { snd_pcm_ioplug_t io; + char *node_name; + char *target; + int fd; - int activated; /* PipeWire is activated? */ + bool activated; /* PipeWire is activated? */ bool error; unsigned int num_ports; @@ -87,28 +80,21 @@ typedef struct { snd_pcm_uframes_t min_avail; struct type type; + struct pw_loop *loop; struct pw_thread_loop *main_loop; + struct pw_core *core; struct pw_type *t; struct pw_remote *remote; struct spa_hook remote_listener; - struct pw_node *node; - - struct spa_node impl_node; - const struct spa_node_callbacks *callbacks; - void *callbacks_data; - struct spa_io_buffers *port_io; - struct spa_port_info port_info; + struct pw_stream *stream; + struct spa_hook stream_listener; struct spa_audio_info_raw format; - struct buffer buffers[MAX_BUFFERS]; - uint32_t n_buffers; - struct spa_list empty; - } snd_pcm_pipewire_t; static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io); @@ -191,11 +177,15 @@ static int snd_pcm_pipewire_poll_revents(snd_pcm_ioplug_t *io, static snd_pcm_sframes_t snd_pcm_pipewire_pointer(snd_pcm_ioplug_t *io) { snd_pcm_pipewire_t *pw = io->private_data; + + if (pw->error) + return -EBADFD; + return pw->hw_ptr; } static int -snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct buffer *b) +snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct pw_buffer *b) { snd_pcm_ioplug_t *io = &pw->io; const snd_pcm_channel_area_t *areas; @@ -226,7 +216,7 @@ snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct buffer *b) offset = index % maxsize; nbytes = SPA_MIN(avail, maxsize - offset); - ptr = SPA_MEMBER(b->ptr, offset, void); + ptr = SPA_MEMBER(d[0].data, offset, void); pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); nframes = nbytes / bpf; @@ -279,7 +269,7 @@ snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct buffer *b) } static int -snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct buffer *b) +snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) { snd_pcm_ioplug_t *io = &pw->io; const snd_pcm_channel_area_t *areas; @@ -306,7 +296,7 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct buffer *b) avail = SPA_MIN(avail, pw->min_avail * bpf); offset = index % maxsize; nbytes = SPA_MIN(avail, maxsize - offset); - ptr = SPA_MEMBER(b->ptr, offset, void); + ptr = SPA_MEMBER(d[0].data, offset, void); pw_log_trace("%d %d %d %p", nbytes, avail, offset, ptr); nframes = nbytes / bpf; @@ -361,39 +351,97 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct buffer *b) return 0; } +static void on_stream_process(void *data) +{ + snd_pcm_pipewire_t *pw = data; + snd_pcm_ioplug_t *io = &pw->io; + struct pw_buffer *b; + + b = pw_stream_dequeue_buffer(pw->stream); + if (b == NULL) + return; + + if (io->stream == SND_PCM_STREAM_PLAYBACK) + snd_pcm_pipewire_process_playback(pw, b); + else + snd_pcm_pipewire_process_record(pw, b); + + pw_stream_queue_buffer(pw->stream, b); +} + +static const struct pw_stream_events stream_events = { + PW_VERSION_STREAM_EVENTS, + .process = on_stream_process, +}; + static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) { snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_sw_params_t *swparams; - int err; + const struct spa_pod *params[1]; + uint8_t buffer[1024]; + struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); + struct pw_type *t = pw->t; + int res; + + pw_thread_loop_lock(pw->main_loop); + + if (pw->stream) { + pw_stream_destroy(pw->stream); + pw->stream = NULL; + } + + pw->stream = pw_stream_new(pw->remote, pw->node_name, NULL); + if (pw->stream == NULL) + goto error; + + pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); + + params[0] = spa_pod_builder_object(&b, + t->param.idEnumFormat, t->spa_format, + "I", pw->type.media_type.audio, + "I", pw->type.media_subtype.raw, + ":", pw->type.format_audio.format, "I", pw->format.format, + ":", pw->type.format_audio.channels, "i", pw->format.channels, + ":", pw->type.format_audio.rate, "i", pw->format.rate); + + spa_debug_pod(params[0], SPA_DEBUG_FLAG_FORMAT); + + pw_stream_connect(pw->stream, + PW_DIRECTION_OUTPUT, + pw->target, + PW_STREAM_FLAG_AUTOCONNECT | + PW_STREAM_FLAG_MAP_BUFFERS | + PW_STREAM_FLAG_RT_PROCESS, + params, 1); pw->hw_ptr = 0; - pw->min_avail = io->period_size; snd_pcm_sw_params_alloca(&swparams); - err = snd_pcm_sw_params_current(io->pcm, swparams); - if (err == 0) { + if ((res = snd_pcm_sw_params_current(io->pcm, swparams)) == 0) snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail); - } - - /* deactivate PipeWire connections if this is XRUN recovery */ - snd_pcm_pipewire_stop(io); - - if (io->stream == SND_PCM_STREAM_PLAYBACK) - pcm_poll_unblock_check(io); /* playback pcm initially accepts writes */ else - pcm_poll_block_check(io); /* block capture pcm if that's XRUN recovery */ + pw->min_avail = io->period_size; + + pw_thread_loop_unlock(pw->main_loop); return 0; + + error: + pw_thread_loop_unlock(pw->main_loop); + return -ENOMEM; } static int snd_pcm_pipewire_start(snd_pcm_ioplug_t *io) { snd_pcm_pipewire_t *pw = io->private_data; - pw_node_set_active(pw->node, true); - pw->activated = 1; - + pw_thread_loop_lock(pw->main_loop); + if (!pw->activated) { + pw_stream_set_active(pw->stream, true); + pw->activated = true; + } + pw_thread_loop_unlock(pw->main_loop); return 0; } @@ -401,10 +449,91 @@ static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) { snd_pcm_pipewire_t *pw = io->private_data; + pw_thread_loop_lock(pw->main_loop); if (pw->activated) { - pw_node_set_active(pw->node, false); - pw->activated = 0; + pw_stream_set_active(pw->stream, false); + pw->activated = false; } + pw_thread_loop_unlock(pw->main_loop); + return 0; +} + +#if __BYTE_ORDER == __BIG_ENDIAN +#define _FORMAT_LE(s, fmt) s . fmt ## _OE +#define _FORMAT_BE(s, fmt) s . fmt +#elif __BYTE_ORDER == __LITTLE_ENDIAN +#define _FORMAT_LE(s, fmt) s . fmt +#define _FORMAT_BE(s, fmt) s . fmt ## _OE +#endif + +static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, + snd_pcm_hw_params_t * params) +{ + snd_pcm_pipewire_t *pw = io->private_data; + + switch (io->format) { + case SND_PCM_FORMAT_S8: + pw->format.format = pw->type.audio_format.S8; + break; + case SND_PCM_FORMAT_U8: + pw->format.format = pw->type.audio_format.U8; + break; + case SND_PCM_FORMAT_S16_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, S16); + break; + case SND_PCM_FORMAT_S16_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, S16); + break; + case SND_PCM_FORMAT_U16_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, U16); + break; + case SND_PCM_FORMAT_U16_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, U16); + break; + case SND_PCM_FORMAT_S24_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, S24_32); + break; + case SND_PCM_FORMAT_S24_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, S24_32); + break; + case SND_PCM_FORMAT_U24_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, U24_32); + break; + case SND_PCM_FORMAT_U24_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, U24_32); + break; + case SND_PCM_FORMAT_S32_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, S32); + break; + case SND_PCM_FORMAT_S32_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, S32); + break; + case SND_PCM_FORMAT_U32_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, U32); + break; + case SND_PCM_FORMAT_U32_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, U32); + break; + case SND_PCM_FORMAT_FLOAT_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, F32); + break; + case SND_PCM_FORMAT_FLOAT_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, F32); + break; + case SND_PCM_FORMAT_FLOAT64_LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, F64); + break; + case SND_PCM_FORMAT_FLOAT64_BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, F64); + break; + default: + return -EINVAL; + } + pw->format.channels = io->channels; + pw->format.rate = io->rate; + + pw->sample_bits = snd_pcm_format_physical_width(io->format); + return 0; } @@ -415,6 +544,7 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .pointer = snd_pcm_pipewire_pointer, .prepare = snd_pcm_pipewire_prepare, .poll_revents = snd_pcm_pipewire_poll_revents, + .hw_params = snd_pcm_pipewire_hw_params, }; static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) @@ -430,19 +560,40 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) SND_PCM_ACCESS_RW_INTERLEAVED, SND_PCM_ACCESS_RW_NONINTERLEAVED }; - unsigned int format = SND_PCM_FORMAT_S16_LE; - unsigned int rate = 44100; + unsigned int format_list[] = { + SND_PCM_FORMAT_S16_LE, +#if 0 + SND_PCM_FORMAT_S8, + SND_PCM_FORMAT_U8, + SND_PCM_FORMAT_S16_LE, + SND_PCM_FORMAT_S16_BE, + SND_PCM_FORMAT_U16_LE, + SND_PCM_FORMAT_U16_BE, + SND_PCM_FORMAT_S24_LE, + SND_PCM_FORMAT_S24_BE, + SND_PCM_FORMAT_U24_LE, + SND_PCM_FORMAT_U24_BE, + SND_PCM_FORMAT_S32_LE, + SND_PCM_FORMAT_S32_BE, + SND_PCM_FORMAT_U32_LE, + SND_PCM_FORMAT_U32_BE, + SND_PCM_FORMAT_FLOAT_LE, + SND_PCM_FORMAT_FLOAT_BE, + SND_PCM_FORMAT_FLOAT64_LE, + SND_PCM_FORMAT_FLOAT64_BE, +#endif + }; + int err; - pw->sample_bits = snd_pcm_format_physical_width(format); if ((err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_ACCESS, SPA_N_ELEMENTS(access_list), access_list)) < 0 || (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_FORMAT, - 1, &format)) < 0 || + SPA_N_ELEMENTS(format_list), format_list)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_CHANNELS, - 2, 2)) < 0 || + 1, MAX_CHANNELS)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, - rate, rate)) < 0 || + 1, MAX_RATE)) < 0 || (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, SPA_N_ELEMENTS(bytes_list), bytes_list)) < 0 || (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, @@ -454,327 +605,8 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) return 0; } -static int impl_send_command(struct spa_node *node, const struct spa_command *command) -{ - return 0; -} - -static int impl_set_callbacks(struct spa_node *node, - const struct spa_node_callbacks *callbacks, void *data) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - d->callbacks = callbacks; - d->callbacks_data = data; - return 0; -} - -static int impl_get_n_ports(struct spa_node *node, - uint32_t *n_input_ports, - uint32_t *max_input_ports, - uint32_t *n_output_ports, - uint32_t *max_output_ports) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - - pw_log_debug("%d %d", d->io.stream, SND_PCM_STREAM_PLAYBACK); - if (d->io.stream == SND_PCM_STREAM_PLAYBACK) { - *n_input_ports = *max_input_ports = 0; - *n_output_ports = *max_output_ports = 1; - } - else { - *n_input_ports = *max_input_ports = 1; - *n_output_ports = *max_output_ports = 0; - } - return 0; -} - -static int impl_get_port_ids(struct spa_node *node, - uint32_t *input_ids, - uint32_t n_input_ids, - uint32_t *output_ids, - uint32_t n_output_ids) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - - pw_log_debug("%d %d", d->io.stream, SND_PCM_STREAM_PLAYBACK); - if (d->io.stream == SND_PCM_STREAM_PLAYBACK) { - if (n_output_ids > 0) - output_ids[0] = 0; - } - else { - if (n_input_ids > 0) - input_ids[0] = 0; - } - return 0; -} - -static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - uint32_t id, void *data, size_t size) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - - if (id == d->t->io.Buffers) - d->port_io = data; - else - return -ENOENT; - - return 0; -} - -static int impl_port_get_info(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - const struct spa_port_info **info) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - - d->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS; - d->port_info.rate = 0; - d->port_info.props = NULL; - - *info = &d->port_info; - - return 0; -} - -static int impl_port_enum_params(struct spa_node *node, - enum spa_direction direction, uint32_t port_id, - uint32_t id, uint32_t *index, - const struct spa_pod *filter, - struct spa_pod **result, - struct spa_pod_builder *builder) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct pw_type *t = d->t; - int bps; - - bps = d->io.channels * (d->sample_bits / 8); - - if (id == t->param.idList) { - uint32_t list[] = { t->param.idEnumFormat, - t->param.idFormat, - t->param.idBuffers, - t->param.idMeta }; - - if (*index < SPA_N_ELEMENTS(list)) - *result = spa_pod_builder_object(builder, - id, t->param.List, - ":", t->param.listId, "I", list[*index]); - else - return 0; - } - else if (id == t->param.idEnumFormat) { - if (*index != 0) - return 0; - - *result = spa_pod_builder_object(builder, - id, d->type.format, - "I", d->type.media_type.audio, - "I", d->type.media_subtype.raw, - ":", d->type.format_audio.format, "I", d->type.audio_format.S16, - ":", d->type.format_audio.channels, "i", 2, - ":", d->type.format_audio.rate, "i", 44100); - } - else if (id == t->param.idFormat) { - if (*index != 0 || d->format.format == 0) - return 0; - - *result = spa_pod_builder_object(builder, - id, d->type.format, - "I", d->type.media_type.audio, - "I", d->type.media_subtype.raw, - ":", d->type.format_audio.format, "I", d->format.format, - ":", d->type.format_audio.channels, "i", d->format.channels, - ":", d->type.format_audio.rate, "i", d->format.rate); - } - else if (id == t->param.idBuffers) { - if (*index != 0 || d->format.format == 0) - return 0; - - *result = spa_pod_builder_object(builder, - id, t->param_buffers.Buffers, - ":", t->param_buffers.size, "iru", d->io.buffer_size * bps, - SPA_POD_PROP_MIN_MAX(d->min_avail * bps, INT32_MAX / bps), - ":", t->param_buffers.stride, "i", 0, - ":", t->param_buffers.buffers, "iru", 2, - SPA_POD_PROP_MIN_MAX(2, MAX_BUFFERS), - ":", t->param_buffers.align, "i", 16); - } - else if (id == t->param.idMeta) { - if (d->format.format == 0) - return 0; - - switch (*index) { - case 0: - *result = spa_pod_builder_object(builder, - id, t->param_meta.Meta, - ":", t->param_meta.type, "I", t->meta.Header, - ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); - break; - default: - return 0; - } - } - else - return -ENOENT; - - (*index)++; - - return 1; -} - -static int port_set_format(struct spa_node *node, - enum spa_direction direction, uint32_t port_id, - uint32_t flags, const struct spa_pod *format) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - - if (format == NULL) { - d->format.format = 0; - return 0; - } - - if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0) - return -EINVAL; - - if (d->format.format != d->type.audio_format.S16) - return -EINVAL; - - return 0; -} - -static int impl_port_set_param(struct spa_node *node, - enum spa_direction direction, uint32_t port_id, - uint32_t id, uint32_t flags, - const struct spa_pod *param) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct pw_type *t = d->t; - - if (id == t->param.idFormat) { - return port_set_format(node, direction, port_id, flags, param); - } - else - return -ENOENT; -} - -static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id, - struct spa_buffer **buffers, uint32_t n_buffers) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - uint32_t i; - for (i = 0; i < n_buffers; i++) { - struct buffer *b = &d->buffers[i]; - struct spa_data *datas = buffers[i]->datas; - - if (datas[0].data != NULL) { - b->ptr = datas[0].data; - b->mapped = false; - } - else if (datas[0].type == d->t->data.MemFd || - datas[0].type == d->t->data.DmaBuf) { - b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE, - MAP_SHARED, datas[0].fd, 0); - if (b->ptr == MAP_FAILED) { - pw_log_error("failed to buffer mem"); - b->ptr = NULL; - return -errno; - - } - b->ptr = SPA_MEMBER(b->ptr, datas[0].mapoffset, void); - b->mapped = true; - } - else { - pw_log_error("invalid buffer mem"); - return -EINVAL; - } - b->buffer = buffers[i]; - b->h = spa_buffer_find_meta(b->buffer, d->t->meta.Header); - - pw_log_info("got buffer %d size %d", i, datas[0].maxsize); - spa_list_append(&d->empty, &b->link); - b->used = false; - } - d->n_buffers = n_buffers; - return 0; -} - -static inline void reuse_buffer(snd_pcm_pipewire_t *d, uint32_t id) -{ - struct buffer *b = &d->buffers[id]; - if (b->used) { - pw_log_trace("reuse buffer %d", id); - spa_list_append(&d->empty, &b->link); - b->used = false; - } -} - -static int impl_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint32_t buffer_id) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - reuse_buffer(d, buffer_id); - return 0; -} - -static int impl_node_process_input(struct spa_node *node) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct spa_io_buffers *io = d->port_io; - struct buffer *b; - - if (io->buffer_id >= d->n_buffers) { - io->status = -EINVAL; - return -EINVAL; - } - b = &d->buffers[io->buffer_id]; - - snd_pcm_pipewire_process_record(d, b); - - return io->status = SPA_STATUS_NEED_BUFFER; -} - -static int impl_node_process_output(struct spa_node *node) -{ - snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); - struct buffer *b; - struct spa_io_buffers *io = d->port_io; - - if (io->buffer_id < d->n_buffers) { - reuse_buffer(d, io->buffer_id); - io->buffer_id = SPA_ID_INVALID; - } - if (spa_list_is_empty(&d->empty)) { - pw_log_error("alsa-pipewire %p: out of buffers", d); - return -EPIPE; - } - b = spa_list_first(&d->empty, struct buffer, link); - spa_list_remove(&b->link); - - b->used = true; - io->buffer_id = b->buffer->id; - - snd_pcm_pipewire_process_playback(d, b); - - return io->status = SPA_STATUS_HAVE_BUFFER; -} - -static const struct spa_node impl_node = { - SPA_VERSION_NODE, - .send_command = impl_send_command, - .set_callbacks = impl_set_callbacks, - .get_n_ports = impl_get_n_ports, - .get_port_ids = impl_get_port_ids, - .port_set_io = impl_port_set_io, - .port_get_info = impl_port_get_info, - .port_enum_params = impl_port_enum_params, - .port_set_param = impl_port_set_param, - .port_use_buffers = impl_port_use_buffers, - .port_reuse_buffer = impl_port_reuse_buffer, - .process_output = impl_node_process_output, - .process_input = impl_node_process_input, -}; - - -static void on_state_changed(void *data, enum pw_remote_state old, - enum pw_remote_state state, const char *error) +static void on_remote_state_changed(void *data, enum pw_remote_state old, + enum pw_remote_state state, const char *error) { snd_pcm_pipewire_t *pw = data; @@ -792,22 +624,20 @@ static void on_state_changed(void *data, enum pw_remote_state old, } static const struct pw_remote_events remote_events = { - PW_VERSION_REMOTE_EVENTS, - .state_changed = on_state_changed, + PW_VERSION_REMOTE_EVENTS, + .state_changed = on_remote_state_changed, }; -static int pipewire_node_create(snd_pcm_pipewire_t *pw, - const char *node_name, - const char *target, - bool can_fallback) +static int remote_connect_sync(snd_pcm_pipewire_t *pw) { const char *error = NULL; enum pw_remote_state state; + int res; pw_thread_loop_lock(pw->main_loop); - if (pw_remote_connect(pw->remote) < 0) { - error = "connect failed"; + if ((res = pw_remote_connect(pw->remote)) < 0) { + error = spa_strerror(res); goto error; } @@ -821,30 +651,14 @@ static int pipewire_node_create(snd_pcm_pipewire_t *pw, pw_thread_loop_wait(pw->main_loop); } - pw_log_debug("node %s", target); - pw->node = pw_node_new(pw->core, - node_name, - pw_properties_new(PW_NODE_PROP_AUTOCONNECT, "1", - PW_NODE_PROP_TARGET_NODE, target, - NULL), - 0); - pw->impl_node = impl_node; - pw_node_set_implementation(pw->node, &pw->impl_node); - pw_node_register(pw->node, NULL, NULL, NULL); - - pw_remote_export(pw->remote, pw->node); + exit: pw_thread_loop_unlock(pw->main_loop); - return 0; - - error: - if (!can_fallback) - SNDERR("PipeWire: Unable to connect: %s\n", error); - - pw_thread_loop_unlock(pw->main_loop); - - return -ECONNREFUSED; + return res; + error: + SNDERR("PipeWire: Unable to connect: %s\n", error); + goto exit; } static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, @@ -856,8 +670,6 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, snd_pcm_pipewire_t *pw; int err; static unsigned int num = 0; - char pipewire_node_name[32]; - const char *target; assert(pcmp); pw = calloc(1, sizeof(*pw)); @@ -868,21 +680,19 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->fd = -1; pw->io.poll_fd = -1; - spa_list_init(&pw->empty); if (node_name == NULL) - err = snprintf(pipewire_node_name, sizeof(pipewire_node_name), + err = asprintf(&pw->node_name, "alsa-pipewire.%s%s.%d.%d", name, stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", getpid(), num++); else - err = snprintf(pipewire_node_name, sizeof(pipewire_node_name), - "%s", node_name); + pw->node_name = strdup(node_name); if (stream == SND_PCM_STREAM_PLAYBACK) - target = playback_node; + pw->target = playback_node ? strdup(playback_node) : NULL; else - target = capture_node; + pw->target = capture_node ? strdup(capture_node) : NULL; pw->loop = pw_loop_new(NULL); pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); @@ -891,14 +701,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, init_type(&pw->type, pw->t->map); spa_debug_set_type_map(pw->t->map); - pw->remote = pw_remote_new(pw->core, NULL, 0); - pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); + pw->remote = pw_remote_new(pw->core, NULL, 0); + pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); - err = pw_thread_loop_start(pw->main_loop); - if (err < 0) { - snd_pcm_pipewire_free(pw); - return err; - } + if ((err = pw_thread_loop_start(pw->main_loop)) < 0) + goto error; + + if ((err = remote_connect_sync(pw)) < 0) + goto error; pw->fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); @@ -910,28 +720,21 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->io.poll_events = POLLIN; pw->io.mmap_rw = 1; - err = snd_pcm_ioplug_create(&pw->io, name, stream, mode); - if (err < 0) { - snd_pcm_pipewire_free(pw); - return err; - } + if ((err = snd_pcm_ioplug_create(&pw->io, name, stream, mode)) < 0) + goto error; + pw_log_debug("open %s %d %d", name, pw->io.stream, mode); - err = pipewire_set_hw_constraint(pw); - if (err < 0) { - snd_pcm_ioplug_delete(&pw->io); - return err; - } - - err = pipewire_node_create(pw, pipewire_node_name, target, false); - if (err < 0) { - snd_pcm_pipewire_free(pw); - return err; - } + if ((err = pipewire_set_hw_constraint(pw)) < 0) + goto error; *pcmp = pw->io.pcm; return 0; + + error: + snd_pcm_pipewire_free(pw); + return err; } From a79bd2cf1ad6bdfa2fa0735335697aefff7f7a47 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 10 Apr 2018 15:57:07 +0200 Subject: [PATCH 13/38] alsa: support formats of pw_stream --- alsa-plugins/pcm_pipewire.c | 70 ++++++++----------------------------- 1 file changed, 14 insertions(+), 56 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index a6b773c53..604fbf147 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -117,19 +117,12 @@ static int pcm_poll_block_check(snd_pcm_ioplug_t *io) return 0; } -static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) +static inline int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) { uint64_t val = 1; - snd_pcm_sframes_t avail; snd_pcm_pipewire_t *pw = io->private_data; - - avail = snd_pcm_avail_update(io->pcm); - if (avail < 0 || avail >= (snd_pcm_sframes_t)pw->min_avail || pw->error) { - write(pw->fd, &val, sizeof(val)); - return 1; - } - - return 0; + write(pw->fd, &val, sizeof(val)); + return 1; } static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw) @@ -327,14 +320,9 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) if (cont < frames) frames = cont; - if (io->stream == SND_PCM_STREAM_PLAYBACK) - snd_pcm_areas_copy(pwareas, xfer, - areas, offset, - io->channels, frames, io->format); - else - snd_pcm_areas_copy(areas, offset, - pwareas, xfer, - io->channels, frames, io->format); + snd_pcm_areas_copy(areas, offset, + pwareas, xfer, + io->channels, frames, io->format); pw->hw_ptr += frames; pw->hw_ptr %= io->buffer_size; @@ -472,9 +460,6 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, snd_pcm_pipewire_t *pw = io->private_data; switch (io->format) { - case SND_PCM_FORMAT_S8: - pw->format.format = pw->type.audio_format.S8; - break; case SND_PCM_FORMAT_U8: pw->format.format = pw->type.audio_format.U8; break; @@ -484,35 +469,23 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, case SND_PCM_FORMAT_S16_BE: pw->format.format = _FORMAT_BE(pw->type.audio_format, S16); break; - case SND_PCM_FORMAT_U16_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, U16); - break; - case SND_PCM_FORMAT_U16_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, U16); - break; case SND_PCM_FORMAT_S24_LE: pw->format.format = _FORMAT_LE(pw->type.audio_format, S24_32); break; case SND_PCM_FORMAT_S24_BE: pw->format.format = _FORMAT_BE(pw->type.audio_format, S24_32); break; - case SND_PCM_FORMAT_U24_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, U24_32); - break; - case SND_PCM_FORMAT_U24_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, U24_32); - break; case SND_PCM_FORMAT_S32_LE: pw->format.format = _FORMAT_LE(pw->type.audio_format, S32); break; case SND_PCM_FORMAT_S32_BE: pw->format.format = _FORMAT_BE(pw->type.audio_format, S32); break; - case SND_PCM_FORMAT_U32_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, U32); + case SND_PCM_FORMAT_S24_3LE: + pw->format.format = _FORMAT_LE(pw->type.audio_format, S24); break; - case SND_PCM_FORMAT_U32_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, U32); + case SND_PCM_FORMAT_S24_3BE: + pw->format.format = _FORMAT_BE(pw->type.audio_format, S24); break; case SND_PCM_FORMAT_FLOAT_LE: pw->format.format = _FORMAT_LE(pw->type.audio_format, F32); @@ -520,13 +493,8 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, case SND_PCM_FORMAT_FLOAT_BE: pw->format.format = _FORMAT_BE(pw->type.audio_format, F32); break; - case SND_PCM_FORMAT_FLOAT64_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, F64); - break; - case SND_PCM_FORMAT_FLOAT64_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, F64); - break; default: + SNDERR("PipeWire: invalid format: %d\n", io->format); return -EINVAL; } pw->format.channels = io->channels; @@ -562,26 +530,16 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) }; unsigned int format_list[] = { SND_PCM_FORMAT_S16_LE, -#if 0 - SND_PCM_FORMAT_S8, - SND_PCM_FORMAT_U8, - SND_PCM_FORMAT_S16_LE, SND_PCM_FORMAT_S16_BE, - SND_PCM_FORMAT_U16_LE, - SND_PCM_FORMAT_U16_BE, SND_PCM_FORMAT_S24_LE, SND_PCM_FORMAT_S24_BE, - SND_PCM_FORMAT_U24_LE, - SND_PCM_FORMAT_U24_BE, SND_PCM_FORMAT_S32_LE, SND_PCM_FORMAT_S32_BE, - SND_PCM_FORMAT_U32_LE, - SND_PCM_FORMAT_U32_BE, + SND_PCM_FORMAT_S24_3LE, + SND_PCM_FORMAT_S24_3BE, SND_PCM_FORMAT_FLOAT_LE, SND_PCM_FORMAT_FLOAT_BE, - SND_PCM_FORMAT_FLOAT64_LE, - SND_PCM_FORMAT_FLOAT64_BE, -#endif + SND_PCM_FORMAT_U8, }; int err; From aeda863aed9d485e5dcfef8393f6af1e1c09059d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 11 May 2018 10:05:03 +0200 Subject: [PATCH 14/38] pcm: reuse stream Only make a new stream when we are in error. Set format layout. --- alsa-plugins/pcm_pipewire.c | 63 +++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 604fbf147..1f25270bc 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -60,10 +60,6 @@ static inline void init_type(struct type *type, struct spa_type_map *map) spa_type_audio_format_map(map, &type->audio_format); } -typedef enum _pipewire_format { - SND_PCM_PIPEWIRE_FORMAT_RAW -} snd_pcm_pipewire_format_t; - typedef struct { snd_pcm_ioplug_t io; @@ -302,7 +298,7 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) if (io->state != SND_PCM_STATE_RUNNING) { if (io->stream == SND_PCM_STREAM_PLAYBACK) { - pw_log_trace("slience %lu frames", nframes); + pw_log_trace("silence %lu frames", nframes); for (channel = 0; channel < io->channels; channel++) snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); goto done; @@ -370,16 +366,24 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) uint8_t buffer[1024]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct pw_type *t = pw->t; + struct pw_properties *props; int res; pw_thread_loop_lock(pw->main_loop); - if (pw->stream) { + pw_log_debug("prepare %d %p %lu", pw->error, pw->stream, io->period_size); + if (!pw->error && pw->stream != NULL) + goto done; + + if (pw->stream != NULL) { pw_stream_destroy(pw->stream); pw->stream = NULL; } - pw->stream = pw_stream_new(pw->remote, pw->node_name, NULL); + props = pw_properties_new(NULL, NULL); + pw_properties_setf(props, "node.latency", "%lu", io->period_size); + + pw->stream = pw_stream_new(pw->remote, pw->node_name, props); if (pw->stream == NULL) goto error; @@ -390,10 +394,11 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) "I", pw->type.media_type.audio, "I", pw->type.media_subtype.raw, ":", pw->type.format_audio.format, "I", pw->format.format, + ":", pw->type.format_audio.layout, "i", pw->format.layout, ":", pw->type.format_audio.channels, "i", pw->format.channels, ":", pw->type.format_audio.rate, "i", pw->format.rate); - spa_debug_pod(params[0], SPA_DEBUG_FLAG_FORMAT); + pw->error = false; pw_stream_connect(pw->stream, PW_DIRECTION_OUTPUT, @@ -403,6 +408,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) PW_STREAM_FLAG_RT_PROCESS, params, 1); +done: pw->hw_ptr = 0; snd_pcm_sw_params_alloca(&swparams); @@ -425,7 +431,7 @@ static int snd_pcm_pipewire_start(snd_pcm_ioplug_t *io) snd_pcm_pipewire_t *pw = io->private_data; pw_thread_loop_lock(pw->main_loop); - if (!pw->activated) { + if (!pw->activated && pw->stream != NULL) { pw_stream_set_active(pw->stream, true); pw->activated = true; } @@ -438,7 +444,7 @@ static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) snd_pcm_pipewire_t *pw = io->private_data; pw_thread_loop_lock(pw->main_loop); - if (pw->activated) { + if (pw->activated && pw->stream != NULL) { pw_stream_set_active(pw->stream, false); pw->activated = false; } @@ -459,7 +465,7 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, { snd_pcm_pipewire_t *pw = io->private_data; - switch (io->format) { + switch(io->format) { case SND_PCM_FORMAT_U8: pw->format.format = pw->type.audio_format.U8; break; @@ -500,6 +506,19 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, pw->format.channels = io->channels; pw->format.rate = io->rate; + switch(io->access) { + case SND_PCM_ACCESS_MMAP_INTERLEAVED: + case SND_PCM_ACCESS_RW_INTERLEAVED: + pw->format.layout = SPA_AUDIO_LAYOUT_INTERLEAVED; + break; + case SND_PCM_ACCESS_MMAP_NONINTERLEAVED: + case SND_PCM_ACCESS_RW_NONINTERLEAVED: + pw->format.layout = SPA_AUDIO_LAYOUT_NON_INTERLEAVED; + break; + default: + SNDERR("PipeWire: invalid access: %d\n", io->access); + return -EINVAL; + } pw->sample_bits = snd_pcm_format_physical_width(io->format); return 0; @@ -519,7 +538,8 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) { /* period and buffer bytes must be power of two */ static const unsigned int bytes_list[] = { - 1U<<5, 1U<<6, 1U<<7, 1U<<8, 1U<<9, 1U<<10, 1U<<11, 1U<<12, 1U<<13, + 1U<<5, 1U<<6, 1U<<7, 1U<<8, 1U<<9, 1U<<10, 1U<<11, 1U<<12, + 1U<<13, 1U<<14, 1U<<15, 1U<<16, 1U<<17,1U<<18, 1U<<19, 1U<<20 }; unsigned int access_list[] = { @@ -570,6 +590,8 @@ static void on_remote_state_changed(void *data, enum pw_remote_state old, switch (state) { case PW_REMOTE_STATE_ERROR: + pw_log_error("error %s", error); + case PW_REMOTE_STATE_UNCONNECTED: pw->error = true; pcm_poll_unblock_check(&pw->io); /* fallthrough */ @@ -628,13 +650,16 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, snd_pcm_pipewire_t *pw; int err; static unsigned int num = 0; + const char *str; assert(pcmp); pw = calloc(1, sizeof(*pw)); if (!pw) return -ENOMEM; - pw_log_debug("open %s %d %d", name, stream, mode); + str = getenv("PIPEWIRE_NODE"); + + pw_log_debug("open %s %d %d '%s'", name, stream, mode, str); pw->fd = -1; pw->io.poll_fd = -1; @@ -647,10 +672,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, else pw->node_name = strdup(node_name); - if (stream == SND_PCM_STREAM_PLAYBACK) - pw->target = playback_node ? strdup(playback_node) : NULL; - else - pw->target = capture_node ? strdup(capture_node) : NULL; + if (str != NULL) + pw->target = strdup(str); + else { + if (stream == SND_PCM_STREAM_PLAYBACK) + pw->target = playback_node ? strdup(playback_node) : NULL; + else + pw->target = capture_node ? strdup(capture_node) : NULL; + } pw->loop = pw_loop_new(NULL); pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); From e8b04225144d4aef2b8f7f4e44bbfba0dc8d4f38 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 24 May 2018 17:17:47 +0200 Subject: [PATCH 15/38] alsa: fix drain Keep sending samples when draining Prefer float and 32 bit formats --- alsa-plugins/pcm_pipewire.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 1f25270bc..fed3f3e07 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -206,7 +206,7 @@ snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct pw_buffer *b) nbytes = SPA_MIN(avail, maxsize - offset); ptr = SPA_MEMBER(d[0].data, offset, void); - pw_log_trace("%d %d %d %d %p", nbytes, avail, filled, offset, ptr); + pw_log_trace("%d %d %d %d %p %d", nbytes, avail, filled, offset, ptr, io->state); nframes = nbytes / bpf; @@ -216,8 +216,8 @@ snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct pw_buffer *b) pwareas[channel].step = bps; } - if (io->state != SND_PCM_STATE_RUNNING) { - pw_log_trace("silence %lu frames", nframes); + if (io->state != SND_PCM_STATE_RUNNING && io->state != SND_PCM_STATE_DRAINING) { + pw_log_trace("silence %lu frames %d", nframes, io->state); for (channel = 0; channel < io->channels; channel++) snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); goto done; @@ -296,15 +296,6 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) pwareas[channel].step = bps; } - if (io->state != SND_PCM_STATE_RUNNING) { - if (io->stream == SND_PCM_STREAM_PLAYBACK) { - pw_log_trace("silence %lu frames", nframes); - for (channel = 0; channel < io->channels; channel++) - snd_pcm_area_silence(&pwareas[channel], 0, nframes, io->format); - goto done; - } - } - areas = snd_pcm_ioplug_mmap_areas(io); xfer = 0; @@ -327,7 +318,6 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ - done: avail -= nbytes; index += nbytes; } while (avail > 0); @@ -549,16 +539,16 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) SND_PCM_ACCESS_RW_NONINTERLEAVED }; unsigned int format_list[] = { + SND_PCM_FORMAT_FLOAT_LE, + SND_PCM_FORMAT_FLOAT_BE, + SND_PCM_FORMAT_S32_LE, + SND_PCM_FORMAT_S32_BE, SND_PCM_FORMAT_S16_LE, SND_PCM_FORMAT_S16_BE, SND_PCM_FORMAT_S24_LE, SND_PCM_FORMAT_S24_BE, - SND_PCM_FORMAT_S32_LE, - SND_PCM_FORMAT_S32_BE, SND_PCM_FORMAT_S24_3LE, SND_PCM_FORMAT_S24_3BE, - SND_PCM_FORMAT_FLOAT_LE, - SND_PCM_FORMAT_FLOAT_BE, SND_PCM_FORMAT_U8, }; From 5d30ccfaff8bcff0e985c0b448cac6f57c5c7ca6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 7 Jun 2018 10:18:33 +0200 Subject: [PATCH 16/38] alsa: avoid crash when connection fails Set the client api in properties --- alsa-plugins/pcm_pipewire.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index fed3f3e07..3985aae51 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -370,7 +370,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw->stream = NULL; } - props = pw_properties_new(NULL, NULL); + props = pw_properties_new("client.api", "alsa", NULL); pw_properties_setf(props, "node.latency", "%lu", io->period_size); pw->stream = pw_stream_new(pw->remote, pw->node_name, props); @@ -583,7 +583,8 @@ static void on_remote_state_changed(void *data, enum pw_remote_state old, pw_log_error("error %s", error); case PW_REMOTE_STATE_UNCONNECTED: pw->error = true; - pcm_poll_unblock_check(&pw->io); + if (pw->fd != -1) + pcm_poll_unblock_check(&pw->io); /* fallthrough */ case PW_REMOTE_STATE_CONNECTED: pw_thread_loop_signal(pw->main_loop, false); From 1276a15143161a08e8096b7a4c307e9b7e43735a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 22 Jun 2018 17:39:15 +0200 Subject: [PATCH 17/38] alsa: Send buffer params to PipeWire when we know the format --- alsa-plugins/pcm_pipewire.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 3985aae51..d4c6b7684 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -22,6 +22,7 @@ #define __USE_GNU #define _GNU_SOURCE +#include #include #include #include @@ -325,6 +326,30 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) return 0; } +static void on_stream_format_changed(void *data, const struct spa_pod *format) +{ + snd_pcm_pipewire_t *pw = data; + struct pw_type *t = pw->t; + snd_pcm_ioplug_t *io = &pw->io; + const struct spa_pod *params[4]; + uint32_t n_params = 0; + uint8_t buffer[4096]; + struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); + uint32_t stride = (io->channels * pw->sample_bits) / 8; + + params[n_params++] = spa_pod_builder_object(&b, + t->param.idBuffers, t->param_buffers.Buffers, + ":", t->param_buffers.buffers, "iru", io->buffer_size / io->period_size, + SPA_POD_PROP_MIN_MAX(3, 64), + ":", t->param_buffers.blocks, "i", 1, + ":", t->param_buffers.size, "ir", io->period_size * stride, + SPA_POD_PROP_MIN_MAX(io->period_size * stride, INT_MAX), + ":", t->param_buffers.stride, "i", stride, + ":", t->param_buffers.align, "i", 16); + + pw_stream_finish_format(pw->stream, 0, params, n_params); +} + static void on_stream_process(void *data) { snd_pcm_pipewire_t *pw = data; @@ -345,6 +370,7 @@ static void on_stream_process(void *data) static const struct pw_stream_events stream_events = { PW_VERSION_STREAM_EVENTS, + .format_changed = on_stream_format_changed, .process = on_stream_process, }; @@ -371,7 +397,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) } props = pw_properties_new("client.api", "alsa", NULL); - pw_properties_setf(props, "node.latency", "%lu", io->period_size); + pw_properties_setf(props, "node.latency", "%lu/%u", io->period_size, io->rate); pw->stream = pw_stream_new(pw->remote, pw->node_name, props); if (pw->stream == NULL) From 0f37d84c39be31a8b3b92b525654c190da68e787 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 3 Jul 2018 22:05:38 +0200 Subject: [PATCH 18/38] pcm: improve buffer size --- alsa-plugins/pcm_pipewire.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index d4c6b7684..2e7a51555 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -42,7 +42,9 @@ #include -#define MAX_BUFFERS 8 +#define MIN_BUFFERS 3 +#define MAX_BUFFERS 64 + #define MAX_CHANNELS 32 #define MAX_RATE (48000*8) @@ -336,14 +338,18 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) uint8_t buffer[4096]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); uint32_t stride = (io->channels * pw->sample_bits) / 8; + uint32_t buffers = SPA_CLAMP(io->buffer_size / io->period_size, MIN_BUFFERS, MAX_BUFFERS); + uint32_t size = io->period_size * stride; + + pw_log_info("buffers %lu %lu %u %u %u", io->buffer_size, io->period_size, buffers, stride, size); params[n_params++] = spa_pod_builder_object(&b, t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.buffers, "iru", io->buffer_size / io->period_size, - SPA_POD_PROP_MIN_MAX(3, 64), + ":", t->param_buffers.buffers, "iru", buffers, + SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), ":", t->param_buffers.blocks, "i", 1, - ":", t->param_buffers.size, "ir", io->period_size * stride, - SPA_POD_PROP_MIN_MAX(io->period_size * stride, INT_MAX), + ":", t->param_buffers.size, "ir", size, + SPA_POD_PROP_MIN_MAX(size, INT_MAX), ":", t->param_buffers.stride, "i", stride, ":", t->param_buffers.align, "i", 16); @@ -417,7 +423,9 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw->error = false; pw_stream_connect(pw->stream, - PW_DIRECTION_OUTPUT, + io->stream == SND_PCM_STREAM_PLAYBACK ? + PW_DIRECTION_OUTPUT : + PW_DIRECTION_INPUT, pw->target, PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS | From fcab6dae9ab5550f1563e7fe2d645696f528f865 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 4 Jul 2018 18:55:54 +0200 Subject: [PATCH 19/38] pcm: update properties --- alsa-plugins/pcm_pipewire.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 2e7a51555..0fb4c5ab1 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -404,6 +404,11 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) props = pw_properties_new("client.api", "alsa", NULL); pw_properties_setf(props, "node.latency", "%lu/%u", io->period_size, io->rate); + pw_properties_set(props, PW_NODE_PROP_MEDIA, "Audio"); + pw_properties_set(props, PW_NODE_PROP_CATEGORY, + io->stream == SND_PCM_STREAM_PLAYBACK ? + "Playback" : "Capture"); + pw_properties_set(props, PW_NODE_PROP_ROLE, "Music"); pw->stream = pw_stream_new(pw->remote, pw->node_name, props); if (pw->stream == NULL) From ae97f98561b85e526f708733a1ee8df9baa38a6c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 15 Aug 2018 21:45:14 +0200 Subject: [PATCH 20/38] alsa: remove debug --- alsa-plugins/pcm_pipewire.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 0fb4c5ab1..1683a1cd7 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -38,7 +38,6 @@ #include #include #include -#include #include @@ -716,7 +715,6 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->core = pw_core_new(pw->loop, NULL); pw->t = pw_core_get_type(pw->core); init_type(&pw->type, pw->t->map); - spa_debug_set_type_map(pw->t->map); pw->remote = pw_remote_new(pw->core, NULL, 0); pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); From 25cff88c33e15b7057f05d4bf963c5b1f0b0e01d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 15 Aug 2018 21:45:29 +0200 Subject: [PATCH 21/38] pcm: no need for any buffer or period restrictions --- alsa-plugins/pcm_pipewire.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 1683a1cd7..22ea5b648 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -564,12 +564,6 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) { - /* period and buffer bytes must be power of two */ - static const unsigned int bytes_list[] = { - 1U<<5, 1U<<6, 1U<<7, 1U<<8, 1U<<9, 1U<<10, 1U<<11, 1U<<12, - 1U<<13, - 1U<<14, 1U<<15, 1U<<16, 1U<<17,1U<<18, 1U<<19, 1U<<20 - }; unsigned int access_list[] = { SND_PCM_ACCESS_MMAP_INTERLEAVED, SND_PCM_ACCESS_MMAP_NONINTERLEAVED, @@ -600,10 +594,6 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) 1, MAX_CHANNELS)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, 1, MAX_RATE)) < 0 || - (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, - SPA_N_ELEMENTS(bytes_list), bytes_list)) < 0 || - (err = snd_pcm_ioplug_set_param_list(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, - SPA_N_ELEMENTS(bytes_list), bytes_list)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIODS, 2, 64)) < 0) return err; From b4570a42bfebf52a6d2301e704cd833fe38a32d6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 24 Aug 2018 11:01:32 +0200 Subject: [PATCH 22/38] alsa: update for types --- alsa-plugins/pcm_pipewire.c | 81 +++++++++++++------------------------ 1 file changed, 29 insertions(+), 52 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 22ea5b648..0d9cf0510 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -33,8 +33,6 @@ #include #include -#include -#include #include #include #include @@ -47,21 +45,6 @@ #define MAX_CHANNELS 32 #define MAX_RATE (48000*8) -struct type { - struct spa_type_media_type media_type; - struct spa_type_media_subtype media_subtype; - struct spa_type_format_audio format_audio; - struct spa_type_audio_format audio_format; -}; - -static inline void init_type(struct type *type, struct spa_type_map *map) -{ - spa_type_media_type_map(map, &type->media_type); - spa_type_media_subtype_map(map, &type->media_subtype); - spa_type_format_audio_map(map, &type->format_audio); - spa_type_audio_format_map(map, &type->audio_format); -} - typedef struct { snd_pcm_ioplug_t io; @@ -77,13 +60,10 @@ typedef struct { unsigned int sample_bits; snd_pcm_uframes_t min_avail; - struct type type; - struct pw_loop *loop; struct pw_thread_loop *main_loop; struct pw_core *core; - struct pw_type *t; struct pw_remote *remote; struct spa_hook remote_listener; @@ -330,7 +310,6 @@ snd_pcm_pipewire_process_record(snd_pcm_pipewire_t *pw, struct pw_buffer *b) static void on_stream_format_changed(void *data, const struct spa_pod *format) { snd_pcm_pipewire_t *pw = data; - struct pw_type *t = pw->t; snd_pcm_ioplug_t *io = &pw->io; const struct spa_pod *params[4]; uint32_t n_params = 0; @@ -343,14 +322,14 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) pw_log_info("buffers %lu %lu %u %u %u", io->buffer_size, io->period_size, buffers, stride, size); params[n_params++] = spa_pod_builder_object(&b, - t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.buffers, "iru", buffers, + SPA_ID_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers, + ":", SPA_PARAM_BUFFERS_buffers, "iru", buffers, SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), - ":", t->param_buffers.blocks, "i", 1, - ":", t->param_buffers.size, "ir", size, + ":", SPA_PARAM_BUFFERS_blocks, "i", 1, + ":", SPA_PARAM_BUFFERS_size, "ir", size, SPA_POD_PROP_MIN_MAX(size, INT_MAX), - ":", t->param_buffers.stride, "i", stride, - ":", t->param_buffers.align, "i", 16); + ":", SPA_PARAM_BUFFERS_stride, "i", stride, + ":", SPA_PARAM_BUFFERS_align, "i", 16); pw_stream_finish_format(pw->stream, 0, params, n_params); } @@ -386,7 +365,6 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) const struct spa_pod *params[1]; uint8_t buffer[1024]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - struct pw_type *t = pw->t; struct pw_properties *props; int res; @@ -416,13 +394,13 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); params[0] = spa_pod_builder_object(&b, - t->param.idEnumFormat, t->spa_format, - "I", pw->type.media_type.audio, - "I", pw->type.media_subtype.raw, - ":", pw->type.format_audio.format, "I", pw->format.format, - ":", pw->type.format_audio.layout, "i", pw->format.layout, - ":", pw->type.format_audio.channels, "i", pw->format.channels, - ":", pw->type.format_audio.rate, "i", pw->format.rate); + SPA_ID_PARAM_EnumFormat, SPA_ID_OBJECT_Format, + "I", SPA_MEDIA_TYPE_audio, + "I", SPA_MEDIA_SUBTYPE_raw, + ":", SPA_FORMAT_AUDIO_format, "I", pw->format.format, + ":", SPA_FORMAT_AUDIO_layout, "i", pw->format.layout, + ":", SPA_FORMAT_AUDIO_channels, "i", pw->format.channels, + ":", SPA_FORMAT_AUDIO_rate, "i", pw->format.rate); pw->error = false; @@ -433,6 +411,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw->target, PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS | +// PW_STREAM_FLAG_EXCLUSIVE | PW_STREAM_FLAG_RT_PROCESS, params, 1); @@ -481,11 +460,11 @@ static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) } #if __BYTE_ORDER == __BIG_ENDIAN -#define _FORMAT_LE(s, fmt) s . fmt ## _OE -#define _FORMAT_BE(s, fmt) s . fmt +#define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE +#define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt #elif __BYTE_ORDER == __LITTLE_ENDIAN -#define _FORMAT_LE(s, fmt) s . fmt -#define _FORMAT_BE(s, fmt) s . fmt ## _OE +#define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt +#define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE #endif static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, @@ -495,37 +474,37 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, switch(io->format) { case SND_PCM_FORMAT_U8: - pw->format.format = pw->type.audio_format.U8; + pw->format.format = SPA_AUDIO_FORMAT_U8; break; case SND_PCM_FORMAT_S16_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, S16); + pw->format.format = _FORMAT_LE(S16); break; case SND_PCM_FORMAT_S16_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, S16); + pw->format.format = _FORMAT_BE(S16); break; case SND_PCM_FORMAT_S24_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, S24_32); + pw->format.format = _FORMAT_LE(S24_32); break; case SND_PCM_FORMAT_S24_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, S24_32); + pw->format.format = _FORMAT_BE(S24_32); break; case SND_PCM_FORMAT_S32_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, S32); + pw->format.format = _FORMAT_LE(S32); break; case SND_PCM_FORMAT_S32_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, S32); + pw->format.format = _FORMAT_BE(S32); break; case SND_PCM_FORMAT_S24_3LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, S24); + pw->format.format = _FORMAT_LE(S24); break; case SND_PCM_FORMAT_S24_3BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, S24); + pw->format.format = _FORMAT_BE(S24); break; case SND_PCM_FORMAT_FLOAT_LE: - pw->format.format = _FORMAT_LE(pw->type.audio_format, F32); + pw->format.format = _FORMAT_LE(F32); break; case SND_PCM_FORMAT_FLOAT_BE: - pw->format.format = _FORMAT_BE(pw->type.audio_format, F32); + pw->format.format = _FORMAT_BE(F32); break; default: SNDERR("PipeWire: invalid format: %d\n", io->format); @@ -703,8 +682,6 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->loop = pw_loop_new(NULL); pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); pw->core = pw_core_new(pw->loop, NULL); - pw->t = pw_core_get_type(pw->core); - init_type(&pw->type, pw->t->map); pw->remote = pw_remote_new(pw->core, NULL, 0); pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); From 47e2e1223a8b44fe256ba7a010656c8a585dbe12 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 27 Aug 2018 09:07:42 +0200 Subject: [PATCH 23/38] alsa: update for api changes --- alsa-plugins/pcm_pipewire.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 0d9cf0510..0dfc2f050 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -322,7 +322,7 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) pw_log_info("buffers %lu %lu %u %u %u", io->buffer_size, io->period_size, buffers, stride, size); params[n_params++] = spa_pod_builder_object(&b, - SPA_ID_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers, + SPA_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers, ":", SPA_PARAM_BUFFERS_buffers, "iru", buffers, SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), ":", SPA_PARAM_BUFFERS_blocks, "i", 1, @@ -394,11 +394,11 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); params[0] = spa_pod_builder_object(&b, - SPA_ID_PARAM_EnumFormat, SPA_ID_OBJECT_Format, + SPA_PARAM_EnumFormat, SPA_ID_OBJECT_Format, "I", SPA_MEDIA_TYPE_audio, "I", SPA_MEDIA_SUBTYPE_raw, ":", SPA_FORMAT_AUDIO_format, "I", pw->format.format, - ":", SPA_FORMAT_AUDIO_layout, "i", pw->format.layout, + ":", SPA_FORMAT_AUDIO_layout, "I", pw->format.layout, ":", SPA_FORMAT_AUDIO_channels, "i", pw->format.channels, ":", SPA_FORMAT_AUDIO_rate, "i", pw->format.rate); From 3f73c9355ce41a22f32783425cb82b4908f7d459 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 29 Aug 2018 09:55:20 +0200 Subject: [PATCH 24/38] alsa: update for type changes --- alsa-plugins/pcm_pipewire.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 0dfc2f050..d6195b09f 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -322,7 +322,7 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) pw_log_info("buffers %lu %lu %u %u %u", io->buffer_size, io->period_size, buffers, stride, size); params[n_params++] = spa_pod_builder_object(&b, - SPA_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers, + SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, ":", SPA_PARAM_BUFFERS_buffers, "iru", buffers, SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), ":", SPA_PARAM_BUFFERS_blocks, "i", 1, @@ -394,7 +394,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); params[0] = spa_pod_builder_object(&b, - SPA_PARAM_EnumFormat, SPA_ID_OBJECT_Format, + SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, "I", SPA_MEDIA_TYPE_audio, "I", SPA_MEDIA_SUBTYPE_raw, ":", SPA_FORMAT_AUDIO_format, "I", pw->format.format, From 4acfb88cb723a23c67f7cfedcdfd7f1275c78618 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 5 Sep 2018 16:48:43 +0200 Subject: [PATCH 25/38] alsa: update for api changes --- alsa-plugins/pcm_pipewire.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index d6195b09f..2e81fbbd9 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -323,13 +323,12 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) params[n_params++] = spa_pod_builder_object(&b, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, - ":", SPA_PARAM_BUFFERS_buffers, "iru", buffers, - SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), - ":", SPA_PARAM_BUFFERS_blocks, "i", 1, - ":", SPA_PARAM_BUFFERS_size, "ir", size, - SPA_POD_PROP_MIN_MAX(size, INT_MAX), - ":", SPA_PARAM_BUFFERS_stride, "i", stride, - ":", SPA_PARAM_BUFFERS_align, "i", 16); + SPA_PARAM_BUFFERS_buffers, &SPA_POD_CHOICE_RANGE_Int(buffers, MIN_BUFFERS, MAX_BUFFERS), + SPA_PARAM_BUFFERS_blocks, &SPA_POD_Int(1), + SPA_PARAM_BUFFERS_size, &SPA_POD_CHOICE_RANGE_Int(size, size, INT_MAX), + SPA_PARAM_BUFFERS_stride, &SPA_POD_Int(stride), + SPA_PARAM_BUFFERS_align, &SPA_POD_Int(16), + 0); pw_stream_finish_format(pw->stream, 0, params, n_params); } @@ -393,15 +392,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); - params[0] = spa_pod_builder_object(&b, - SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, - "I", SPA_MEDIA_TYPE_audio, - "I", SPA_MEDIA_SUBTYPE_raw, - ":", SPA_FORMAT_AUDIO_format, "I", pw->format.format, - ":", SPA_FORMAT_AUDIO_layout, "I", pw->format.layout, - ":", SPA_FORMAT_AUDIO_channels, "i", pw->format.channels, - ":", SPA_FORMAT_AUDIO_rate, "i", pw->format.rate); - + params[0] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &pw->format); pw->error = false; pw_stream_connect(pw->stream, From 9955e3203025cfe2cd7913d7851e3adb33863259 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 17 Sep 2018 09:48:32 +0200 Subject: [PATCH 26/38] alsa: fix for format changes Add exclusive option Add channel mapping --- alsa-plugins/pcm_pipewire.c | 188 ++++++++++++++++++++++++++++++------ 1 file changed, 156 insertions(+), 32 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 2e81fbbd9..41250f3d8 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -68,6 +68,7 @@ typedef struct { struct pw_remote *remote; struct spa_hook remote_listener; + uint32_t flags; struct pw_stream *stream; struct spa_hook stream_listener; @@ -400,9 +401,9 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) PW_DIRECTION_OUTPUT : PW_DIRECTION_INPUT, pw->target, + pw->flags | PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS | -// PW_STREAM_FLAG_EXCLUSIVE | PW_STREAM_FLAG_RT_PROCESS, params, 1); @@ -451,51 +452,97 @@ static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) } #if __BYTE_ORDER == __BIG_ENDIAN -#define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE -#define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt +#define _FORMAT_LE(p, fmt) p ? SPA_AUDIO_FORMAT_UNKNOWN : SPA_AUDIO_FORMAT_ ## fmt ## _OE +#define _FORMAT_BE(p, fmt) p ? SPA_AUDIO_FORMAT_ ## fmt ## P : SPA_AUDIO_FORMAT_ ## fmt #elif __BYTE_ORDER == __LITTLE_ENDIAN -#define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt -#define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE +#define _FORMAT_LE(p, fmt) p ? SPA_AUDIO_FORMAT_ ## fmt ## P : SPA_AUDIO_FORMAT_ ## fmt +#define _FORMAT_BE(p, fmt) p ? SPA_AUDIO_FORMAT_UNKNOWN : SPA_AUDIO_FORMAT_ ## fmt ## _OE #endif +static int set_default_channels(struct spa_audio_info_raw *info) +{ + switch (info->channels) { + case 1: + info->position[0] = SPA_AUDIO_CHANNEL_MONO; + return 1; + case 8: + info->position[6] = SPA_AUDIO_CHANNEL_SL; + info->position[7] = SPA_AUDIO_CHANNEL_SR; + /* Fall through */ + case 6: + info->position[4] = SPA_AUDIO_CHANNEL_RL; + info->position[5] = SPA_AUDIO_CHANNEL_RR; + /* Fall through */ + case 4: + info->position[3] = SPA_AUDIO_CHANNEL_LFE; + /* Fall through */ + case 3: + /* Fall through */ + info->position[2] = SPA_AUDIO_CHANNEL_FC; + case 2: + info->position[0] = SPA_AUDIO_CHANNEL_FL; + info->position[1] = SPA_AUDIO_CHANNEL_FR; + return 1; + default: + return 0; + } +} + static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, snd_pcm_hw_params_t * params) { snd_pcm_pipewire_t *pw = io->private_data; + bool planar; + + pw_log_debug("hw_params"); + + switch(io->access) { + case SND_PCM_ACCESS_MMAP_INTERLEAVED: + case SND_PCM_ACCESS_RW_INTERLEAVED: + planar = false; + break; + case SND_PCM_ACCESS_MMAP_NONINTERLEAVED: + case SND_PCM_ACCESS_RW_NONINTERLEAVED: + planar = true; + break; + default: + SNDERR("PipeWire: invalid access: %d\n", io->access); + return -EINVAL; + } switch(io->format) { case SND_PCM_FORMAT_U8: - pw->format.format = SPA_AUDIO_FORMAT_U8; + pw->format.format = planar ? SPA_AUDIO_FORMAT_U8P : SPA_AUDIO_FORMAT_U8; break; case SND_PCM_FORMAT_S16_LE: - pw->format.format = _FORMAT_LE(S16); + pw->format.format = _FORMAT_LE(planar, S16); break; case SND_PCM_FORMAT_S16_BE: - pw->format.format = _FORMAT_BE(S16); + pw->format.format = _FORMAT_BE(planar, S16); break; case SND_PCM_FORMAT_S24_LE: - pw->format.format = _FORMAT_LE(S24_32); + pw->format.format = _FORMAT_LE(planar, S24_32); break; case SND_PCM_FORMAT_S24_BE: - pw->format.format = _FORMAT_BE(S24_32); + pw->format.format = _FORMAT_BE(planar, S24_32); break; case SND_PCM_FORMAT_S32_LE: - pw->format.format = _FORMAT_LE(S32); + pw->format.format = _FORMAT_LE(planar, S32); break; case SND_PCM_FORMAT_S32_BE: - pw->format.format = _FORMAT_BE(S32); + pw->format.format = _FORMAT_BE(planar, S32); break; case SND_PCM_FORMAT_S24_3LE: - pw->format.format = _FORMAT_LE(S24); + pw->format.format = _FORMAT_LE(planar, S24); break; case SND_PCM_FORMAT_S24_3BE: - pw->format.format = _FORMAT_BE(S24); + pw->format.format = _FORMAT_BE(planar, S24); break; case SND_PCM_FORMAT_FLOAT_LE: - pw->format.format = _FORMAT_LE(F32); + pw->format.format = _FORMAT_LE(planar, F32); break; case SND_PCM_FORMAT_FLOAT_BE: - pw->format.format = _FORMAT_BE(F32); + pw->format.format = _FORMAT_BE(planar, F32); break; default: SNDERR("PipeWire: invalid format: %d\n", io->format); @@ -504,24 +551,88 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, pw->format.channels = io->channels; pw->format.rate = io->rate; - switch(io->access) { - case SND_PCM_ACCESS_MMAP_INTERLEAVED: - case SND_PCM_ACCESS_RW_INTERLEAVED: - pw->format.layout = SPA_AUDIO_LAYOUT_INTERLEAVED; - break; - case SND_PCM_ACCESS_MMAP_NONINTERLEAVED: - case SND_PCM_ACCESS_RW_NONINTERLEAVED: - pw->format.layout = SPA_AUDIO_LAYOUT_NON_INTERLEAVED; - break; - default: - SNDERR("PipeWire: invalid access: %d\n", io->access); - return -EINVAL; - } + set_default_channels(&pw->format); + pw->sample_bits = snd_pcm_format_physical_width(io->format); return 0; } +struct chmap_info { + enum snd_pcm_chmap_position pos; + enum spa_audio_channel channel; +}; + +static const struct chmap_info chmap_info[] = { + [SND_CHMAP_UNKNOWN] = { SND_CHMAP_UNKNOWN, SPA_AUDIO_CHANNEL_UNKNOWN }, + [SND_CHMAP_NA] = { SND_CHMAP_NA, SPA_AUDIO_CHANNEL_NA }, + [SND_CHMAP_MONO] = { SND_CHMAP_MONO, SPA_AUDIO_CHANNEL_MONO }, + [SND_CHMAP_FL] = { SND_CHMAP_FL, SPA_AUDIO_CHANNEL_FL }, + [SND_CHMAP_FR] = { SND_CHMAP_FR, SPA_AUDIO_CHANNEL_FR }, + [SND_CHMAP_RL] = { SND_CHMAP_RL, SPA_AUDIO_CHANNEL_RL }, + [SND_CHMAP_RR] = { SND_CHMAP_RR, SPA_AUDIO_CHANNEL_RR }, + [SND_CHMAP_FC] = { SND_CHMAP_FC, SPA_AUDIO_CHANNEL_FC }, + [SND_CHMAP_LFE] = { SND_CHMAP_LFE, SPA_AUDIO_CHANNEL_LFE }, + [SND_CHMAP_SL] = { SND_CHMAP_SL, SPA_AUDIO_CHANNEL_SL }, + [SND_CHMAP_SR] = { SND_CHMAP_SR, SPA_AUDIO_CHANNEL_SR }, + [SND_CHMAP_RC] = { SND_CHMAP_RC, SPA_AUDIO_CHANNEL_RC }, + [SND_CHMAP_FLC] = { SND_CHMAP_FLC, SPA_AUDIO_CHANNEL_FLC }, + [SND_CHMAP_FRC] = { SND_CHMAP_FRC, SPA_AUDIO_CHANNEL_FRC }, + [SND_CHMAP_RLC] = { SND_CHMAP_RLC, SPA_AUDIO_CHANNEL_RLC }, + [SND_CHMAP_RRC] = { SND_CHMAP_RRC, SPA_AUDIO_CHANNEL_RRC }, + [SND_CHMAP_FLW] = { SND_CHMAP_FLW, SPA_AUDIO_CHANNEL_FLW }, + [SND_CHMAP_FRW] = { SND_CHMAP_FRW, SPA_AUDIO_CHANNEL_FRW }, + [SND_CHMAP_FLH] = { SND_CHMAP_FLH, SPA_AUDIO_CHANNEL_FLH }, + [SND_CHMAP_FCH] = { SND_CHMAP_FCH, SPA_AUDIO_CHANNEL_FCH }, + [SND_CHMAP_FRH] = { SND_CHMAP_FRH, SPA_AUDIO_CHANNEL_FRH }, + [SND_CHMAP_TC] = { SND_CHMAP_TC, SPA_AUDIO_CHANNEL_TC }, + [SND_CHMAP_TFL] = { SND_CHMAP_TFL, SPA_AUDIO_CHANNEL_TFL }, + [SND_CHMAP_TFR] = { SND_CHMAP_TFR, SPA_AUDIO_CHANNEL_TFR }, + [SND_CHMAP_TFC] = { SND_CHMAP_TFC, SPA_AUDIO_CHANNEL_TFC }, + [SND_CHMAP_TRL] = { SND_CHMAP_TRL, SPA_AUDIO_CHANNEL_TRL }, + [SND_CHMAP_TRR] = { SND_CHMAP_TRR, SPA_AUDIO_CHANNEL_TRR }, + [SND_CHMAP_TRC] = { SND_CHMAP_TRC, SPA_AUDIO_CHANNEL_TRC }, + [SND_CHMAP_TFLC] = { SND_CHMAP_TFLC, SPA_AUDIO_CHANNEL_TFLC }, + [SND_CHMAP_TFRC] = { SND_CHMAP_TFRC, SPA_AUDIO_CHANNEL_TFRC }, + [SND_CHMAP_TSL] = { SND_CHMAP_TSL, SPA_AUDIO_CHANNEL_TSL }, + [SND_CHMAP_TSR] = { SND_CHMAP_TSR, SPA_AUDIO_CHANNEL_TSR }, + [SND_CHMAP_LLFE] = { SND_CHMAP_LLFE, SPA_AUDIO_CHANNEL_LLFE }, + [SND_CHMAP_RLFE] = { SND_CHMAP_RLFE, SPA_AUDIO_CHANNEL_RLFE }, + [SND_CHMAP_BC] = { SND_CHMAP_BC, SPA_AUDIO_CHANNEL_BC }, + [SND_CHMAP_BLC] = { SND_CHMAP_BLC, SPA_AUDIO_CHANNEL_BLC }, + [SND_CHMAP_BRC] = { SND_CHMAP_BRC, SPA_AUDIO_CHANNEL_BRC }, +}; + +static enum snd_pcm_chmap_position channel_to_chmap(enum spa_audio_channel channel) +{ + int i; + for (i = 0; i < SPA_N_ELEMENTS(chmap_info); i++) + if (chmap_info[i].channel == channel) + return chmap_info[i].pos; + return SND_CHMAP_UNKNOWN; +} + +static int snd_pcm_pipewire_set_chmap(snd_pcm_ioplug_t * io, + const snd_pcm_chmap_t * map) +{ + return 1; +} + +static snd_pcm_chmap_t * snd_pcm_pipewire_get_chmap(snd_pcm_ioplug_t * io) +{ + snd_pcm_pipewire_t *pw = io->private_data; + snd_pcm_chmap_t *map; + int i; + + map = calloc(1, sizeof(snd_pcm_chmap_t) + + pw->format.channels * sizeof(unsigned int)); + map->channels = pw->format.channels; + for (i = 0; i < pw->format.channels; i++) + map->pos[i] = channel_to_chmap(pw->format.position[i]); + + return map; +} + static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .close = snd_pcm_pipewire_close, .start = snd_pcm_pipewire_start, @@ -530,6 +641,8 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .prepare = snd_pcm_pipewire_prepare, .poll_revents = snd_pcm_pipewire_poll_revents, .hw_params = snd_pcm_pipewire_hw_params, + .set_chmap = snd_pcm_pipewire_set_chmap, + .get_chmap = snd_pcm_pipewire_get_chmap, }; static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) @@ -564,6 +677,8 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) 1, MAX_CHANNELS)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, 1, MAX_RATE)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, + 128, 64*1024)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIODS, 2, 64)) < 0) return err; @@ -634,7 +749,9 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, const char *node_name, const char *playback_node, const char *capture_node, - snd_pcm_stream_t stream, int mode) + snd_pcm_stream_t stream, + int mode, + uint32_t flags) { snd_pcm_pipewire_t *pw; int err; @@ -648,10 +765,11 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, str = getenv("PIPEWIRE_NODE"); - pw_log_debug("open %s %d %d '%s'", name, stream, mode, str); + pw_log_debug("open %s %d %d %08x '%s'", name, stream, mode, flags, str); pw->fd = -1; pw->io.poll_fd = -1; + pw->flags = flags; if (node_name == NULL) err = asprintf(&pw->node_name, @@ -718,6 +836,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) const char *server_name = NULL; const char *playback_node = NULL; const char *capture_node = NULL; + uint32_t flags = 0; int err; pw_init(NULL, NULL); @@ -745,11 +864,16 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) snd_config_get_string(n, &capture_node); continue; } + if (strcmp(id, "exclusive") == 0) { + if (snd_config_get_bool(n)) + flags |= PW_STREAM_FLAG_EXCLUSIVE; + continue; + } SNDERR("Unknown field %s", id); return -EINVAL; } - err = snd_pcm_pipewire_open(pcmp, name, node_name, playback_node, capture_node, stream, mode); + err = snd_pcm_pipewire_open(pcmp, name, node_name, playback_node, capture_node, stream, mode, flags); return err; } From 7303f2c1a0a7643ab3017ffed17c82d0e35118ba Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 10 Oct 2018 15:32:08 +0200 Subject: [PATCH 27/38] alsa: implement query_chmaps --- alsa-plugins/pcm_pipewire.c | 51 ++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 41250f3d8..b56f2ae3b 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -462,8 +462,16 @@ static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io) static int set_default_channels(struct spa_audio_info_raw *info) { switch (info->channels) { - case 1: - info->position[0] = SPA_AUDIO_CHANNEL_MONO; + case 7: + info->position[5] = SPA_AUDIO_CHANNEL_SL; + info->position[6] = SPA_AUDIO_CHANNEL_SR; + /* Fall through */ + case 5: + info->position[3] = SPA_AUDIO_CHANNEL_RL; + info->position[4] = SPA_AUDIO_CHANNEL_RR; + info->position[2] = SPA_AUDIO_CHANNEL_FC; + info->position[0] = SPA_AUDIO_CHANNEL_FL; + info->position[1] = SPA_AUDIO_CHANNEL_FR; return 1; case 8: info->position[6] = SPA_AUDIO_CHANNEL_SL; @@ -477,12 +485,15 @@ static int set_default_channels(struct spa_audio_info_raw *info) info->position[3] = SPA_AUDIO_CHANNEL_LFE; /* Fall through */ case 3: - /* Fall through */ info->position[2] = SPA_AUDIO_CHANNEL_FC; + /* Fall through */ case 2: info->position[0] = SPA_AUDIO_CHANNEL_FL; info->position[1] = SPA_AUDIO_CHANNEL_FR; return 1; + case 1: + info->position[0] = SPA_AUDIO_CHANNEL_MONO; + return 1; default: return 0; } @@ -633,6 +644,39 @@ static snd_pcm_chmap_t * snd_pcm_pipewire_get_chmap(snd_pcm_ioplug_t * io) return map; } +static void make_map(snd_pcm_chmap_query_t **maps, int index, int channels, ...) +{ + va_list args; + int i; + + maps[index] = malloc(sizeof(snd_pcm_chmap_query_t) + (channels * sizeof(unsigned int))); + maps[index]->type = SND_CHMAP_TYPE_FIXED; + maps[index]->map.channels = channels; + va_start(args, channels); + for (i = 0; i < channels; i++) + maps[index]->map.pos[i] = va_arg(args, int); + va_end(args); +} + +static snd_pcm_chmap_query_t **snd_pcm_pipewire_query_chmaps(snd_pcm_ioplug_t *io) +{ + snd_pcm_chmap_query_t **maps; + + maps = calloc(9, sizeof(*maps)); + make_map(maps, 0, 1, SND_CHMAP_MONO); + make_map(maps, 1, 2, SND_CHMAP_FL, SND_CHMAP_FR); + make_map(maps, 2, 3, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC); + make_map(maps, 3, 4, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC, SND_CHMAP_LFE); + make_map(maps, 4, 5, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC, SND_CHMAP_RL, SND_CHMAP_RR); + make_map(maps, 5, 6, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC, SND_CHMAP_LFE, SND_CHMAP_RL, SND_CHMAP_RR); + make_map(maps, 6, 7, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC, + SND_CHMAP_SL, SND_CHMAP_SR, SND_CHMAP_RL, SND_CHMAP_RR); + make_map(maps, 7, 8, SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC, SND_CHMAP_LFE, + SND_CHMAP_SL, SND_CHMAP_SR, SND_CHMAP_RL, SND_CHMAP_RR); + + return maps; +} + static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .close = snd_pcm_pipewire_close, .start = snd_pcm_pipewire_start, @@ -643,6 +687,7 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = { .hw_params = snd_pcm_pipewire_hw_params, .set_chmap = snd_pcm_pipewire_set_chmap, .get_chmap = snd_pcm_pipewire_get_chmap, + .query_chmaps = snd_pcm_pipewire_query_chmaps, }; static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) From 7af81f80801f19687e72af693f0fd7bffe65a450 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 10 Oct 2018 18:21:53 +0200 Subject: [PATCH 28/38] conf: update to latest changes --- conf/50-pipewire.conf | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/conf/50-pipewire.conf b/conf/50-pipewire.conf index 0e34a1908..e96d9a792 100644 --- a/conf/50-pipewire.conf +++ b/conf/50-pipewire.conf @@ -1,10 +1,11 @@ # Add a specific named PipeWire pcm defaults.pipewire.server "pipewire-0" -defaults.pipewire.node "13" +defaults.pipewire.node "-1" +defaults.pipewire.exclusive false pcm.pipewire { - @args [ SERVER NODE ] + @args [ SERVER NODE EXCLUSIVE ] @args.SERVER { type string default { @@ -19,14 +20,33 @@ pcm.pipewire { name defaults.pipewire.node } } + @args.EXCLUSIVE { + type integer + default { + @func refer + name defaults.pipewire.exclusive + } + } type pipewire server $SERVER playback_node $NODE - capture_node "6" + capture_node $NODE + exclusive $EXCLUSIVE hint { show on description "PipeWire Sound Server" } } + +pcm.!default { + type pipewire + playback_node "-1" + capture_node "-1" + hint { + show on + description "Default ALSA Output (currently PipeWire Media Server)" + } + #fallback "sysdefault" +} From 7e513ea2433482767358e50537eaa2783444dc64 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 16 Oct 2018 10:02:10 +0200 Subject: [PATCH 29/38] alsa: clamp the period size to something sensible some clients (sweep) want to negotiate the smallest possible period size we can support, which is expressed in bytes and independent of samplerate, format and number of channels. For files with high samplerate and channelcount, this results in periods of 8 frames, which is too small to handle. Instead round up the period size to something we can likely handle, taking into account the samplerate and number of channels. --- alsa-plugins/pcm_pipewire.c | 44 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index b56f2ae3b..56a78df1e 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -45,6 +45,8 @@ #define MAX_CHANNELS 32 #define MAX_RATE (48000*8) +#define MIN_PERIOD 64 + typedef struct { snd_pcm_ioplug_t io; @@ -189,9 +191,9 @@ snd_pcm_pipewire_process_playback(snd_pcm_pipewire_t *pw, struct pw_buffer *b) nbytes = SPA_MIN(avail, maxsize - offset); ptr = SPA_MEMBER(d[0].data, offset, void); - pw_log_trace("%d %d %d %d %p %d", nbytes, avail, filled, offset, ptr, io->state); nframes = nbytes / bpf; + pw_log_trace("%d %d %lu %d %d %p %d", nbytes, avail, nframes, filled, offset, ptr, io->state); for (channel = 0; channel < io->channels; channel++) { pwareas[channel].addr = ptr; @@ -317,10 +319,15 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) uint8_t buffer[4096]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); uint32_t stride = (io->channels * pw->sample_bits) / 8; - uint32_t buffers = SPA_CLAMP(io->buffer_size / io->period_size, MIN_BUFFERS, MAX_BUFFERS); - uint32_t size = io->period_size * stride; + uint32_t buffers; + uint32_t size; - pw_log_info("buffers %lu %lu %u %u %u", io->buffer_size, io->period_size, buffers, stride, size); + io->period_size = pw->min_avail; + buffers = SPA_CLAMP(io->buffer_size / io->period_size, MIN_BUFFERS, MAX_BUFFERS); + size = io->period_size * stride; + + pw_log_info("buffer_size:%lu period_size:%lu buffers:%u stride:%u size:%u min_avail:%lu", + io->buffer_size, io->period_size, buffers, stride, size, pw->min_avail); params[n_params++] = spa_pod_builder_object(&b, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, @@ -367,10 +374,20 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct pw_properties *props; int res; + uint32_t min_period; pw_thread_loop_lock(pw->main_loop); - pw_log_debug("prepare %d %p %lu", pw->error, pw->stream, io->period_size); + snd_pcm_sw_params_alloca(&swparams); + if ((res = snd_pcm_sw_params_current(io->pcm, swparams)) == 0) + snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail); + else + pw->min_avail = io->period_size; + + min_period = (MIN_PERIOD * io->rate / 48000); + pw->min_avail = SPA_MAX(pw->min_avail, min_period); + + pw_log_debug("prepare %d %p %lu %ld", pw->error, pw->stream, io->period_size, pw->min_avail); if (!pw->error && pw->stream != NULL) goto done; @@ -380,7 +397,8 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) } props = pw_properties_new("client.api", "alsa", NULL); - pw_properties_setf(props, "node.latency", "%lu/%u", io->period_size, io->rate); + + pw_properties_setf(props, "node.latency", "%lu/%u", pw->min_avail, io->rate); pw_properties_set(props, PW_NODE_PROP_MEDIA, "Audio"); pw_properties_set(props, PW_NODE_PROP_CATEGORY, io->stream == SND_PCM_STREAM_PLAYBACK ? @@ -410,12 +428,6 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) done: pw->hw_ptr = 0; - snd_pcm_sw_params_alloca(&swparams); - if ((res = snd_pcm_sw_params_current(io->pcm, swparams)) == 0) - snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail); - else - pw->min_avail = io->period_size; - pw_thread_loop_unlock(pw->main_loop); return 0; @@ -505,7 +517,7 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io, snd_pcm_pipewire_t *pw = io->private_data; bool planar; - pw_log_debug("hw_params"); + pw_log_debug("hw_params %lu %lu", io->buffer_size, io->period_size); switch(io->access) { case SND_PCM_ACCESS_MMAP_INTERLEAVED: @@ -722,10 +734,12 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw) 1, MAX_CHANNELS)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_RATE, 1, MAX_RATE)) < 0 || + (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, + 16*1024, 4*1024*1024)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, - 128, 64*1024)) < 0 || + 128, 2*1024*1024)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&pw->io, SND_PCM_IOPLUG_HW_PERIODS, - 2, 64)) < 0) + 3, 64)) < 0) return err; return 0; From d7376b73049f45b5894c10f263b81a140775de57 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 2 Nov 2018 12:31:08 +0100 Subject: [PATCH 30/38] alsa: fix for target_id --- alsa-plugins/pcm_pipewire.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 56a78df1e..75edb1380 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -51,7 +51,7 @@ typedef struct { snd_pcm_ioplug_t io; char *node_name; - char *target; + uint32_t target; int fd; bool activated; /* PipeWire is activated? */ @@ -838,13 +838,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, else pw->node_name = strdup(node_name); + pw->target = SPA_ID_INVALID; if (str != NULL) - pw->target = strdup(str); + pw->target = atoi(str); else { if (stream == SND_PCM_STREAM_PLAYBACK) - pw->target = playback_node ? strdup(playback_node) : NULL; + pw->target = playback_node ? atoi(playback_node) : SPA_ID_INVALID; else - pw->target = capture_node ? strdup(capture_node) : NULL; + pw->target = capture_node ? atoi(capture_node) : SPA_ID_INVALID; } pw->loop = pw_loop_new(NULL); From 3cb8aa7abba2432c1b6b99d6b211e3155a8bf135 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 7 Jan 2019 15:05:33 +0100 Subject: [PATCH 31/38] alsa: document fallthrough case --- alsa-plugins/pcm_pipewire.c | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 75edb1380..ac5aa553b 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -753,6 +753,7 @@ static void on_remote_state_changed(void *data, enum pw_remote_state old, switch (state) { case PW_REMOTE_STATE_ERROR: pw_log_error("error %s", error); + /* fallthrough */ case PW_REMOTE_STATE_UNCONNECTED: pw->error = true; if (pw->fd != -1) From 3d9fab3aaf1e52c2481a445255841675e75def0c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 7 Jan 2019 15:05:48 +0100 Subject: [PATCH 32/38] alsa: fix signed and unsigned comparisons --- alsa-plugins/pcm_pipewire.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index ac5aa553b..ed4f7b8f1 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -39,8 +39,8 @@ #include -#define MIN_BUFFERS 3 -#define MAX_BUFFERS 64 +#define MIN_BUFFERS 3u +#define MAX_BUFFERS 64u #define MAX_CHANNELS 32 #define MAX_RATE (48000*8) @@ -628,7 +628,7 @@ static const struct chmap_info chmap_info[] = { static enum snd_pcm_chmap_position channel_to_chmap(enum spa_audio_channel channel) { - int i; + uint32_t i; for (i = 0; i < SPA_N_ELEMENTS(chmap_info); i++) if (chmap_info[i].channel == channel) return chmap_info[i].pos; @@ -645,7 +645,7 @@ static snd_pcm_chmap_t * snd_pcm_pipewire_get_chmap(snd_pcm_ioplug_t * io) { snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_chmap_t *map; - int i; + uint32_t i; map = calloc(1, sizeof(snd_pcm_chmap_t) + pw->format.channels * sizeof(unsigned int)); @@ -844,9 +844,9 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->target = atoi(str); else { if (stream == SND_PCM_STREAM_PLAYBACK) - pw->target = playback_node ? atoi(playback_node) : SPA_ID_INVALID; + pw->target = playback_node ? (uint32_t)atoi(playback_node) : SPA_ID_INVALID; else - pw->target = capture_node ? atoi(capture_node) : SPA_ID_INVALID; + pw->target = capture_node ? (uint32_t)atoi(capture_node) : SPA_ID_INVALID; } pw->loop = pw_loop_new(NULL); From 5a8c6d457e846639e4e949461ecf3f494cabba39 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 8 Jan 2019 17:30:33 +0100 Subject: [PATCH 33/38] alsa: add user_data to core --- alsa-plugins/pcm_pipewire.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index ed4f7b8f1..f4d79fcba 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -851,7 +851,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->loop = pw_loop_new(NULL); pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); - pw->core = pw_core_new(pw->loop, NULL); + pw->core = pw_core_new(pw->loop, NULL, 0); pw->remote = pw_remote_new(pw->core, NULL, 0); pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); From ea1f9e18f7a61d7632c2d65248f99b6abf33f140 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 16 Jan 2019 11:02:22 +0100 Subject: [PATCH 34/38] alsa: update to new pod api --- alsa-plugins/pcm_pipewire.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index f4d79fcba..66d034a64 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -329,14 +329,13 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format) pw_log_info("buffer_size:%lu period_size:%lu buffers:%u stride:%u size:%u min_avail:%lu", io->buffer_size, io->period_size, buffers, stride, size, pw->min_avail); - params[n_params++] = spa_pod_builder_object(&b, + params[n_params++] = spa_pod_builder_add_object(&b, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, - SPA_PARAM_BUFFERS_buffers, &SPA_POD_CHOICE_RANGE_Int(buffers, MIN_BUFFERS, MAX_BUFFERS), - SPA_PARAM_BUFFERS_blocks, &SPA_POD_Int(1), - SPA_PARAM_BUFFERS_size, &SPA_POD_CHOICE_RANGE_Int(size, size, INT_MAX), - SPA_PARAM_BUFFERS_stride, &SPA_POD_Int(stride), - SPA_PARAM_BUFFERS_align, &SPA_POD_Int(16), - 0); + SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(buffers, MIN_BUFFERS, MAX_BUFFERS), + SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(1), + SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(size, size, INT_MAX), + SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride), + SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); pw_stream_finish_format(pw->stream, 0, params, n_params); } From ddd753cfc5161797f624b4795e8c7bb71ebfad6d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 6 Feb 2019 13:22:53 +0100 Subject: [PATCH 35/38] alsa: add SPA_EXPORT --- alsa-plugins/pcm_pipewire.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 66d034a64..2d01cc9ae 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -889,6 +889,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, } +SPA_EXPORT SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) { snd_config_iterator_t i, next; @@ -938,4 +939,5 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) return err; } +SPA_EXPORT SND_PCM_PLUGIN_SYMBOL(pipewire); From d81bbae7ea2cb07abe85636bd52ab19b06b20dee Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 24 May 2019 15:46:45 +0200 Subject: [PATCH 36/38] alsa: update for keys --- alsa-plugins/pcm_pipewire.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 2d01cc9ae..8817ddf0f 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -395,14 +395,14 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) pw->stream = NULL; } - props = pw_properties_new("client.api", "alsa", NULL); + props = pw_properties_new(PW_KEY_CLIENT_API, "alsa", NULL); - pw_properties_setf(props, "node.latency", "%lu/%u", pw->min_avail, io->rate); - pw_properties_set(props, PW_NODE_PROP_MEDIA, "Audio"); - pw_properties_set(props, PW_NODE_PROP_CATEGORY, + pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate); + pw_properties_set(props, PW_KEY_MEDIA_TYPE, "Audio"); + pw_properties_set(props, PW_KEY_MEDIA_CATEGORY, io->stream == SND_PCM_STREAM_PLAYBACK ? "Playback" : "Capture"); - pw_properties_set(props, PW_NODE_PROP_ROLE, "Music"); + pw_properties_set(props, PW_KEY_MEDIA_ROLE, "Music"); pw->stream = pw_stream_new(pw->remote, pw->node_name, props); if (pw->stream == NULL) From dddaaf4db427cb5b9bc5cc273bff00bfdb75d7c7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 12 Aug 2019 12:27:51 +0200 Subject: [PATCH 37/38] alsa: improve node name and description Use the same values as what the pulse plugin would do --- alsa-plugins/pcm_pipewire.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 8817ddf0f..7cdf05157 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -814,8 +814,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, { snd_pcm_pipewire_t *pw; int err; - static unsigned int num = 0; const char *str; + struct pw_properties *props; assert(pcmp); pw = calloc(1, sizeof(*pw)); @@ -831,10 +831,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->flags = flags; if (node_name == NULL) - err = asprintf(&pw->node_name, - "alsa-pipewire.%s%s.%d.%d", name, - stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", - getpid(), num++); + err = asprintf(&pw->node_name, "ALSA %s", + stream == SND_PCM_STREAM_PLAYBACK ? "Playback" : "Capture"); else pw->node_name = strdup(node_name); @@ -852,7 +850,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); pw->core = pw_core_new(pw->loop, NULL, 0); - pw->remote = pw_remote_new(pw->core, NULL, 0); + props = pw_properties_new(NULL, NULL); + str = pw_get_prgname(); + if (str) + pw_properties_setf(props, PW_KEY_APP_NAME, "ALSA plug-in [%s]", str); + else + pw_properties_set(props, PW_KEY_APP_NAME, "ALSA plug-in"); + + pw->remote = pw_remote_new(pw->core, props, 0); pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); if ((err = pw_thread_loop_start(pw->main_loop)) < 0) From a52d6bc2d3989cfc2bf75639e9a81941c0b685ed Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 25 Oct 2019 14:54:00 +0200 Subject: [PATCH 38/38] alsa: fix includes --- alsa-plugins/pcm_pipewire.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins/pcm_pipewire.c b/alsa-plugins/pcm_pipewire.c index 7cdf05157..8f06dedb8 100644 --- a/alsa-plugins/pcm_pipewire.c +++ b/alsa-plugins/pcm_pipewire.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include