From d2699efd51cea3715544514534b4a6ed50210f41 Mon Sep 17 00:00:00 2001 From: Donut Init <64450412+donutinit@users.noreply.github.com> Date: Thu, 25 Jun 2026 19:04:23 -0600 Subject: [PATCH] refactoring shit so this shit works --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 7 +- README.md | 15 ++ audio_encoder.cpp | 454 +++++++++++++++++-------------- audio_encoder.h | 20 ++ 5 files changed, 966 insertions(+), 204 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile b/Makefile index 7e6486d..3d721aa 100755 --- a/Makefile +++ b/Makefile @@ -22,7 +22,12 @@ HEADERS = plugin.h audio_encoder.h SRCS = plugin.cpp audio_encoder.cpp wrapper/host_api.cpp OBJS = $(SRCS:%.cpp=$(OBJDIR)/%.o) -CFLAGS += -I$(BASEDIR)/wrapper -I/usr/include/c++/14 -stdlib=libstdc++ -I/usr/include/c++/x86_64-redhat-linux/14 +# FFmpeg headers live in different places per distro (e.g. /usr/include on +# Debian/Ubuntu, /usr/include/ffmpeg on Fedora). Ask pkg-config so the build +# works everywhere. +FFMPEG_CFLAGS := $(shell pkg-config --cflags libavcodec libavutil 2>/dev/null) + +CFLAGS += -I$(BASEDIR)/wrapper $(FFMPEG_CFLAGS) -I/usr/include/c++/14 -stdlib=libstdc++ -I/usr/include/c++/x86_64-redhat-linux/14 all: prereq make-subdirs $(HEADERS) $(SRCS) $(OBJS) $(TARGET) diff --git a/README.md b/README.md index 265489c..258a9eb 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,21 @@ sudo apt update sudo apt install build-essential pkg-config libavcodec-dev libavutil-dev ``` +### Install dependencies (Fedora / RHEL) +The Makefile builds with `clang++` against `libstdc++`, and pulls the FFmpeg +headers via `pkg-config` (on Fedora they live in `/usr/include/ffmpeg`). + +``` +sudo dnf install clang make pkgconf-pkg-config libstdc++-devel ffmpeg-devel +``` + +Notes: +- `ffmpeg-devel` comes from [RPM Fusion](https://rpmfusion.org/). If you don't + want RPM Fusion, Fedora's own packages `libavcodec-free-devel + libavutil-free-devel` also work (AAC-LC is included in the free build). +- On RHEL / Rocky / AlmaLinux, enable **EPEL + RPM Fusion** first, then install + the same packages. + ## Build To build the plugin and package it for DaVinci Resolve: diff --git a/audio_encoder.cpp b/audio_encoder.cpp index 3625d47..cc9bda6 100755 --- a/audio_encoder.cpp +++ b/audio_encoder.cpp @@ -150,24 +150,53 @@ AudioEncoder::~AudioEncoder() StatusCode AudioEncoder::DoInit(HostPropertyCollectionRef* p_pProps) { - uint32_t m_outputBitDepth = 0; - p_pProps->GetUINT32(pIOPropBitDepth, m_outputBitDepth); - if (m_outputBitDepth != 16 && m_outputBitDepth != 24) { - g_Log(logLevelError, "AAC Audio Plugin :: Only 16-bit or 24-bit PCM is supported, got %d", m_outputBitDepth); + // NOTE: Resolve calls DoInit() BEFORE DoOpen(). The actual FFmpeg encoder is + // created lazily in DoOpen() (see InitEncoder), because that is the first + // point where the user's codec settings (bit rate) are guaranteed available. + // Here we only cache the media format coming from the host. + uint32_t outputBitDepth = 0; + p_pProps->GetUINT32(pIOPropBitDepth, outputBitDepth); + if (outputBitDepth != 16 && outputBitDepth != 24) { + g_Log(logLevelError, "AAC Audio Plugin :: Only 16-bit or 24-bit PCM is supported, got %d", outputBitDepth); return errFail; } + m_outputBitDepth_ = outputBitDepth; + uint8_t isFloat = 0; p_pProps->GetUINT8(pIOPropIsFloat, isFloat); - uint32_t samplingRate = 0; - p_pProps->GetUINT32(pIOPropSamplingRate, samplingRate); - uint32_t numChannels = 0; - p_pProps->GetUINT32(pIOPropNumChannels, numChannels); + p_pProps->GetUINT32(pIOPropSamplingRate, m_samplingRate); + p_pProps->GetUINT32(pIOPropNumChannels, m_numChannels); uint32_t trackIdx = 0xFFFFFFFF; p_pProps->GetUINT32(pIOPropTrackIdx, trackIdx); - int bitRate = 128000; // default - if (m_pSettings) bitRate = m_pSettings->GetBitRate() * 1000; - // --- FFMpeg AAC encoder init --- + // The encoder settings may already be present in the init property bag; read + // them here as well so the chosen bit rate is honoured even if DoOpen does + // not receive them. DoOpen will refresh this from the authoritative buffer. + UIAudioSettingsController settings; + settings.Load(p_pProps); + if (settings.GetBitRate() > 0) { + m_bitRate = settings.GetBitRate() * 1000; + } + + g_Log(logLevelWarn, "AAC Audio Plugin :: Init Bit Depth: %d, isFloat: %d, Sampling Rate: %d, Num Channels: %d, Track Index: %d, Bit Rate: %d", m_outputBitDepth_, isFloat, m_samplingRate, m_numChannels, trackIdx, m_bitRate); + + return errNone; +} + +StatusCode AudioEncoder::InitEncoder() +{ + if (m_ffmpegCtx && m_ffmpegCtx->codecCtx) { + return errNone; // already initialised + } + if (m_outputBitDepth_ != 16 && m_outputBitDepth_ != 24) { + g_Log(logLevelError, "AAC Audio Plugin :: Only 16-bit or 24-bit PCM is supported, got %d", m_outputBitDepth_); + return errFail; + } + if (m_samplingRate == 0 || m_numChannels == 0) { + g_Log(logLevelError, "AAC Audio Plugin :: Invalid format (sampleRate=%u, channels=%u)", m_samplingRate, m_numChannels); + return errFail; + } + const AVCodec* codec = avcodec_find_encoder(AV_CODEC_ID_AAC); if (!codec) { g_Log(logLevelError, "AAC encoder not found"); @@ -179,31 +208,46 @@ StatusCode AudioEncoder::DoInit(HostPropertyCollectionRef* p_pProps) g_Log(logLevelError, "Could not allocate AVCodecContext"); return errFail; } - m_ffmpegCtx->codecCtx->bit_rate = bitRate; + m_ffmpegCtx->codecCtx->bit_rate = m_bitRate; m_ffmpegCtx->codecCtx->sample_fmt = AV_SAMPLE_FMT_FLTP; // AAC prefers planar float - m_ffmpegCtx->codecCtx->sample_rate = samplingRate; - av_channel_layout_default(&m_ffmpegCtx->codecCtx->ch_layout, numChannels); + m_ffmpegCtx->codecCtx->sample_rate = m_samplingRate; + av_channel_layout_default(&m_ffmpegCtx->codecCtx->ch_layout, m_numChannels); m_ffmpegCtx->codecCtx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; + // Ask the encoder to emit the AudioSpecificConfig out-of-band (extradata) + // instead of inline, which is what MP4/MOV need for the esds box. + m_ffmpegCtx->codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; if (avcodec_open2(m_ffmpegCtx->codecCtx, codec, nullptr) < 0) { g_Log(logLevelError, "Could not open AAC encoder"); return errFail; } - m_ffmpegCtx->frame = av_frame_alloc(); - m_ffmpegCtx->frame->nb_samples = m_ffmpegCtx->codecCtx->frame_size; - m_ffmpegCtx->frame->format = m_ffmpegCtx->codecCtx->sample_fmt; - av_channel_layout_copy(&m_ffmpegCtx->frame->ch_layout, &m_ffmpegCtx->codecCtx->ch_layout); - av_frame_get_buffer(m_ffmpegCtx->frame, 0); + + // Capture the AudioSpecificConfig so DoOpen can publish it as the magic + // cookie (esds). Without it the MP4 reports profile=-1 / mp4a.40.0 and + // browsers play it silently. + if (m_ffmpegCtx->codecCtx->extradata && m_ffmpegCtx->codecCtx->extradata_size > 0) { + m_magicCookie.assign(m_ffmpegCtx->codecCtx->extradata, + m_ffmpegCtx->codecCtx->extradata + m_ffmpegCtx->codecCtx->extradata_size); + } else { + g_Log(logLevelError, "AAC Audio Plugin :: Encoder produced no extradata (AudioSpecificConfig)"); + } + m_ffmpegCtx->pkt = av_packet_alloc(); + if (!m_ffmpegCtx->pkt) { + g_Log(logLevelError, "AAC Audio Plugin :: av_packet_alloc failed"); + return errFail; + } m_ffmpegCtx->frame_size = m_ffmpegCtx->codecCtx->frame_size; m_ffmpegCtx->pts = 0; - g_Log(logLevelWarn, "AAC Audio Plugin :: Init Bit Depth: %d, isFloat: %d, Sampling Rate: %d, Num Channels: %d, Track Index: %d", m_outputBitDepth, isFloat, samplingRate, numChannels, trackIdx); - // Сохраняем желаемый выходной битдпет для использования в DoProcess - m_ffmpegCtx->frame_size = m_ffmpegCtx->codecCtx->frame_size; - m_ffmpegCtx->pts = 0; - m_outputBitDepth_ = m_outputBitDepth; + + if (m_ffmpegCtx->frame_size <= 0) { + g_Log(logLevelError, "AAC Audio Plugin :: Encoder reported invalid frame_size %d", m_ffmpegCtx->frame_size); + return errFail; + } + + g_Log(logLevelWarn, "AAC Audio Plugin :: Encoder opened. Bit Rate: %d, Sampling Rate: %u, Num Channels: %u, ASC bytes: %zu", m_bitRate, m_samplingRate, m_numChannels, m_magicCookie.size()); // --- RINGBUFFER INIT --- - m_channels = numChannels; + m_channels = m_numChannels; m_frameSize = m_ffmpegCtx->frame_size; m_pcmRingBuffer.clear(); m_pcmRingBuffer.resize(m_channels); @@ -229,35 +273,51 @@ StatusCode AudioEncoder::DoOpen(HostBufferRef* p_pBuff) m_pSettings.reset(new UIAudioSettingsController()); m_pSettings->Load(p_pBuff); - // optionally fill bitrate info hint for Resolve + // The settings buffer is the authoritative source for the user-selected bit + // rate. Apply it (this is what makes the UI slider actually take effect). if (m_pSettings->GetBitRate() > 0) { - const uint64_t bitRate = static_cast(m_pSettings->GetBitRate()) * 1000; - StatusCode sts = p_pBuff->SetProperty(pIOPropBitRate, propTypeUInt32, &bitRate, 1); + m_bitRate = m_pSettings->GetBitRate() * 1000; + + // bitrate info hint for Resolve (pIOPropBitRate is uint64 bits/sec) + const uint64_t bitRate = static_cast(m_bitRate); + StatusCode sts = p_pBuff->SetProperty(pIOPropBitRate, propTypeUInt64, &bitRate, 1); if (sts != errNone) { return sts; } } - uint32_t bitDepth = 0; - p_pBuff->GetUINT32(pIOPropBitDepth, bitDepth); + // Refresh the media format from the buffer, falling back to the values + // cached in DoInit if the buffer does not carry them. + uint32_t v = 0; + if (p_pBuff->GetUINT32(pIOPropBitDepth, v) && (v == 16 || v == 24)) m_outputBitDepth_ = v; + v = 0; + if (p_pBuff->GetUINT32(pIOPropSamplingRate, v) && v != 0) m_samplingRate = v; + v = 0; + if (p_pBuff->GetUINT32(pIOPropNumChannels, v) && v != 0) m_numChannels = v; + uint8_t isFloat = 0; p_pBuff->GetUINT8(pIOPropIsFloat, isFloat); - uint32_t samplingRate = 0; - p_pBuff->GetUINT32(pIOPropSamplingRate, samplingRate); - uint32_t numChannels = 0; - p_pBuff->GetUINT32(pIOPropNumChannels, numChannels); uint32_t trackIdx = 0xFFFFFFFF; p_pBuff->GetUINT32(pIOPropTrackIdx, trackIdx); - g_Log(logLevelWarn, "AAC Audio Plugin :: DoOpen params: bitDepth=%u, isFloat=%u, samplingRate=%u, numChannels=%u, trackIdx=%u, bitrate=%d", bitDepth, isFloat, samplingRate, numChannels, trackIdx, m_pSettings->GetBitRate()); + g_Log(logLevelWarn, "AAC Audio Plugin :: DoOpen params: bitDepth=%u, isFloat=%u, samplingRate=%u, numChannels=%u, trackIdx=%u, bitrate(kbps)=%d", m_outputBitDepth_, isFloat, m_samplingRate, m_numChannels, trackIdx, m_pSettings->GetBitRate()); - // fill magic cookie here if needed - std::vector cookie; - if (!cookie.empty()) + // Now that both the media format and the user settings are known, create the + // encoder. This produces the AudioSpecificConfig we need below. + StatusCode sts = InitEncoder(); + if (sts != errNone) { - p_pBuff->SetProperty(pIOPropMagicCookie, propTypeUInt8, &cookie[0], cookie.size()); - uint32_t fourCC = 0; + return sts; + } + + // Publish the AAC AudioSpecificConfig as the container magic cookie so the + // muxer writes a proper esds box (mp4a.40.2 / AAC-LC). Without this the MP4 + // shows profile=-1 / mp4a.40.0 and browsers decode it as silence. + if (!m_magicCookie.empty()) + { + p_pBuff->SetProperty(pIOPropMagicCookie, propTypeUInt8, m_magicCookie.data(), m_magicCookie.size()); + const uint32_t fourCC = 'esds'; p_pBuff->SetProperty(pIOPropMagicCookieType, propTypeUInt32, &fourCC, 1); } @@ -266,183 +326,171 @@ StatusCode AudioEncoder::DoOpen(HostBufferRef* p_pBuff) StatusCode AudioEncoder::DoProcess(HostBufferRef* p_pBuff) { - if (!m_ffmpegCtx || !m_ffmpegCtx->codecCtx) return errFail; + if (!m_ffmpegCtx || !m_ffmpegCtx->codecCtx) { + return errFail; + } + + // p_pBuff == NULL signals end-of-stream: encode any buffered tail samples, + // then flush the encoder's internal delay. + if (p_pBuff == NULL) { + if (m_ringBufferFill > 0) { + PadAndFlushRingBuffer(); + const StatusCode sts = EncodeRingBufferFrame(); + ResetRingBuffer(); + if (sts != errNone) { + return sts; + } + } + const int ret = avcodec_send_frame(m_ffmpegCtx->codecCtx, nullptr); + if (ret < 0 && ret != AVERROR_EOF) { + g_Log(logLevelError, "AAC Audio Plugin :: flush send_frame failed (%d)", ret); + return errFail; + } + return DrainEncoder(); + } + uint32_t inputBitDepth = 0; - if (p_pBuff && !p_pBuff->GetUINT32(pIOPropBitDepth, inputBitDepth)) { + if (!p_pBuff->GetUINT32(pIOPropBitDepth, inputBitDepth) || + (inputBitDepth != 16 && inputBitDepth != 24)) { inputBitDepth = m_outputBitDepth_; } - if (inputBitDepth != 16 && inputBitDepth != 24) { - inputBitDepth = m_outputBitDepth_; + const int numChannels = static_cast(m_channels); + const int frame_size = static_cast(m_frameSize); + + char* pBuf = NULL; + size_t bufSize = 0; + if (!p_pBuff->LockBuffer(&pBuf, &bufSize) || bufSize == 0) { + return errNone; } - int numChannels = m_channels; - int frame_size = m_frameSize; - if (p_pBuff != NULL) - { - char* pBuf = NULL; - size_t bufSize = 0; - if (!p_pBuff->LockBuffer(&pBuf, &bufSize) || bufSize == 0) - { - return errNone; - } - int bytesPerSample = (inputBitDepth == 16) ? 2 : 3; - int totalSamples = bufSize / (numChannels * bytesPerSample); - std::vector> planarPCM(numChannels, std::vector(totalSamples, 0.0f)); - if (inputBitDepth == 16) { - int16_t* src = (int16_t*)pBuf; - for (int i = 0; i < totalSamples; ++i) { - for (int ch = 0; ch < numChannels; ++ch) { - planarPCM[ch][i] = src[i * numChannels + ch] / 32768.0f; - } - } - } else if (inputBitDepth == 24) { - unsigned char* src = (unsigned char*)pBuf; - for (int i = 0; i < totalSamples; ++i) { - for (int ch = 0; ch < numChannels; ++ch) { - int idx = (i * numChannels + ch) * 3; - int32_t sample = (src[idx + 2] << 24) | (src[idx + 1] << 16) | (src[idx] << 8); - sample >>= 8; - planarPCM[ch][i] = sample / 8388608.0f; - } + + const int bytesPerSample = (inputBitDepth == 16) ? 2 : 3; + const int totalSamples = static_cast(bufSize / (numChannels * bytesPerSample)); + std::vector> planarPCM(numChannels, std::vector(totalSamples, 0.0f)); + if (inputBitDepth == 16) { + const int16_t* src = reinterpret_cast(pBuf); + for (int i = 0; i < totalSamples; ++i) { + for (int ch = 0; ch < numChannels; ++ch) { + planarPCM[ch][i] = src[i * numChannels + ch] / 32768.0f; } } - int sampleIdx = 0; - while (sampleIdx < totalSamples) { - int chunk = std::min((int)(frame_size - m_ringBufferFill), totalSamples - sampleIdx); - std::vector chunkPtrs(numChannels); + } else { // 24-bit packed, little-endian signed + const unsigned char* src = reinterpret_cast(pBuf); + for (int i = 0; i < totalSamples; ++i) { for (int ch = 0; ch < numChannels; ++ch) { - chunkPtrs[ch] = &planarPCM[ch][sampleIdx]; - } - AddPCMToRingBuffer(chunkPtrs.data(), chunk); - if (IsRingBufferFull()) { - AVFrame* tempFrame = av_frame_alloc(); - tempFrame->format = m_ffmpegCtx->codecCtx->sample_fmt; - tempFrame->nb_samples = frame_size; - av_channel_layout_copy(&tempFrame->ch_layout, &m_ffmpegCtx->codecCtx->ch_layout); - av_frame_get_buffer(tempFrame, 0); - float** dst = (float**)tempFrame->extended_data; - GetFrameFromRingBuffer(dst, frame_size); - tempFrame->pts = m_ffmpegCtx->pts; - m_ffmpegCtx->pts += frame_size; - int ret = avcodec_send_frame(m_ffmpegCtx->codecCtx, tempFrame); - av_frame_free(&tempFrame); - if (ret < 0) { - return errFail; - } - do { - ret = avcodec_receive_packet(m_ffmpegCtx->codecCtx, m_ffmpegCtx->pkt); - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - break; - else if (ret < 0) { - break; - } - HostBufferRef outBuf; - outBuf.Resize(m_ffmpegCtx->pkt->size); - char* outData = nullptr; - size_t outSize = 0; - if (outBuf.LockBuffer(&outData, &outSize) && outSize >= (size_t)m_ffmpegCtx->pkt->size) { - memcpy(outData, m_ffmpegCtx->pkt->data, m_ffmpegCtx->pkt->size); - outBuf.UnlockBuffer(); - outBuf.SetProperty(pIOPropBitDepth, propTypeUInt32, &m_outputBitDepth_, 1); - outBuf.SetProperty(pIOPropSamplingRate, propTypeUInt32, &m_ffmpegCtx->codecCtx->sample_rate, 1); - uint32_t numChannels_ = m_ffmpegCtx->codecCtx->ch_layout.nb_channels; - outBuf.SetProperty(pIOPropNumChannels, propTypeUInt32, &numChannels_, 1); - uint8_t isKey = 0; - outBuf.SetProperty(pIOPropIsKeyFrame, propTypeUInt8, &isKey, 1); - int64_t pkt_pts = m_ffmpegCtx->pkt->pts; - outBuf.SetProperty(pIOPropPTS, propTypeInt64, &pkt_pts, 1); - int64_t pkt_dur = m_ffmpegCtx->pkt->duration; - outBuf.SetProperty(pIOPropDuration, propTypeInt64, &pkt_dur, 1); - IPluginCodecRef::DoProcess(&outBuf); - } - av_packet_unref(m_ffmpegCtx->pkt); - } while (ret >= 0); - ResetRingBuffer(); + const int idx = (i * numChannels + ch) * 3; + int32_t sample = (src[idx + 2] << 24) | (src[idx + 1] << 16) | (src[idx] << 8); + sample >>= 8; // sign-extend the 24-bit value + planarPCM[ch][i] = sample / 8388608.0f; } - sampleIdx += chunk; } - p_pBuff->UnlockBuffer(); - } else { - if (m_ringBufferFill > 0) { - PadAndFlushRingBuffer(); - AVFrame* tempFrame = av_frame_alloc(); - tempFrame->format = m_ffmpegCtx->codecCtx->sample_fmt; - tempFrame->nb_samples = frame_size; - av_channel_layout_copy(&tempFrame->ch_layout, &m_ffmpegCtx->codecCtx->ch_layout); - av_frame_get_buffer(tempFrame, 0); - float** dst = (float**)tempFrame->extended_data; - GetFrameFromRingBuffer(dst, frame_size); - tempFrame->pts = m_ffmpegCtx->pts; - m_ffmpegCtx->pts += frame_size; - int ret = avcodec_send_frame(m_ffmpegCtx->codecCtx, tempFrame); - av_frame_free(&tempFrame); - if (ret < 0) { - return errFail; - } - do { - ret = avcodec_receive_packet(m_ffmpegCtx->codecCtx, m_ffmpegCtx->pkt); - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - break; - else if (ret < 0) { - break; - } - HostBufferRef outBuf; - outBuf.Resize(m_ffmpegCtx->pkt->size); - char* outData = nullptr; - size_t outSize = 0; - if (outBuf.LockBuffer(&outData, &outSize) && outSize >= (size_t)m_ffmpegCtx->pkt->size) { - memcpy(outData, m_ffmpegCtx->pkt->data, m_ffmpegCtx->pkt->size); - outBuf.UnlockBuffer(); - outBuf.SetProperty(pIOPropBitDepth, propTypeUInt32, &m_outputBitDepth_, 1); - outBuf.SetProperty(pIOPropSamplingRate, propTypeUInt32, &m_ffmpegCtx->codecCtx->sample_rate, 1); - uint32_t numChannels_ = m_ffmpegCtx->codecCtx->ch_layout.nb_channels; - outBuf.SetProperty(pIOPropNumChannels, propTypeUInt32, &numChannels_, 1); - uint8_t isKey = 0; - outBuf.SetProperty(pIOPropIsKeyFrame, propTypeUInt8, &isKey, 1); - int64_t pkt_pts = m_ffmpegCtx->pkt->pts; - outBuf.SetProperty(pIOPropPTS, propTypeInt64, &pkt_pts, 1); - int64_t pkt_dur = m_ffmpegCtx->pkt->duration; - outBuf.SetProperty(pIOPropDuration, propTypeInt64, &pkt_dur, 1); - IPluginCodecRef::DoProcess(&outBuf); - } - av_packet_unref(m_ffmpegCtx->pkt); - } while (ret >= 0); + } + + StatusCode sts = errNone; + int sampleIdx = 0; + while (sampleIdx < totalSamples) { + const int chunk = std::min(static_cast(frame_size - m_ringBufferFill), totalSamples - sampleIdx); + std::vector chunkPtrs(numChannels); + for (int ch = 0; ch < numChannels; ++ch) { + chunkPtrs[ch] = &planarPCM[ch][sampleIdx]; + } + AddPCMToRingBuffer(chunkPtrs.data(), chunk); + if (IsRingBufferFull()) { + sts = EncodeRingBufferFrame(); ResetRingBuffer(); + if (sts != errNone) { + break; + } } - // --- FLUSH --- - int ret = avcodec_send_frame(m_ffmpegCtx->codecCtx, nullptr); - if (ret < 0 && ret != AVERROR_EOF) { + sampleIdx += chunk; + } + + p_pBuff->UnlockBuffer(); + return sts; +} + +// Encodes exactly one frame worth of samples currently held in the ring buffer +// and forwards the resulting packets to the host. +StatusCode AudioEncoder::EncodeRingBufferFrame() +{ + AVFrame* frame = av_frame_alloc(); + if (!frame) { + g_Log(logLevelError, "AAC Audio Plugin :: av_frame_alloc failed"); + return errFail; + } + frame->format = m_ffmpegCtx->codecCtx->sample_fmt; + frame->nb_samples = static_cast(m_frameSize); + av_channel_layout_copy(&frame->ch_layout, &m_ffmpegCtx->codecCtx->ch_layout); + if (av_frame_get_buffer(frame, 0) < 0) { + g_Log(logLevelError, "AAC Audio Plugin :: av_frame_get_buffer failed"); + av_frame_free(&frame); + return errFail; + } + + GetFrameFromRingBuffer(reinterpret_cast(frame->extended_data), m_frameSize); + frame->pts = m_ffmpegCtx->pts; + m_ffmpegCtx->pts += m_frameSize; + + const int ret = avcodec_send_frame(m_ffmpegCtx->codecCtx, frame); + av_frame_free(&frame); + if (ret < 0) { + g_Log(logLevelError, "AAC Audio Plugin :: avcodec_send_frame failed (%d)", ret); + return errFail; + } + + return DrainEncoder(); +} + +// Pulls every packet currently available from the encoder and forwards each to +// the host. +StatusCode AudioEncoder::DrainEncoder() +{ + for (;;) { + const int ret = avcodec_receive_packet(m_ffmpegCtx->codecCtx, m_ffmpegCtx->pkt); + if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { + return errNone; + } + if (ret < 0) { + g_Log(logLevelError, "AAC Audio Plugin :: avcodec_receive_packet failed (%d)", ret); return errFail; } - do { - ret = avcodec_receive_packet(m_ffmpegCtx->codecCtx, m_ffmpegCtx->pkt); - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - break; - else if (ret < 0) { - break; - } - HostBufferRef outBuf; - outBuf.Resize(m_ffmpegCtx->pkt->size); - char* outData = nullptr; - size_t outSize = 0; - if (outBuf.LockBuffer(&outData, &outSize) && outSize >= (size_t)m_ffmpegCtx->pkt->size) { - memcpy(outData, m_ffmpegCtx->pkt->data, m_ffmpegCtx->pkt->size); - outBuf.UnlockBuffer(); - outBuf.SetProperty(pIOPropBitDepth, propTypeUInt32, &m_outputBitDepth_, 1); - outBuf.SetProperty(pIOPropSamplingRate, propTypeUInt32, &m_ffmpegCtx->codecCtx->sample_rate, 1); - uint32_t numChannels_ = m_ffmpegCtx->codecCtx->ch_layout.nb_channels; - outBuf.SetProperty(pIOPropNumChannels, propTypeUInt32, &numChannels_, 1); - uint8_t isKey = 0; - outBuf.SetProperty(pIOPropIsKeyFrame, propTypeUInt8, &isKey, 1); - int64_t pkt_pts = m_ffmpegCtx->pkt->pts; - outBuf.SetProperty(pIOPropPTS, propTypeInt64, &pkt_pts, 1); - int64_t pkt_dur = m_ffmpegCtx->pkt->duration; - outBuf.SetProperty(pIOPropDuration, propTypeInt64, &pkt_dur, 1); - IPluginCodecRef::DoProcess(&outBuf); - } - av_packet_unref(m_ffmpegCtx->pkt); - } while (ret >= 0); + EmitPacket(); + av_packet_unref(m_ffmpegCtx->pkt); } - return errNone; +} + +// Copies the current encoder packet into a host buffer and hands it to the +// container, tagging it with the metadata the muxer needs. +void AudioEncoder::EmitPacket() +{ + const AVPacket* pkt = m_ffmpegCtx->pkt; + HostBufferRef outBuf; + if (!outBuf.Resize(pkt->size)) { + g_Log(logLevelError, "AAC Audio Plugin :: failed to allocate output buffer (%d bytes)", pkt->size); + return; + } + char* outData = nullptr; + size_t outSize = 0; + if (!outBuf.LockBuffer(&outData, &outSize) || outSize < static_cast(pkt->size)) { + return; + } + memcpy(outData, pkt->data, pkt->size); + outBuf.UnlockBuffer(); + + outBuf.SetProperty(pIOPropBitDepth, propTypeUInt32, &m_outputBitDepth_, 1); + const uint32_t sampleRate = m_ffmpegCtx->codecCtx->sample_rate; + outBuf.SetProperty(pIOPropSamplingRate, propTypeUInt32, &sampleRate, 1); + const uint32_t numChannels = m_ffmpegCtx->codecCtx->ch_layout.nb_channels; + outBuf.SetProperty(pIOPropNumChannels, propTypeUInt32, &numChannels, 1); + // Every AAC frame is independently decodable, so it is a sync sample. The + // native encoder sets AV_PKT_FLAG_KEY on every packet; mirror that so the + // muxer marks audio sync samples correctly (matters for seeking). + const uint8_t isKey = (pkt->flags & AV_PKT_FLAG_KEY) ? 1 : 0; + outBuf.SetProperty(pIOPropIsKeyFrame, propTypeUInt8, &isKey, 1); + const int64_t pkt_pts = pkt->pts; + outBuf.SetProperty(pIOPropPTS, propTypeInt64, &pkt_pts, 1); + const int64_t pkt_dur = pkt->duration; + outBuf.SetProperty(pIOPropDuration, propTypeInt64, &pkt_dur, 1); + IPluginCodecRef::DoProcess(&outBuf); } // --- RINGBUFFER HELPERS --- diff --git a/audio_encoder.h b/audio_encoder.h index fda9202..5340638 100755 --- a/audio_encoder.h +++ b/audio_encoder.h @@ -32,6 +32,26 @@ class AudioEncoder : public IPluginCodecRef std::unique_ptr m_ffmpegCtx; uint32_t m_outputBitDepth_ = 16; // Желаемый bitDepth (выбранный пользователем) + // Encoder parameters cached from DoInit/DoOpen. The encoder is created lazily + // in DoOpen() once both the media format (DoInit) and the user settings + // (DoOpen) are known, so the chosen bit rate is actually applied. + uint32_t m_samplingRate = 0; + uint32_t m_numChannels = 0; + int m_bitRate = 128000; + + // AAC AudioSpecificConfig (codec extradata), handed to the container as the + // magic cookie so the MP4/MOV gets a proper esds box (mp4a.40.2 / AAC-LC). + std::vector m_magicCookie; + + StatusCode InitEncoder(); + + // Encode helpers. EncodeRingBufferFrame() pushes one full frame from the + // ring buffer into the encoder; DrainEncoder() forwards every packet the + // encoder produces to the host; EmitPacket() forwards the current packet. + StatusCode EncodeRingBufferFrame(); + StatusCode DrainEncoder(); + void EmitPacket(); + // Ringbuffer для PCM (float planar) std::vector> m_pcmRingBuffer; // [channel][sample] size_t m_ringBufferFill = 0;