AI media harness for planning, generating, and editing locally
TypeScript
Add MP3 and FLAC music export
Bitti9402b4d557a0
diff --git a/README.md b/README.mdindex 96eb3a1..865cc40 100644--- a/README.md+++ b/README.md@@ -32,7 +32,7 @@ Slopus combines an AI assistant, local image, video and music generation, reusab- **Generators.** Manage model weights, supported LoRAs, attention and generation effects. Share [generator templates](docs/generator-weights.md#sharing-generator-templates) as `.slop` bundles or run jobs on LAN workers.- **Timeline.** Arrange video and audio with trimming, splitting, snapping, waveforms, transitions, chroma key and GPU effects.- **Motions.** Ask the agent to create JavaScript animations, edit elements and parameters, and render them on the timeline or as reference videos.-- **Export.** Save MP4 video, JPG/PNG images, or music as WAV, AAC/M4A or Opus in WebM/Ogg. Compressed formats depend on available encoders. Exports run in the background.+- **Export.** Save MP4 video, JPG/PNG images, or music as WAV, MP3, lossless FLAC, AAC/M4A or Opus in WebM/Ogg. MP3/FLAC encoders are bundled; AAC/Opus depend on device support. Exports run in the background.- **Project editing.** Timeline, Video, Image, Music, References and Export views share Save, Undo and Redo. Projects and media are stored locally; agent requests go to the selected provider. API keys stay outside project files.## Setupdiff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.mdindex 849683f..e3c06d8 100644--- a/RELEASE_NOTES.md+++ b/RELEASE_NOTES.md@@ -5,7 +5,7 @@ Changes since 0.3.2.## What's new- **Video library.** Organize Videos → Scenes → Shots in folders, play scenes sequentially on cards or in a popout, and apply shared prompts and timed music/video references. Split a complete song into scenes; timeline clips remain individual scenes.-- **Music export.** Select and preview songs in Export, then save WAV, AAC/M4A or Opus/WebM/Ogg with device-supported encoders, bitrate controls and background export.+- **Music export.** Preview and export WAV, MP3, lossless FLAC, AAC/M4A or Opus/WebM/Ogg, with bitrate controls and background export. MP3/FLAC use bundled Mediabunny encoders.- **Single Shot.** Generate a short ending first, then anchor a continuous shot to it. Supports references in both prompts and optional continuation from any generated scene.- **Music.** YuE2 and MiniMax Music3 generation with folders, drag-and-drop organization, grid/list views, background playback, references and timeline audio. Playback appears in the Music tab and pauses when Timeline, Video or Export playback starts. YuE2 selects BF16 above 8 GiB VRAM, otherwise INT8.- **Motions.** Create JavaScript animations with the agent, edit elements and parameters, and export them on the timeline or as reference videos.diff --git a/package-lock.json b/package-lock.jsonindex 19fd6c8..da4f80a 100644--- a/package-lock.json+++ b/package-lock.json@@ -9,6 +9,8 @@"version": "0.3.2","dependencies": {"@fluentui/react-icons": "^2.0.343",+ "@mediabunny/flac-encoder": "^1.62.1",+ "@mediabunny/mp3-encoder": "^1.62.1","@tauri-apps/api": "^2.8.0","@tauri-apps/plugin-dialog": "^2.7.3","@tauri-apps/plugin-process": "^2.3.1",@@ -1017,6 +1019,32 @@"@jridgewell/sourcemap-codec": "^1.4.14"}},+ "node_modules/@mediabunny/flac-encoder": {+ "version": "1.62.1",+ "resolved": "https://registry.npmjs.org/@mediabunny/flac-encoder/-/flac-encoder-1.62.1.tgz",+ "integrity": "sha512-6y2JrjniW6336tcM1UCEY3eU47RmZkb7+BPrb2rne+xnzgQUhCVCMSM12GqmbQTfbmVYfZjiu2VQqNcZYiaoPw==",+ "license": "MPL-2.0",+ "funding": {+ "type": "individual",+ "url": "https://github.com/sponsors/Vanilagy"+ },+ "peerDependencies": {+ "mediabunny": "^1.0.0"+ }+ },+ "node_modules/@mediabunny/mp3-encoder": {+ "version": "1.62.1",+ "resolved": "https://registry.npmjs.org/@mediabunny/mp3-encoder/-/mp3-encoder-1.62.1.tgz",+ "integrity": "sha512-v5L8Z9T298IcSWGvWPlGGNhoM2YzY+fOVAtdkwc6Leh8c1HXl5ivJVBKCcRZeCbp4LDJOSuwdu2SE/V67SZo7w==",+ "license": "MPL-2.0",+ "funding": {+ "type": "individual",+ "url": "https://github.com/sponsors/Vanilagy"+ },+ "peerDependencies": {+ "mediabunny": "^1.0.0"+ }+ },"node_modules/@napi-rs/lzma-linux-x64-gnu": {"version": "1.5.1","resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz",diff --git a/package.json b/package.jsonindex 2f80a25..3f1732a 100644--- a/package.json+++ b/package.json@@ -16,6 +16,8 @@},"dependencies": {"@fluentui/react-icons": "^2.0.343",+ "@mediabunny/flac-encoder": "^1.62.1",+ "@mediabunny/mp3-encoder": "^1.62.1","@tauri-apps/api": "^2.8.0","@tauri-apps/plugin-dialog": "^2.7.3","@tauri-apps/plugin-process": "^2.3.1",diff --git a/public/licenses/lame-LGPL-2.0.txt b/public/licenses/lame-LGPL-2.0.txtnew file mode 100644index 0000000..56d6d03--- /dev/null+++ b/public/licenses/lame-LGPL-2.0.txt@@ -0,0 +1,481 @@+ GNU LIBRARY GENERAL PUBLIC LICENSE+ Version 2, June 1991++ Copyright (C) 1991 Free Software Foundation, Inc.+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 library GPL. It is+ numbered 2 because it goes with version 2 of the ordinary GPL.]++ 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 Library General Public License, applies to some+specially designated Free Software Foundation software, and to any+other libraries whose authors decide to use it. You can use it for+your libraries, too.++ When we speak of free software, we are referring to freedom, 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 or use pieces of it+in new free programs; and that you know you can do these things.++ To protect your rights, we need to make restrictions that forbid+anyone to deny you these rights or to ask you to surrender the 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 a program 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.++ Our method of protecting your rights has two steps: (1) copyright+the library, and (2) offer you this license which gives you legal+permission to copy, distribute and/or modify the library.++ Also, for each distributor's protection, we want to make certain+that everyone understands that there is no warranty for this free+library. If the library is modified by someone else and passed on, we+want its recipients to know that what they have is not the original+version, so that any problems introduced by others will not reflect on+the original authors' reputations.++ Finally, any free program is threatened constantly by software+patents. We wish to avoid the danger that companies distributing free+software will individually obtain patent licenses, thus in effect+transforming the program into proprietary software. To prevent this,+we have made it clear that any patent must be licensed for everyone's+free use or not licensed at all.++ Most GNU software, including some libraries, is covered by the ordinary+GNU General Public License, which was designed for utility programs. This+license, the GNU Library General Public License, applies to certain+designated libraries. This license is quite different from the ordinary+one; be sure to read it in full, and don't assume that anything in it is+the same as in the ordinary license.++ The reason we have a separate public license for some libraries is that+they blur the distinction we usually make between modifying or adding to a+program and simply using it. Linking a program with a library, without+changing the library, is in some sense simply using the library, and is+analogous to running a utility program or application program. However, in+a textual and legal sense, the linked executable is a combined work, a+derivative of the original library, and the ordinary General Public License+treats it as such.++ Because of this blurred distinction, using the ordinary General+Public License for libraries did not effectively promote software+sharing, because most developers did not use the libraries. We+concluded that weaker conditions might promote sharing better.++ However, unrestricted linking of non-free programs would deprive the+users of those programs of all benefit from the free status of the+libraries themselves. This Library General Public License is intended to+permit developers of non-free programs to use free libraries, while+preserving your freedom as a user of such programs to change the free+libraries that are incorporated in them. (We have not seen how to achieve+this as regards changes in header files, but we have achieved it as regards+changes in the actual functions of the Library.) The hope is that this+will lead to faster development of free libraries.++ 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, while the latter only+works together with the library.++ Note that it is possible for a library to be covered by the ordinary+General Public License rather than by this special one.++ GNU LIBRARY GENERAL PUBLIC LICENSE+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION++ 0. This License Agreement applies to any software library which+contains a notice placed by the copyright holder or other authorized+party saying it may be distributed under the terms of this Library+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 compile 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) 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.++ c) 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.++ d) 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 source code 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 to+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 Library 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.++ <one line to give the library's name and a brief idea of what it does.>+ Copyright (C) <year> <name of author>++ This library is free software; you can redistribute it and/or+ modify it under the terms of the GNU Library General Public+ License as published by the Free Software Foundation; either+ version 2 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+ Library General Public License for more details.++ You should have received a copy of the GNU Library 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++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/public/licenses/libFLAC-BSD-3-Clause.txt b/public/licenses/libFLAC-BSD-3-Clause.txtnew file mode 100644index 0000000..f42f48b--- /dev/null+++ b/public/licenses/libFLAC-BSD-3-Clause.txt@@ -0,0 +1,29 @@+Copyright (C) 2000-2009 Josh Coalson+Copyright (C) 2011-2025 Xiph.Org Foundation++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions+are met:++- Redistributions of source code must retain the above copyright+notice, this list of conditions and the following disclaimer.++- Redistributions in binary form must reproduce the above copyright+notice, this list of conditions and the following disclaimer in the+documentation and/or other materials provided with the distribution.++- Neither the name of the Xiph.Org Foundation nor the names of its+contributors may be used to endorse or promote products derived from+this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.diff --git a/public/licenses/mediabunny-MPL-2.0.txt b/public/licenses/mediabunny-MPL-2.0.txtnew file mode 100644index 0000000..d0a1fa1--- /dev/null+++ b/public/licenses/mediabunny-MPL-2.0.txt@@ -0,0 +1,373 @@+Mozilla Public License Version 2.0+==================================++1. Definitions+--------------++1.1. "Contributor"+ means each individual or legal entity that creates, contributes to+ the creation of, or owns Covered Software.++1.2. "Contributor Version"+ means the combination of the Contributions of others (if any) used+ by a Contributor and that particular Contributor's Contribution.++1.3. "Contribution"+ means Covered Software of a particular Contributor.++1.4. "Covered Software"+ means Source Code Form to which the initial Contributor has attached+ the notice in Exhibit A, the Executable Form of such Source Code+ Form, and Modifications of such Source Code Form, in each case+ including portions thereof.++1.5. "Incompatible With Secondary Licenses"+ means++ (a) that the initial Contributor has attached the notice described+ in Exhibit B to the Covered Software; or++ (b) that the Covered Software was made available under the terms of+ version 1.1 or earlier of the License, but not also under the+ terms of a Secondary License.++1.6. "Executable Form"+ means any form of the work other than Source Code Form.++1.7. "Larger Work"+ means a work that combines Covered Software with other material, in+ a separate file or files, that is not Covered Software.++1.8. "License"+ means this document.++1.9. "Licensable"+ means having the right to grant, to the maximum extent possible,+ whether at the time of the initial grant or subsequently, any and+ all of the rights conveyed by this License.++1.10. "Modifications"+ means any of the following:++ (a) any file in Source Code Form that results from an addition to,+ deletion from, or modification of the contents of Covered+ Software; or++ (b) any new file in Source Code Form that contains any Covered+ Software.++1.11. "Patent Claims" of a Contributor+ means any patent claim(s), including without limitation, method,+ process, and apparatus claims, in any patent Licensable by such+ Contributor that would be infringed, but for the grant of the+ License, by the making, using, selling, offering for sale, having+ made, import, or transfer of either its Contributions or its+ Contributor Version.++1.12. "Secondary License"+ means either the GNU General Public License, Version 2.0, the GNU+ Lesser General Public License, Version 2.1, the GNU Affero General+ Public License, Version 3.0, or any later versions of those+ licenses.++1.13. "Source Code Form"+ means the form of the work preferred for making modifications.++1.14. "You" (or "Your")+ means an individual or a legal entity exercising rights under this+ License. For legal entities, "You" includes any entity that+ controls, is controlled by, or is under common control with You. For+ purposes of this definition, "control" means (a) the power, direct+ or indirect, to cause the direction or management of such entity,+ whether by contract or otherwise, or (b) ownership of more than+ fifty percent (50%) of the outstanding shares or beneficial+ ownership of such entity.++2. License Grants and Conditions+--------------------------------++2.1. Grants++Each Contributor hereby grants You a world-wide, royalty-free,+non-exclusive license:++(a) under intellectual property rights (other than patent or trademark)+ Licensable by such Contributor to use, reproduce, make available,+ modify, display, perform, distribute, and otherwise exploit its+ Contributions, either on an unmodified basis, with Modifications, or+ as part of a Larger Work; and++(b) under Patent Claims of such Contributor to make, use, sell, offer+ for sale, have made, import, and otherwise transfer either its+ Contributions or its Contributor Version.++2.2. Effective Date++The licenses granted in Section 2.1 with respect to any Contribution+become effective for each Contribution on the date the Contributor first+distributes such Contribution.++2.3. Limitations on Grant Scope++The licenses granted in this Section 2 are the only rights granted under+this License. No additional rights or licenses will be implied from the+distribution or licensing of Covered Software under this License.+Notwithstanding Section 2.1(b) above, no patent license is granted by a+Contributor:++(a) for any code that a Contributor has removed from Covered Software;+ or++(b) for infringements caused by: (i) Your and any other third party's+ modifications of Covered Software, or (ii) the combination of its+ Contributions with other software (except as part of its Contributor+ Version); or++(c) under Patent Claims infringed by Covered Software in the absence of+ its Contributions.++This License does not grant any rights in the trademarks, service marks,+or logos of any Contributor (except as may be necessary to comply with+the notice requirements in Section 3.4).++2.4. Subsequent Licenses++No Contributor makes additional grants as a result of Your choice to+distribute the Covered Software under a subsequent version of this+License (see Section 10.2) or under the terms of a Secondary License (if+permitted under the terms of Section 3.3).++2.5. Representation++Each Contributor represents that the Contributor believes its+Contributions are its original creation(s) or it has sufficient rights+to grant the rights to its Contributions conveyed by this License.++2.6. Fair Use++This License is not intended to limit any rights You have under+applicable copyright doctrines of fair use, fair dealing, or other+equivalents.++2.7. Conditions++Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted+in Section 2.1.++3. Responsibilities+-------------------++3.1. Distribution of Source Form++All distribution of Covered Software in Source Code Form, including any+Modifications that You create or to which You contribute, must be under+the terms of this License. You must inform recipients that the Source+Code Form of the Covered Software is governed by the terms of this+License, and how they can obtain a copy of this License. You may not+attempt to alter or restrict the recipients' rights in the Source Code+Form.++3.2. Distribution of Executable Form++If You distribute Covered Software in Executable Form then:++(a) such Covered Software must also be made available in Source Code+ Form, as described in Section 3.1, and You must inform recipients of+ the Executable Form how they can obtain a copy of such Source Code+ Form by reasonable means in a timely manner, at a charge no more+ than the cost of distribution to the recipient; and++(b) You may distribute such Executable Form under the terms of this+ License, or sublicense it under different terms, provided that the+ license for the Executable Form does not attempt to limit or alter+ the recipients' rights in the Source Code Form under this License.++3.3. Distribution of a Larger Work++You may create and distribute a Larger Work under terms of Your choice,+provided that You also comply with the requirements of this License for+the Covered Software. If the Larger Work is a combination of Covered+Software with a work governed by one or more Secondary Licenses, and the+Covered Software is not Incompatible With Secondary Licenses, this+License permits You to additionally distribute such Covered Software+under the terms of such Secondary License(s), so that the recipient of+the Larger Work may, at their option, further distribute the Covered+Software under the terms of either this License or such Secondary+License(s).++3.4. Notices++You may not remove or alter the substance of any license notices+(including copyright notices, patent notices, disclaimers of warranty,+or limitations of liability) contained within the Source Code Form of+the Covered Software, except that You may alter any license notices to+the extent required to remedy known factual inaccuracies.++3.5. Application of Additional Terms++You may choose to offer, and to charge a fee for, warranty, support,+indemnity or liability obligations to one or more recipients of Covered+Software. However, You may do so only on Your own behalf, and not on+behalf of any Contributor. You must make it absolutely clear that any+such warranty, support, indemnity, or liability obligation is offered by+You alone, and You hereby agree to indemnify every Contributor for any+liability incurred by such Contributor as a result of warranty, support,+indemnity or liability terms You offer. You may include additional+disclaimers of warranty and limitations of liability specific to any+jurisdiction.++4. Inability to Comply Due to Statute or Regulation+---------------------------------------------------++If it is impossible for You to comply with any of the terms of this+License with respect to some or all of the Covered Software due to+statute, judicial order, or regulation then You must: (a) comply with+the terms of this License to the maximum extent possible; and (b)+describe the limitations and the code they affect. Such description must+be placed in a text file included with all distributions of the Covered+Software under this License. Except to the extent prohibited by statute+or regulation, such description must be sufficiently detailed for a+recipient of ordinary skill to be able to understand it.++5. Termination+--------------++5.1. The rights granted under this License will terminate automatically+if You fail to comply with any of its terms. However, if You become+compliant, then the rights granted under this License from a particular+Contributor are reinstated (a) provisionally, unless and until such+Contributor explicitly and finally terminates Your grants, and (b) on an+ongoing basis, if such Contributor fails to notify You of the+non-compliance by some reasonable means prior to 60 days after You have+come back into compliance. Moreover, Your grants from a particular+Contributor are reinstated on an ongoing basis if such Contributor+notifies You of the non-compliance by some reasonable means, this is the+first time You have received notice of non-compliance with this License+from such Contributor, and You become compliant prior to 30 days after+Your receipt of the notice.++5.2. If You initiate litigation against any entity by asserting a patent+infringement claim (excluding declaratory judgment actions,+counter-claims, and cross-claims) alleging that a Contributor Version+directly or indirectly infringes any patent, then the rights granted to+You by any and all Contributors for the Covered Software under Section+2.1 of this License shall terminate.++5.3. In the event of termination under Sections 5.1 or 5.2 above, all+end user license agreements (excluding distributors and resellers) which+have been validly granted by You or Your distributors under this License+prior to termination shall survive termination.++************************************************************************+* *+* 6. Disclaimer of Warranty *+* ------------------------- *+* *+* Covered Software is provided under this License on an "as is" *+* basis, without warranty of any kind, either expressed, implied, or *+* statutory, including, without limitation, warranties that the *+* Covered Software is free of defects, merchantable, fit for a *+* particular purpose or non-infringing. The entire risk as to the *+* quality and performance of the Covered Software is with You. *+* Should any Covered Software prove defective in any respect, You *+* (not any Contributor) assume the cost of any necessary servicing, *+* repair, or correction. This disclaimer of warranty constitutes an *+* essential part of this License. No use of any Covered Software is *+* authorized under this License except under this disclaimer. *+* *+************************************************************************++************************************************************************+* *+* 7. Limitation of Liability *+* -------------------------- *+* *+* Under no circumstances and under no legal theory, whether tort *+* (including negligence), contract, or otherwise, shall any *+* Contributor, or anyone who distributes Covered Software as *+* permitted above, be liable to You for any direct, indirect, *+* special, incidental, or consequential damages of any character *+* including, without limitation, damages for lost profits, loss of *+* goodwill, work stoppage, computer failure or malfunction, or any *+* and all other commercial damages or losses, even if such party *+* shall have been informed of the possibility of such damages. This *+* limitation of liability shall not apply to liability for death or *+* personal injury resulting from such party's negligence to the *+* extent applicable law prohibits such limitation. Some *+* jurisdictions do not allow the exclusion or limitation of *+* incidental or consequential damages, so this exclusion and *+* limitation may not apply to You. *+* *+************************************************************************++8. Litigation+-------------++Any litigation relating to this License may be brought only in the+courts of a jurisdiction where the defendant maintains its principal+place of business and such litigation shall be governed by laws of that+jurisdiction, without reference to its conflict-of-law provisions.+Nothing in this Section shall prevent a party's ability to bring+cross-claims or counter-claims.++9. Miscellaneous+----------------++This License represents the complete agreement concerning the subject+matter hereof. If any provision of this License is held to be+unenforceable, such provision shall be reformed only to the extent+necessary to make it enforceable. Any law or regulation which provides+that the language of a contract shall be construed against the drafter+shall not be used to construe this License against a Contributor.++10. Versions of the License+---------------------------++10.1. New Versions++Mozilla Foundation is the license steward. Except as provided in Section+10.3, no one other than the license steward has the right to modify or+publish new versions of this License. Each version will be given a+distinguishing version number.++10.2. Effect of New Versions++You may distribute the Covered Software under the terms of the version+of the License under which You originally received the Covered Software,+or under the terms of any subsequent version published by the license+steward.++10.3. Modified Versions++If you create software not governed by this License, and you want to+create a new license for such software, you may create and use a+modified version of this License if you rename the license and remove+any references to the name of the license steward (except to note that+such modified license differs from this License).++10.4. Distributing Source Code Form that is Incompatible With Secondary+Licenses++If You choose to distribute Source Code Form that is Incompatible With+Secondary Licenses under the terms of this version of the License, the+notice described in Exhibit B of this License must be attached.++Exhibit A - Source Code Form License Notice+-------------------------------------------++ This Source Code Form is subject to the terms of the Mozilla Public+ License, v. 2.0. If a copy of the MPL was not distributed with this+ file, You can obtain one at https://mozilla.org/MPL/2.0/.++If it is not possible or desirable to put the notice in a particular+file, then You may include the notice in a location (such as a LICENSE+file in a relevant directory) where a recipient would be likely to look+for such a notice.++You may add additional accurate notices of copyright ownership.++Exhibit B - "Incompatible With Secondary Licenses" Notice+---------------------------------------------------------++ This Source Code Form is "Incompatible With Secondary Licenses", as+ defined by the Mozilla Public License, v. 2.0.diff --git a/public/licenses/music-encoders.txt b/public/licenses/music-encoders.txtnew file mode 100644index 0000000..bddc52b--- /dev/null+++ b/public/licenses/music-encoders.txt@@ -0,0 +1,17 @@+Music encoder notices++MP3 and FLAC encoding use the unmodified @mediabunny/mp3-encoder and+@mediabunny/flac-encoder packages, version 1.62.1, by Vanilagy.+License: Mozilla Public License 2.0 (see mediabunny-MPL-2.0.txt).+Source, bridge code and WebAssembly build instructions:+https://github.com/Vanilagy/mediabunny/tree/v1.62.1/packages/mp3-encoder+https://github.com/Vanilagy/mediabunny/tree/v1.62.1/packages/flac-encoder++The MP3 encoder includes LAME 3.100, licensed under the GNU Library General+Public License version 2 or later (see lame-LGPL-2.0.txt).+Thanks to the LAME project: https://lame.sourceforge.io/+Source: https://sourceforge.net/projects/lame/files/lame/3.100/++The FLAC encoder includes libFLAC, licensed under the BSD 3-Clause license+(see libFLAC-BSD-3-Clause.txt).+Source: https://github.com/xiph/flacdiff --git a/src-tauri/src/export.rs b/src-tauri/src/export.rsindex c95d016..94c2644 100644--- a/src-tauri/src/export.rs+++ b/src-tauri/src/export.rs@@ -105,8 +105,8 @@ fn checked_destination(value: &str) -> Result<PathBuf, String> {.extension().and_then(|value| value.to_str()).map(str::to_ascii_lowercase);- if !matches!(extension.as_deref(), Some("mp4" | "m4a" | "webm" | "ogg" | "wav")) {- return Err(format!("{value} must end in .mp4, .m4a, .webm, .ogg or .wav."));+ if !matches!(extension.as_deref(), Some("mp4" | "m4a" | "webm" | "ogg" | "wav" | "mp3" | "flac")) {+ return Err(format!("{value} must end in .mp4, .m4a, .webm, .ogg, .wav, .mp3 or .flac."));}let parent = path.parent()@@ -232,7 +232,8 @@ fn music_format(format: &str) -> Result<&'static str, String> {match format {"m4a" => Ok("M4A audio"), "webm" => Ok("WebM audio"),"ogg" => Ok("Ogg audio"), "wav" => Ok("WAV audio"),- _ => Err("Choose M4A, WebM, Ogg or WAV for music export.".into()),+ "mp3" => Ok("MP3 audio"), "flac" => Ok("FLAC audio"),+ _ => Err("Choose MP3, FLAC, M4A, WebM, Ogg or WAV for music export.".into()),}}@@ -382,7 +383,7 @@ mod tests {#[test]fn music_formats_require_supported_extensions_and_dialog_authorization() {let folder = tempfile::tempdir().unwrap();- for extension in ["m4a", "webm", "ogg", "wav"] {+ for extension in ["m4a", "webm", "ogg", "wav", "mp3", "flac"] {assert!(music_format(extension).is_ok());let path = folder.path().join(format!("song.{extension}"));assert!(checked_destination(&path.to_string_lossy()).is_ok());@@ -392,7 +393,7 @@ mod tests {let other = folder.path().join(format!("other.{extension}"));assert!(authorized_destination(&other.to_string_lossy()).is_err());}- for extension in ["exe", "mp3", "../wav", "mp4"] { assert!(music_format(extension).is_err()); }+ for extension in ["exe", "aac", "../wav", "mp4"] { assert!(music_format(extension).is_err()); }}#[test]diff --git a/src-tauri/src/tests/media_access.rs b/src-tauri/src/tests/media_access.rsindex a83af25..3d233e9 100644--- a/src-tauri/src/tests/media_access.rs+++ b/src-tauri/src/tests/media_access.rs@@ -198,6 +198,7 @@ fn the_window_ships_a_policy_that_previews_still_work_under() {// Scripts: same origin only, and nothing the page can talk itself into.let script = directive("script-src");assert!(script.contains("'self'"), "{script}");+ assert!(script.contains("'wasm-unsafe-eval'"), "The bundled music encoders need WebAssembly: {script}");for hole in ["'unsafe-inline'", "'unsafe-eval'", "*", "http:", "https:"] {assert!(!script.split_whitespace().any(|source| source == hole),diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.jsonindex df945e1..4b7a464 100644--- a/src-tauri/tauri.conf.json+++ b/src-tauri/tauri.conf.json@@ -27,7 +27,7 @@}],"security": {- "csp": "default-src 'self'; script-src 'self' blob:; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' blob: data:; media-src 'self' blob: data:; worker-src 'self' blob:; connect-src 'self' ipc: http://ipc.localhost blob: data:; object-src 'none'; base-uri 'self'; frame-ancestors 'none'; form-action 'none'"+ "csp": "default-src 'self'; script-src 'self' blob: 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' blob: data:; media-src 'self' blob: data:; worker-src 'self' blob:; connect-src 'self' ipc: http://ipc.localhost blob: data:; object-src 'none'; base-uri 'self'; frame-ancestors 'none'; form-action 'none'"}},"bundle": {diff --git a/src/components/workspace/MusicExportView.test.tsx b/src/components/workspace/MusicExportView.test.tsxindex befae63..8a92941 100644--- a/src/components/workspace/MusicExportView.test.tsx+++ b/src/components/workspace/MusicExportView.test.tsx@@ -64,6 +64,19 @@ it("disables unsupported encoders and does not queue when the save dialog is canexpect(startMusicExportJob).not.toHaveBeenCalled();});+it.each(["mp3", "flac"] as const)("exports %s with the correct destination and bitrate controls", async (format) => {+ vi.mocked(invoke).mockResolvedValue(`D:/song.${format}`);+ render(<MusicExportView config={config()} folderPath="D:/Music" />);+ await waitFor(() => expect(screen.getByRole("button", { name: "Export…" })).toBeEnabled());+ fireEvent.click(screen.getByRole("combobox", { name: "Format" }));+ fireEvent.click(screen.getByRole("option", { name: format === "mp3" ? "MP3" : "FLAC · Lossless" }));+ if (format === "mp3") expect(screen.getByRole("combobox", { name: "Bitrate" })).toBeInTheDocument();+ else expect(screen.queryByRole("combobox", { name: "Bitrate" })).not.toBeInTheDocument();+ fireEvent.click(screen.getByRole("button", { name: "Export…" }));+ await waitFor(() => expect(startMusicExportJob).toHaveBeenCalledWith(expect.objectContaining({ settings: { format, bitrate: 192000 }, destination: `D:/song.${format}` })));+ expect(invoke).toHaveBeenCalledWith("choose_music_export_destination", { suggestedName: "Evening", format });+});+it("has an empty state for drafts and stops preview playback on unmount", async () => {const draft = config(); draft.assets = [];const empty = render(<MusicExportView config={draft} folderPath="D:/Music" />);diff --git a/src/components/workspace/MusicExportView.tsx b/src/components/workspace/MusicExportView.tsxindex aa9d8cc..85a339a 100644--- a/src/components/workspace/MusicExportView.tsx+++ b/src/components/workspace/MusicExportView.tsx@@ -2,7 +2,7 @@ import { invoke } from "@tauri-apps/api/core";import { useEffect, useRef, useState } from "react";import type { ProjectConfig } from "../../lib/project";import { isTauri, readMediaFileUrl } from "../../lib/persistence";-import { MUSIC_EXPORT_BITRATES, MUSIC_EXPORT_FORMATS, musicExportSongs, musicExportSupport, type MusicExportFormat, type MusicExportSettings } from "../../lib/musicExport";+import { MUSIC_EXPORT_BITRATES, MUSIC_EXPORT_FORMATS, musicExportSongs, musicExportSupport, musicExportUsesBitrate, type MusicExportFormat, type MusicExportSettings } from "../../lib/musicExport";import { cancelExportJob, dismissExportOutcome, exportFraction, isExportActive, startMusicExportJob, useExportJob } from "../../lib/exportJob";import { ComboBox, EmptyState, InfoBar, ProgressBar, PropRow, PropSection, Splitter, usePaneSize } from "../ui";import { Audio16 } from "../ui/icons";@@ -90,7 +90,7 @@ export function MusicExportView({ config, folderPath }: { config: ProjectConfig;onChange={(format) => choose({ format: format as MusicExportFormat })}options={MUSIC_EXPORT_FORMATS.map(({ value, label }) => ({ value, label, disabled: support[value] !== true,description: support[value] === false ? "Unavailable on this device" : support[value] === undefined ? "Checking support…" : undefined }))} /></PropRow>- {settings.format !== "wav" && <PropRow label="Bitrate" htmlFor="music-export-bitrate"><ComboBox id="music-export-bitrate" value={String(settings.bitrate)} options={MUSIC_EXPORT_BITRATES} disabled={choosing} onChange={(value) => choose({ bitrate: Number(value) })} /></PropRow>}+ {musicExportUsesBitrate(settings.format) && <PropRow label="Bitrate" htmlFor="music-export-bitrate"><ComboBox id="music-export-bitrate" value={String(settings.bitrate)} options={MUSIC_EXPORT_BITRATES} disabled={choosing} onChange={(value) => choose({ bitrate: Number(value) })} /></PropRow>}<PropRow label="Sample rate"><span>48 kHz</span></PropRow></PropSection><div className="export-messages">diff --git a/src/lib/musicExport.test.ts b/src/lib/musicExport.test.tsindex ae8bd14..9fd3f5d 100644--- a/src/lib/musicExport.test.ts+++ b/src/lib/musicExport.test.ts@@ -59,11 +59,28 @@ it("probes native encoding support at the selected bitrate and rejects unavailabexpect(readMediaFileBytes).not.toHaveBeenCalled();});-it("cancels before reading and during encoding without returning a partial file", async () => {- await expect(runMusicExport({ ...options(), cancelled: () => true })).rejects.toBeInstanceOf(ExportCancelled);+it.each(["mp3", "flac"] as const)("encodes real %s with the bundled fallback when WebCodecs is unavailable", async (format) => {+ vi.stubGlobal("AudioEncoder", undefined); vi.stubGlobal("AudioData", undefined);+ expect(await musicExportSupport(format, 192000)).toBe(true);+ const bytes = await runMusicExport({ ...options(), settings: { format, bitrate: 192000 } });+ const { Input, BufferSource, ALL_FORMATS } = await import("mediabunny");+ const input = new Input({ source: new BufferSource(bytes), formats: ALL_FORMATS });+ try {+ const track = await input.getPrimaryAudioTrack();+ expect(await track?.getCodec()).toBe(format);+ expect(track?.numberOfChannels).toBe(2);+ expect(track?.sampleRate).toBe(48000);+ expect(await input.computeDuration()).toBeCloseTo(frames / 48000, 1);+ if (format === "flac") expect(new TextDecoder().decode(bytes.subarray(0, 4))).toBe("fLaC");+ } finally { input.dispose(); }+});++it.each(["wav", "mp3", "flac"] as const)("cancels %s before reading and during encoding without returning a partial file", async (format) => {+ const request = { ...options(), settings: { format, bitrate: 192000 } };+ await expect(runMusicExport({ ...request, cancelled: () => true })).rejects.toBeInstanceOf(ExportCancelled);expect(readMediaFileBytes).not.toHaveBeenCalled();let cancelled = false;- await expect(runMusicExport({ ...options(), cancelled: () => cancelled, onProgress: (progress) => { if (progress.phase === "rendering") cancelled = true; } })).rejects.toBeInstanceOf(ExportCancelled);+ await expect(runMusicExport({ ...request, cancelled: () => cancelled, onProgress: (progress) => { if (progress.phase === "rendering") cancelled = true; } })).rejects.toBeInstanceOf(ExportCancelled);});it("lists generated songs across folders, excluding drafts and missing audio", () => {diff --git a/src/lib/musicExport.ts b/src/lib/musicExport.tsindex beb71bf..a09f226 100644--- a/src/lib/musicExport.ts+++ b/src/lib/musicExport.ts@@ -5,9 +5,11 @@ import { readMediaFileBytes } from "./persistence";import { ExportCancelled, type ExportProgress } from "./exportPipeline";import { finishCodec } from "./codecWait";-export type MusicExportFormat = "m4a" | "webm" | "ogg" | "wav";+export type MusicExportFormat = "m4a" | "webm" | "ogg" | "wav" | "mp3" | "flac";export interface MusicExportSettings { format: MusicExportFormat; bitrate: number }export const MUSIC_EXPORT_FORMATS: readonly { value: MusicExportFormat; label: string; codec: AudioCodec; nativeCodec?: string }[] = [+ { value: "mp3", label: "MP3", codec: "mp3" },+ { value: "flac", label: "FLAC · Lossless", codec: "flac" },{ value: "m4a", label: "M4A · AAC", codec: "aac", nativeCodec: "mp4a.40.2" },{ value: "webm", label: "WebM · Opus", codec: "opus", nativeCodec: "opus" },{ value: "ogg", label: "Ogg · Opus", codec: "opus", nativeCodec: "opus" },@@ -15,6 +17,20 @@ export const MUSIC_EXPORT_FORMATS: readonly { value: MusicExportFormat; label: s];export const MUSIC_EXPORT_BITRATES = [96, 128, 192, 256, 320].map((value) => ({ value: String(value * 1000), label: `${value} kbps` }));export const MUSIC_EXPORT_SAMPLE_RATE = 48_000;+export const musicExportUsesBitrate = (format: MusicExportFormat) => format !== "wav" && format !== "flac";++const encoders = new Map<"mp3" | "flac", Promise<void>>();+function registerMusicEncoder(codec: "mp3" | "flac") {+ let pending = encoders.get(codec);+ if (!pending) {+ pending = (codec === "mp3"+ ? import("@mediabunny/mp3-encoder").then(({ registerMp3Encoder }) => registerMp3Encoder())+ : import("@mediabunny/flac-encoder").then(({ registerFlacEncoder }) => registerFlacEncoder()))+ .catch((reason) => { encoders.delete(codec); throw reason; });+ encoders.set(codec, pending);+ }+ return pending;+}export function musicExportSongs(config: ProjectConfig) {return (config.musicSongs ?? []).flatMap((song) => {@@ -29,6 +45,16 @@ export function musicExportSongs(config: ProjectConfig) {export async function musicExportSupport(format: MusicExportFormat, bitrate: number, channels = 2): Promise<boolean> {const choice = MUSIC_EXPORT_FORMATS.find((item) => item.value === format);if (!choice || typeof OfflineAudioContext === "undefined") return false;+ if (choice.codec === "mp3" || choice.codec === "flac") {+ try {+ const { canEncodeAudio, Quality } = await import("mediabunny");+ const options = { sampleRate: MUSIC_EXPORT_SAMPLE_RATE, numberOfChannels: channels,+ ...(choice.codec === "mp3" ? { quality: new Quality({ bitrate }) } : {}) };+ if (await canEncodeAudio(choice.codec, options)) return true;+ await registerMusicEncoder(choice.codec);+ return await canEncodeAudio(choice.codec, options);+ } catch { return false; }+ }if (!choice.nativeCodec) return true;if (typeof AudioEncoder === "undefined" || typeof AudioData === "undefined") return false;try {@@ -45,7 +71,7 @@ export interface RunMusicExportOptions {export async function runMusicExport(options: RunMusicExportOptions): Promise<Uint8Array> {const check = () => { if (options.cancelled()) throw new ExportCancelled(); };check();- if (!MUSIC_EXPORT_BITRATES.some((item) => Number(item.value) === options.settings.bitrate)) throw new Error("Choose a supported music bitrate.");+ if (musicExportUsesBitrate(options.settings.format) && !MUSIC_EXPORT_BITRATES.some((item) => Number(item.value) === options.settings.bitrate)) throw new Error("Choose a supported music bitrate.");const choice = MUSIC_EXPORT_FORMATS.find((item) => item.value === options.settings.format);if (!choice || !await musicExportSupport(choice.value, options.settings.bitrate)) throw new Error("This audio format cannot be encoded on this device. Choose another format.");options.onProgress({ phase: "preparing", framesDone: 0, frameCount: 1, detail: "Reading song…" });@@ -64,13 +90,14 @@ export async function runMusicExport(options: RunMusicExportOptions): Promise<Uicheck();}if (!await musicExportSupport(choice.value, options.settings.bitrate, decoded.numberOfChannels)) throw new Error("This audio format cannot encode the song's channels. Choose another format.");- const { Output, BufferTarget, Mp4OutputFormat, WebMOutputFormat, OggOutputFormat, WavOutputFormat, AudioSampleSource, AudioSample, Quality } = await import("mediabunny");+ const { Output, BufferTarget, Mp3OutputFormat, FlacOutputFormat, Mp4OutputFormat, WebMOutputFormat, OggOutputFormat, WavOutputFormat, AudioSampleSource, AudioSample, Quality } = await import("mediabunny");check();const format = choice.value === "m4a" ? new Mp4OutputFormat({ fastStart: "in-memory" })- : choice.value === "webm" ? new WebMOutputFormat() : choice.value === "ogg" ? new OggOutputFormat() : new WavOutputFormat();+ : choice.value === "webm" ? new WebMOutputFormat() : choice.value === "ogg" ? new OggOutputFormat()+ : choice.value === "mp3" ? new Mp3OutputFormat() : choice.value === "flac" ? new FlacOutputFormat() : new WavOutputFormat();const output = new Output({ format, target: new BufferTarget() });let packets = 0;- const source = new AudioSampleSource({ codec: choice.codec, ...(choice.nativeCodec ? { quality: new Quality({ bitrate: options.settings.bitrate }) } : {}), onEncodedPacket: () => { packets++; } });+ const source = new AudioSampleSource({ codec: choice.codec, ...(musicExportUsesBitrate(choice.value) ? { quality: new Quality({ bitrate: options.settings.bitrate }) } : {}), onEncodedPacket: () => { packets++; } });output.addAudioTrack(source, { name: options.title });output.setMetadataTags({ title: options.title });const waiting = { stage: "Music encoding", check, progress: () => packets };