Add lciense

CMakeLists.txt

@@ -18,8 +18,6 @@ if(NOT EXISTS "${GPUDIRECT_DIR}/lib/x64/dvp.lib")
 endif()
 
 set(APP_SOURCES
-	"${APP_DIR}/AudioSupport.cpp"
-	"${APP_DIR}/AudioSupport.h"
 	"${APP_DIR}/ControlServer.cpp"
 	"${APP_DIR}/ControlServer.h"
 	"${APP_DIR}/DeckLinkAPI_i.c"
@@ -149,21 +147,6 @@ endif()
 
 add_test(NAME OscServerTests COMMAND OscServerTests)
 
-add_executable(AudioSupportTests
-	"${APP_DIR}/AudioSupport.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/tests/AudioSupportTests.cpp"
-)
-
-target_include_directories(AudioSupportTests PRIVATE
-	"${APP_DIR}"
-)
-
-if(MSVC)
-	target_compile_options(AudioSupportTests PRIVATE /W3)
-endif()
-
-add_test(NAME AudioSupportTests COMMAND AudioSupportTests)
-
 add_custom_command(TARGET LoopThroughWithOpenGLCompositing POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		"${GPUDIRECT_DIR}/bin/x64/dvp.dll"

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -126,18 +126,12 @@ Current native test coverage includes:
   "outputFrameRate": "59.94",
   "autoReload": true,
   "maxTemporalHistoryFrames": 12,
-  "audioEnabled": true,
-  "audioChannelCount": 2,
-  "audioSampleRate": 48000,
-  "audioDelayMode": "matchVideoPreroll",
   "enableExternalKeying": true
 }
 ```
 
 `inputVideoFormat`/`inputFrameRate` select the DeckLink capture mode. `outputVideoFormat`/`outputFrameRate` select the playout mode. The shader stack runs at input resolution and the final rendered frame is scaled once into the configured output mode. Common examples include `720p`/`50`, `720p`/`59.94`, `1080i`/`50`, `1080i`/`59.94`, `1080p`/`25`, `1080p`/`50`, `1080p`/`59.94`, and `2160p`/`59.94`, depending on card support.
 
-`audioEnabled` enables embedded stereo 48 kHz PCM pass-through. Audio is delayed to match the scheduled video preroll and the synchronized level/spectrum data is exposed to shaders.
-
 Legacy `videoFormat` and `frameRate` keys are still accepted and apply to both input and output unless the explicit input/output keys are present.
 
 The control UI is available at:
@@ -146,6 +140,12 @@ The control UI is available at:
 http://127.0.0.1:<serverPort>
 ```
 
+## Runtime State And Presets
+
+The current layer stack is autosaved to `runtime/runtime_state.json` whenever layers, shader assignments, bypass state, ordering, or parameter values change. On startup, the host reloads that file before compiling the stack, so the last working stack should come back automatically.
+
+Manual stack presets are still available from the control UI and are saved under `runtime/stack_presets/*.json`. Presets are useful for named looks, while `runtime_state.json` is the latest working state for the local machine.
+
 ## Control API
 
 The local REST control API is documented as an OpenAPI/Swagger spec:
@@ -198,7 +198,7 @@ Runtime-generated files are intentionally ignored:
 - `runtime/shader_cache/active_shader_wrapper.slang`
 - `runtime/shader_cache/active_shader.raw.frag`
 - `runtime/shader_cache/active_shader.frag`
-- `runtime/runtime_state.json`
+- `runtime/runtime_state.json` autosaved latest stack and parameter state.
 - `runtime/stack_presets/*.json`
 
 Only `runtime/templates/` and `runtime/README.md` are tracked.

SHADER_CONTRACT.md

@@ -125,11 +125,6 @@ struct ShaderContext
     float bypass;
     int sourceHistoryLength;
     int temporalHistoryLength;
-    float2 audioRms;
-    float2 audioPeak;
-    float audioMonoRms;
-    float audioMonoPeak;
-    float4 audioBands;
 };
 ```
 
@@ -145,11 +140,6 @@ Fields:
 - `bypass`: `1.0` when the layer is bypassed, otherwise `0.0`.
 - `sourceHistoryLength`: number of usable source-history frames currently available.
 - `temporalHistoryLength`: number of usable temporal frames currently available for this layer.
-- `audioRms`: left/right RMS level for the audio block synchronized with the rendered output frame.
-- `audioPeak`: left/right peak level for the same synchronized audio block.
-- `audioMonoRms`: mono RMS level derived from left/right.
-- `audioMonoPeak`: mono peak level derived from left/right.
-- `audioBands`: four smoothed, normalized low-to-high frequency bands.
 
 ## Helper Functions
 
@@ -159,8 +149,6 @@ The wrapper provides:
 float4 sampleVideo(float2 uv);
 float4 sampleSourceHistory(int framesAgo, float2 uv);
 float4 sampleTemporalHistory(int framesAgo, float2 uv);
-float4 sampleAudioWaveform(float x);
-float4 sampleAudioSpectrum(float x);
 ```
 
 `sampleVideo` samples the live decoded source video.
@@ -169,10 +157,6 @@ float4 sampleAudioSpectrum(float x);
 
 `sampleTemporalHistory` samples previous pre-layer input frames for temporal shaders that request `preLayerInput` history. `framesAgo` is clamped into the available range. If no temporal history is available, it falls back to `sampleVideo`.
 
-`sampleAudioWaveform` samples the current synchronized audio waveform texture. `x` is normalized `0..1`; returned waveform channels are encoded from `-1..1` into `0..1`.
-
-`sampleAudioSpectrum` samples the current synchronized audio spectrum texture. Values are normalized `0..1`.
-
 Example:
 
 ```slang

apps/LoopThroughWithOpenGLCompositing/AudioSupport.cpp

@@ -1,206 +0,0 @@
-#include "AudioSupport.h"
-
-#include <algorithm>
-#include <cmath>
-#include <iterator>
-#include <limits>
-
-namespace
-{
-constexpr float kInt32ToFloat = 1.0f / 2147483648.0f;
-constexpr std::size_t kAnalysisWindowSamples = 1024;
-constexpr std::size_t kMaxBufferedAudioFrames = kAudioSampleRate * 10;
-
-float Clamp01(float value)
-{
-	return std::max(0.0f, std::min(1.0f, value));
-}
-
-float SampleToFloat(int32_t sample)
-{
-	return std::max(-1.0f, std::min(1.0f, static_cast<float>(sample) * kInt32ToFloat));
-}
-
-float GoertzelMagnitude(const std::vector<float>& samples, float frequency)
-{
-	if (samples.empty())
-		return 0.0f;
-
-	const double omega = 2.0 * 3.14159265358979323846 * static_cast<double>(frequency) / static_cast<double>(kAudioSampleRate);
-	const double coefficient = 2.0 * std::cos(omega);
-	double q0 = 0.0;
-	double q1 = 0.0;
-	double q2 = 0.0;
-
-	for (float sample : samples)
-	{
-		q0 = coefficient * q1 - q2 + static_cast<double>(sample);
-		q2 = q1;
-		q1 = q0;
-	}
-
-	const double power = q1 * q1 + q2 * q2 - coefficient * q1 * q2;
-	return static_cast<float>(std::sqrt(std::max(0.0, power)) / static_cast<double>(samples.size()));
-}
-}
-
-uint64_t AudioSampleTimeForVideoFrame(uint64_t videoFrameIndex, uint64_t frameDuration, uint64_t frameTimescale, uint64_t audioSampleRate)
-{
-	if (frameTimescale == 0)
-		return 0;
-
-	const uint64_t numerator = videoFrameIndex * frameDuration * audioSampleRate;
-	return (numerator + frameTimescale / 2) / frameTimescale;
-}
-
-unsigned AudioSamplesForVideoFrame(uint64_t videoFrameIndex, uint64_t frameDuration, uint64_t frameTimescale, uint64_t audioSampleRate)
-{
-	const uint64_t start = AudioSampleTimeForVideoFrame(videoFrameIndex, frameDuration, frameTimescale, audioSampleRate);
-	const uint64_t end = AudioSampleTimeForVideoFrame(videoFrameIndex + 1, frameDuration, frameTimescale, audioSampleRate);
-	return static_cast<unsigned>(end > start ? end - start : 0);
-}
-
-void AudioDelayBuffer::Reset(unsigned delaySampleFrames)
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-	mSamples.clear();
-	mSamples.resize(static_cast<std::size_t>(delaySampleFrames) * kAudioChannelCount, 0);
-	mUnderrunCount = 0;
-}
-
-void AudioDelayBuffer::PushInterleaved(const int32_t* samples, std::size_t sampleFrameCount)
-{
-	if (!samples || sampleFrameCount == 0)
-		return;
-
-	std::lock_guard<std::mutex> lock(mMutex);
-	const std::size_t sampleCount = sampleFrameCount * kAudioChannelCount;
-	for (std::size_t index = 0; index < sampleCount; ++index)
-		mSamples.push_back(samples[index]);
-
-	const std::size_t maxSamples = kMaxBufferedAudioFrames * kAudioChannelCount;
-	while (mSamples.size() > maxSamples)
-		mSamples.pop_front();
-}
-
-AudioFrameBlock AudioDelayBuffer::Pop(std::size_t sampleFrameCount, bool& underrun)
-{
-	AudioFrameBlock block;
-	block.interleavedSamples.resize(sampleFrameCount * kAudioChannelCount, 0);
-
-	std::lock_guard<std::mutex> lock(mMutex);
-	const std::size_t requestedSamples = sampleFrameCount * kAudioChannelCount;
-	underrun = mSamples.size() < requestedSamples;
-	if (underrun)
-		++mUnderrunCount;
-
-	const std::size_t availableSamples = std::min(requestedSamples, mSamples.size());
-	for (std::size_t index = 0; index < availableSamples; ++index)
-	{
-		block.interleavedSamples[index] = mSamples.front();
-		mSamples.pop_front();
-	}
-
-	return block;
-}
-
-unsigned AudioDelayBuffer::BufferedSampleFrames() const
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-	return static_cast<unsigned>(mSamples.size() / kAudioChannelCount);
-}
-
-uint64_t AudioDelayBuffer::UnderrunCount() const
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-	return mUnderrunCount;
-}
-
-void AudioAnalyzer::Reset()
-{
-	mMonoHistory.clear();
-	mSmoothedBands = { 0.0f, 0.0f, 0.0f, 0.0f };
-	mCurrent = AudioAnalysisSnapshot();
-}
-
-AudioAnalysisSnapshot AudioAnalyzer::Analyze(const AudioFrameBlock& block)
-{
-	AudioAnalysisSnapshot next;
-	double sumSquares[2] = { 0.0, 0.0 };
-	float peak[2] = { 0.0f, 0.0f };
-	double monoSumSquares = 0.0;
-	float monoPeak = 0.0f;
-	const std::size_t frames = block.frameCount();
-
-	for (std::size_t frame = 0; frame < frames; ++frame)
-	{
-		const float left = SampleToFloat(block.interleavedSamples[frame * 2]);
-		const float right = SampleToFloat(block.interleavedSamples[frame * 2 + 1]);
-		const float mono = (left + right) * 0.5f;
-
-		sumSquares[0] += static_cast<double>(left) * left;
-		sumSquares[1] += static_cast<double>(right) * right;
-		peak[0] = std::max(peak[0], std::abs(left));
-		peak[1] = std::max(peak[1], std::abs(right));
-		monoSumSquares += static_cast<double>(mono) * mono;
-		monoPeak = std::max(monoPeak, std::abs(mono));
-
-		mMonoHistory.push_back(mono);
-		while (mMonoHistory.size() > kAnalysisWindowSamples)
-			mMonoHistory.pop_front();
-	}
-
-	if (frames > 0)
-	{
-		next.rms[0] = static_cast<float>(std::sqrt(sumSquares[0] / static_cast<double>(frames)));
-		next.rms[1] = static_cast<float>(std::sqrt(sumSquares[1] / static_cast<double>(frames)));
-		next.peak[0] = peak[0];
-		next.peak[1] = peak[1];
-		next.monoRms = static_cast<float>(std::sqrt(monoSumSquares / static_cast<double>(frames)));
-		next.monoPeak = monoPeak;
-	}
-
-	std::vector<float> window(mMonoHistory.begin(), mMonoHistory.end());
-	const float bandFrequencies[4] = { 90.0f, 300.0f, 1200.0f, 5000.0f };
-	for (std::size_t band = 0; band < next.bands.size(); ++band)
-	{
-		const float raw = Clamp01(GoertzelMagnitude(window, bandFrequencies[band]) * 8.0f);
-		const float smoothing = raw > mSmoothedBands[band] ? 0.45f : 0.12f;
-		mSmoothedBands[band] = mSmoothedBands[band] + (raw - mSmoothedBands[band]) * smoothing;
-		next.bands[band] = Clamp01(mSmoothedBands[band]);
-	}
-
-	for (unsigned x = 0; x < kAudioTextureWidth; ++x)
-	{
-		float mono = 0.0f;
-		if (!mMonoHistory.empty())
-		{
-			const std::size_t historyIndex = static_cast<std::size_t>(
-				(static_cast<uint64_t>(x) * static_cast<uint64_t>(mMonoHistory.size())) / kAudioTextureWidth);
-			auto it = mMonoHistory.begin();
-			std::advance(it, std::min(historyIndex, mMonoHistory.size() - 1));
-			mono = *it;
-		}
-
-		const std::size_t waveformOffset = x * 4;
-		next.texture[waveformOffset + 0] = mono * 0.5f + 0.5f;
-		next.texture[waveformOffset + 1] = next.texture[waveformOffset + 0];
-		next.texture[waveformOffset + 2] = next.monoRms;
-		next.texture[waveformOffset + 3] = 1.0f;
-
-		const float bandPosition = static_cast<float>(x) / static_cast<float>(kAudioTextureWidth - 1);
-		const float scaled = bandPosition * static_cast<float>(next.bands.size() - 1);
-		const unsigned bandA = static_cast<unsigned>(std::floor(scaled));
-		const unsigned bandB = std::min<unsigned>(bandA + 1, static_cast<unsigned>(next.bands.size() - 1));
-		const float t = scaled - static_cast<float>(bandA);
-		const float spectrum = next.bands[bandA] * (1.0f - t) + next.bands[bandB] * t;
-		const std::size_t spectrumOffset = (kAudioTextureWidth + x) * 4;
-		next.texture[spectrumOffset + 0] = spectrum;
-		next.texture[spectrumOffset + 1] = next.bands[0];
-		next.texture[spectrumOffset + 2] = next.bands[1];
-		next.texture[spectrumOffset + 3] = next.bands[2];
-	}
-
-	mCurrent = next;
-	return mCurrent;
-}

apps/LoopThroughWithOpenGLCompositing/AudioSupport.h

@@ -1,71 +0,0 @@
-#pragma once
-
-#include <array>
-#include <cstdint>
-#include <deque>
-#include <mutex>
-#include <vector>
-
-constexpr unsigned kAudioSampleRate = 48000;
-constexpr unsigned kAudioChannelCount = 2;
-constexpr unsigned kAudioTextureWidth = 64;
-constexpr unsigned kAudioTextureHeight = 2;
-
-struct AudioFrameBlock
-{
-	std::vector<int32_t> interleavedSamples;
-
-	std::size_t frameCount() const
-	{
-		return interleavedSamples.size() / kAudioChannelCount;
-	}
-};
-
-struct AudioAnalysisSnapshot
-{
-	std::array<float, 2> rms = { 0.0f, 0.0f };
-	std::array<float, 2> peak = { 0.0f, 0.0f };
-	float monoRms = 0.0f;
-	float monoPeak = 0.0f;
-	std::array<float, 4> bands = { 0.0f, 0.0f, 0.0f, 0.0f };
-	std::array<float, kAudioTextureWidth * kAudioTextureHeight * 4> texture = {};
-};
-
-struct AudioStatusSnapshot
-{
-	bool enabled = false;
-	unsigned bufferedSampleFrames = 0;
-	uint64_t underrunCount = 0;
-	AudioAnalysisSnapshot analysis;
-};
-
-class AudioDelayBuffer
-{
-public:
-	void Reset(unsigned delaySampleFrames);
-	void PushInterleaved(const int32_t* samples, std::size_t sampleFrameCount);
-	AudioFrameBlock Pop(std::size_t sampleFrameCount, bool& underrun);
-	unsigned BufferedSampleFrames() const;
-	uint64_t UnderrunCount() const;
-
-private:
-	mutable std::mutex mMutex;
-	std::deque<int32_t> mSamples;
-	uint64_t mUnderrunCount = 0;
-};
-
-class AudioAnalyzer
-{
-public:
-	void Reset();
-	AudioAnalysisSnapshot Analyze(const AudioFrameBlock& block);
-	const AudioAnalysisSnapshot& Current() const { return mCurrent; }
-
-private:
-	std::deque<float> mMonoHistory;
-	std::array<float, 4> mSmoothedBands = { 0.0f, 0.0f, 0.0f, 0.0f };
-	AudioAnalysisSnapshot mCurrent;
-};
-
-uint64_t AudioSampleTimeForVideoFrame(uint64_t videoFrameIndex, uint64_t frameDuration, uint64_t frameTimescale, uint64_t audioSampleRate = kAudioSampleRate);
-unsigned AudioSamplesForVideoFrame(uint64_t videoFrameIndex, uint64_t frameDuration, uint64_t frameTimescale, uint64_t audioSampleRate = kAudioSampleRate);

apps/LoopThroughWithOpenGLCompositing/OpenGLComposite.cpp

@@ -44,7 +44,6 @@
 #include "OscServer.h"
 
 #include <algorithm>
-#include <chrono>
 #include <cstdint>
 #include <cstring>
 #include <cctype>
@@ -52,7 +51,6 @@
 #include <set>
 #include <sstream>
 #include <string>
-#include <thread>
 #include <vector>
 
 #include <initguid.h>
@@ -62,18 +60,10 @@ DEFINE_GUID(IID_PinnedMemoryAllocator,
 namespace
 {
 constexpr GLuint kDecodedVideoTextureUnit = 1;
-constexpr GLuint kAudioDataTextureUnit = 2;
-constexpr GLuint kSourceHistoryTextureUnitBase = 3;
+constexpr GLuint kSourceHistoryTextureUnitBase = 2;
 constexpr GLuint kPackedVideoTextureUnit = 2;
 constexpr GLuint kGlobalParamsBindingPoint = 0;
-constexpr unsigned kVideoPrerollFrameCount = 5;
-constexpr unsigned kAudioOutputWaterLevelSampleFrames = kAudioSampleRate / 2;
-constexpr unsigned kAudioScheduleChunkSampleFrames = kAudioSampleRate / 100;
-constexpr unsigned kDeckLinkOutputAudioChannelCount = 16;
-
-#ifndef GL_RGBA32F
-#define GL_RGBA32F 0x8814
-#endif
+constexpr unsigned kPrerollFrameCount = 8;
 const char* kVertexShaderSource =
 	"#version 430 core\n"
 	"out vec2 vTexCoord;\n"
@@ -326,10 +316,8 @@ void AppendStd140Vec4(std::vector<unsigned char>& buffer, float x, float y, floa
 OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 	hGLWnd(hWnd), hGLDC(hDC), hGLRC(hRC),
 	mCaptureDelegate(NULL), mPlayoutDelegate(NULL),
-	mDLInput(NULL), mDLOutput(NULL), mDLInputConfiguration(NULL), mDLKeyer(NULL),
+	mDLInput(NULL), mDLOutput(NULL), mDLKeyer(NULL),
 	mPlayoutAllocator(NULL),
-	mTotalPlayoutFrames(0),
-	mAudioOutputSampleTime(0),
 	mInputFrameWidth(0), mInputFrameHeight(0),
 	mOutputFrameWidth(0), mOutputFrameHeight(0),
 	mInputDisplayModeName("1080p59.94"),
@@ -345,7 +333,6 @@ OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 	mLayerTempTexture(0),
 	mFBOTexture(0),
 	mOutputTexture(0),
-	mAudioDataTexture(0),
 	mUnpinnedTextureBuffer(0),
 	mDecodeFrameBuf(0),
 	mLayerTempFrameBuf(0),
@@ -361,15 +348,6 @@ OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 	mGlobalParamsUBOSize(0),
 	mViewWidth(0),
 	mViewHeight(0),
-	mAudioEnabled(false),
-	mAudioOutputEnabled(false),
-	mAudioScheduleEnabled(false),
-	mAudioPrerollEnabled(false),
-	mAudioScheduleSilence(false),
-	mAudioScheduleTone(false),
-	mAudioPrerolling(false),
-	mAudioSchedulerRunning(false),
-	mPlayoutCallbackActive(false),
 	mTemporalHistoryNeedsReset(true)
 {
 	InitializeCriticalSection(&pMutex);
@@ -380,22 +358,11 @@ OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 
 OpenGLComposite::~OpenGLComposite()
 {
-	mAudioSchedulerRunning.store(false);
-	mAudioPacketQueued.notify_all();
-	if (mAudioSchedulerThread.joinable())
-		mAudioSchedulerThread.join();
-
 	// Cleanup for Capture
 	if (mDLInput != NULL)
 	{
 		mDLInput->SetCallback(NULL);
 
-		if (mDLInputConfiguration != NULL)
-		{
-			mDLInputConfiguration->Release();
-			mDLInputConfiguration = NULL;
-		}
-
 		mDLInput->Release();
 		mDLInput = NULL;
 	}
@@ -428,7 +395,6 @@ OpenGLComposite::~OpenGLComposite()
 		}
 
 		mDLOutput->SetScheduledFrameCompletionCallback(NULL);
-		mDLOutput->SetAudioCallback(NULL);
 
 		mDLOutput->Release();
 		mDLOutput = NULL;
@@ -470,8 +436,6 @@ OpenGLComposite::~OpenGLComposite()
 		glDeleteTextures(1, &mFBOTexture);
 	if (mOutputTexture != 0)
 		glDeleteTextures(1, &mOutputTexture);
-	if (mAudioDataTexture != 0)
-		glDeleteTextures(1, &mAudioDataTexture);
 	if (mOutputFrameBuf != 0)
 		glDeleteFramebuffers(1, &mOutputFrameBuf);
 	if (mUnpinnedTextureBuffer != 0)
@@ -654,11 +618,6 @@ bool OpenGLComposite::InitDeckLink()
 
 	if (! CheckOpenGLExtensions())
 		goto error;
-	if (mAudioOutputEnabled)
-	{
-		mFastTransferExtensionAvailable = false;
-		OutputDebugStringA("Audio output enabled; using DeckLink-owned output video frames for SDI stability.\n");
-	}
 	if (mInputFrameWidth != mOutputFrameWidth || mInputFrameHeight != mOutputFrameHeight)
 	{
 		mFastTransferExtensionAvailable = false;
@@ -709,31 +668,6 @@ bool OpenGLComposite::InitDeckLink()
 			goto error;
 	}
 
-	mAudioEnabled = mRuntimeHost ? mRuntimeHost->AudioEnabled() : true;
-	mAudioOutputEnabled = mAudioEnabled && (mRuntimeHost ? mRuntimeHost->AudioOutputEnabled() : true);
-	mAudioScheduleEnabled = mAudioOutputEnabled && (mRuntimeHost ? mRuntimeHost->AudioScheduleEnabled() : true);
-	mAudioPrerollEnabled = mAudioScheduleEnabled && (mRuntimeHost ? mRuntimeHost->AudioPrerollEnabled() : true);
-	mAudioScheduleSilence = mAudioScheduleEnabled && (mRuntimeHost ? mRuntimeHost->AudioScheduleSilence() : false);
-	mAudioScheduleTone = mAudioScheduleEnabled && (mRuntimeHost ? mRuntimeHost->AudioScheduleTone() : false);
-	if (mAudioEnabled)
-	{
-		if (mDLInput->QueryInterface(IID_IDeckLinkConfiguration, (void**)&mDLInputConfiguration) == S_OK && mDLInputConfiguration != NULL)
-		{
-			if (mDLInputConfiguration->SetInt(bmdDeckLinkConfigAudioInputConnection, bmdAudioConnectionEmbedded) != S_OK)
-				OutputDebugStringA("Could not force DeckLink audio input connection to embedded; using current device setting.\n");
-		}
-		else
-		{
-			OutputDebugStringA("Could not query DeckLink input configuration; using current audio input connection.\n");
-		}
-	}
-
-	if (mAudioEnabled && mDLInput->EnableAudioInput(bmdAudioSampleRate48kHz, bmdAudioSampleType32bitInteger, kAudioChannelCount) != S_OK)
-	{
-		OutputDebugStringA("Could not enable DeckLink audio input; continuing without audio.\n");
-		mAudioEnabled = false;
-	}
-
 	mCaptureDelegate = new CaptureDelegate(this);
 	if (mDLInput->SetCallback(mCaptureDelegate) != S_OK)
 		goto error;
@@ -747,12 +681,6 @@ bool OpenGLComposite::InitDeckLink()
 	if (mDLOutput->EnableVideoOutput(outputDisplayMode, bmdVideoOutputFlagDefault) != S_OK)
 		goto error;
 
-	if (mAudioOutputEnabled && mDLOutput->EnableAudioOutput(bmdAudioSampleRate48kHz, bmdAudioSampleType32bitInteger, kDeckLinkOutputAudioChannelCount, bmdAudioOutputStreamContinuous) != S_OK)
-	{
-		OutputDebugStringA("Could not enable DeckLink audio output; continuing without audio.\n");
-		mAudioOutputEnabled = false;
-	}
-
 	if (mDLOutput->QueryInterface(IID_IDeckLinkKeyer, (void**)&mDLKeyer) == S_OK && mDLKeyer != NULL)
 		mDeckLinkKeyerInterfaceAvailable = true;
 
@@ -803,13 +731,6 @@ bool OpenGLComposite::InitDeckLink()
 		// If you want RGB 4:4:4 format to be played out "over the wire" in SDI, turn on the "Use 4:4:4 SDI" in the control
 		// panel or turn on the bmdDeckLinkConfig444SDIVideoOutput flag using the IDeckLinkConfiguration interface.
 		IDeckLinkMutableVideoFrame* outputFrame;
-		if (mAudioOutputEnabled)
-		{
-			if (mDLOutput->CreateVideoFrame(mOutputFrameWidth, mOutputFrameHeight, outputFrameRowBytes, bmdFormat8BitBGRA, bmdFrameFlagFlipVertical, &outputFrame) != S_OK)
-				goto error;
-		}
-		else
-		{
 		IDeckLinkVideoBuffer* outputFrameBuffer = NULL;
 
 		if (mPlayoutAllocator->AllocateVideoBuffer(&outputFrameBuffer) != S_OK)
@@ -817,10 +738,6 @@ bool OpenGLComposite::InitDeckLink()
 
 		if (mDLOutput->CreateVideoFrameWithBuffer(mOutputFrameWidth, mOutputFrameHeight, outputFrameRowBytes, bmdFormat8BitBGRA, bmdFrameFlagFlipVertical, outputFrameBuffer, &outputFrame) != S_OK)
 			goto error;
-		}
-
-		if (outputFrame == NULL)
-			goto error;
 
 		mDLOutputVideoFrameQueue.push_back(outputFrame);
 	}
@@ -832,13 +749,6 @@ bool OpenGLComposite::InitDeckLink()
 	if (mDLOutput->SetScheduledFrameCompletionCallback(mPlayoutDelegate) != S_OK)
 		goto error;
 
-	if (mAudioOutputEnabled && mDLOutput->SetAudioCallback(mPlayoutDelegate) != S_OK)
-	{
-		OutputDebugStringA("Could not set DeckLink audio output callback; continuing without audio.\n");
-		mDLOutput->DisableAudioOutput();
-		mAudioOutputEnabled = false;
-	}
-
 	bSuccess = true;
 
 error:
@@ -861,11 +771,6 @@ error:
 			mDLOutput->Release();
 			mDLOutput = NULL;
 		}
-		if (mDLInputConfiguration != NULL)
-		{
-			mDLInputConfiguration->Release();
-			mDLInputConfiguration = NULL;
-		}
 	}
 
 	if (pDL != NULL)
@@ -1148,14 +1053,6 @@ bool OpenGLComposite::InitOpenGLState()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, mOutputFrameWidth, mOutputFrameHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 
-	glGenTextures(1, &mAudioDataTexture);
-	glBindTexture(GL_TEXTURE_2D, mAudioDataTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, kAudioTextureWidth, kAudioTextureHeight, 0, GL_RGBA, GL_FLOAT, mAudioAnalysis.texture.data());
-
 	glBindFramebuffer(GL_FRAMEBUFFER, mOutputFrameBuf);
 	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mOutputTexture, 0);
 	glStatus = glCheckFramebufferStatus(GL_FRAMEBUFFER);
@@ -1239,217 +1136,16 @@ void OpenGLComposite::VideoFrameArrived(IDeckLinkVideoInputFrame* inputFrame, bo
 	inputFrameBuffer->Release();
 }
 
-void OpenGLComposite::AudioPacketArrived(IDeckLinkAudioInputPacket* audioPacket)
-{
-	if (!mAudioEnabled || !audioPacket)
-		return;
-
-	void* audioBytes = nullptr;
-	if (audioPacket->GetBytes(&audioBytes) != S_OK || !audioBytes)
-		return;
-
-	const long sampleFrameCount = audioPacket->GetSampleFrameCount();
-	if (sampleFrameCount <= 0)
-		return;
-
-	TimestampedAudioPacket packet;
-	packet.block.interleavedSamples.assign(
-		static_cast<const int32_t*>(audioBytes),
-		static_cast<const int32_t*>(audioBytes) + (static_cast<std::size_t>(sampleFrameCount) * kAudioChannelCount));
-
-	if (!mAudioScheduleEnabled)
-	{
-		AudioAnalysisSnapshot audioAnalysis;
-		{
-			std::lock_guard<std::mutex> analyzerLock(mAudioAnalyzerMutex);
-			audioAnalysis = mAudioAnalyzer.Analyze(packet.block);
-		}
-		{
-			std::lock_guard<std::mutex> audioLock(mAudioStateMutex);
-			mAudioAnalysis = audioAnalysis;
-		}
-		updateAudioStatus();
-		return;
-	}
-
-	{
-		std::lock_guard<std::mutex> audioLock(mAudioStateMutex);
-		for (int32_t sample : packet.block.interleavedSamples)
-			mAudioSampleQueue.push_back(sample);
-		mQueuedAudioSampleFrames += static_cast<unsigned>(sampleFrameCount);
-	}
-	mAudioPacketQueued.notify_one();
-	ScheduleAudioToWaterLevel();
-}
-
-HRESULT OpenGLComposite::RenderAudioSamples(BOOL preroll)
-{
-	return ScheduleAudioToWaterLevel();
-}
-
-HRESULT OpenGLComposite::ScheduleAudioToWaterLevel()
-{
-	if (!mAudioScheduleEnabled || !mDLOutput)
-		return S_OK;
-
-	if (mPlayoutCallbackActive.load(std::memory_order_acquire))
-		return S_FALSE;
-
-	unsigned bufferedSampleFrames = 0;
-	if (mDLOutput->GetBufferedAudioSampleFrameCount(&bufferedSampleFrames) != S_OK)
-	{
-		OutputDebugStringA("Could not query DeckLink buffered audio sample count.\n");
-		return E_FAIL;
-	}
-
-	const unsigned audioWaterLevel = static_cast<unsigned>(AudioSampleTimeForVideoFrame(kVideoPrerollFrameCount, mFrameDuration, mFrameTimescale));
-	if (bufferedSampleFrames >= audioWaterLevel)
-		return S_OK;
-
-	TimestampedAudioPacket packet;
-	bool poppedCapturedAudio = false;
-	{
-		std::unique_lock<std::mutex> audioLock(mAudioStateMutex, std::try_to_lock);
-		if (!audioLock.owns_lock())
-			return S_FALSE;
-
-		const unsigned audioDeficitFrames = audioWaterLevel - bufferedSampleFrames;
-		const unsigned requestedFrames = audioDeficitFrames < kAudioScheduleChunkSampleFrames ? audioDeficitFrames : kAudioScheduleChunkSampleFrames;
-		if (requestedFrames == 0)
-			return S_OK;
-
-		if (mAudioScheduleTone)
-		{
-			const std::size_t requestedSamples = static_cast<std::size_t>(requestedFrames) * kAudioChannelCount;
-			packet.block.interleavedSamples.reserve(requestedSamples);
-			for (unsigned frame = 0; frame < requestedFrames; ++frame)
-			{
-				const double phase = (static_cast<double>(mAudioToneSampleIndex++) * 440.0 * 6.28318530717958647692) / static_cast<double>(kAudioSampleRate);
-				const int32_t sample = static_cast<int32_t>(std::sin(phase) * 0.125 * 2147483647.0);
-				for (unsigned channel = 0; channel < kAudioChannelCount; ++channel)
-					packet.block.interleavedSamples.push_back(sample);
-			}
-		}
-		else if (mAudioScheduleSilence)
-		{
-			packet.block.interleavedSamples.assign(static_cast<std::size_t>(requestedFrames) * kAudioChannelCount, 0);
-		}
-		else
-		{
-			const std::size_t requestedSamples = static_cast<std::size_t>(requestedFrames) * kAudioChannelCount;
-			packet.block.interleavedSamples.reserve(requestedSamples);
-			while (!mAudioSampleQueue.empty() && packet.block.interleavedSamples.size() < requestedSamples)
-			{
-				packet.block.interleavedSamples.push_back(mAudioSampleQueue.front());
-				mAudioSampleQueue.pop_front();
-			}
-			if (packet.block.interleavedSamples.size() < requestedSamples)
-			{
-				mAudioUnderrunCount++;
-				packet.block.interleavedSamples.resize(requestedSamples, 0);
-			}
-			const auto frameCount = static_cast<unsigned>(packet.block.frameCount());
-			mQueuedAudioSampleFrames = frameCount <= mQueuedAudioSampleFrames ? mQueuedAudioSampleFrames - frameCount : 0;
-			poppedCapturedAudio = true;
-		}
-	}
-
-	const unsigned sampleFrames = static_cast<unsigned>(packet.block.frameCount());
-	if (sampleFrames == 0)
-		return S_FALSE;
-
-	std::vector<int32_t> deckLinkAudioSamples(static_cast<std::size_t>(sampleFrames) * kDeckLinkOutputAudioChannelCount, 0);
-	for (unsigned frame = 0; frame < sampleFrames; ++frame)
-	{
-		const std::size_t source = static_cast<std::size_t>(frame) * kAudioChannelCount;
-		const std::size_t destination = static_cast<std::size_t>(frame) * kDeckLinkOutputAudioChannelCount;
-		deckLinkAudioSamples[destination] = packet.block.interleavedSamples[source];
-		deckLinkAudioSamples[destination + 1] = packet.block.interleavedSamples[source + 1];
-	}
-
-	if (mPlayoutCallbackActive.load(std::memory_order_acquire))
-	{
-		std::lock_guard<std::mutex> audioLock(mAudioStateMutex);
-		if (poppedCapturedAudio)
-		{
-			for (auto it = packet.block.interleavedSamples.rbegin(); it != packet.block.interleavedSamples.rend(); ++it)
-				mAudioSampleQueue.push_front(*it);
-			mQueuedAudioSampleFrames += sampleFrames;
-		}
-		return S_FALSE;
-	}
-
-	unsigned sampleFramesWritten = 0;
-	HRESULT scheduleResult = mDLOutput->ScheduleAudioSamples(
-		deckLinkAudioSamples.data(),
-		sampleFrames,
-		static_cast<BMDTimeValue>(mAudioOutputSampleTime),
-		kAudioSampleRate,
-		&sampleFramesWritten);
-
-	if (scheduleResult == S_OK)
-	{
-		if (sampleFramesWritten == 0 && sampleFrames > 0)
-			OutputDebugStringA("DeckLink accepted audio schedule call but wrote 0 sample frames.\n");
-		mAudioOutputSampleTime += sampleFramesWritten;
-
-		AudioFrameBlock analysisBlock = packet.block;
-		AudioAnalysisSnapshot audioAnalysis;
-		{
-			std::lock_guard<std::mutex> analyzerLock(mAudioAnalyzerMutex);
-			audioAnalysis = mAudioAnalyzer.Analyze(analysisBlock);
-		}
-		{
-			std::lock_guard<std::mutex> audioLock(mAudioStateMutex);
-			mAudioAnalysis = audioAnalysis;
-			packet.scheduledOutputSamples = std::move(deckLinkAudioSamples);
-			mScheduledAudioPacketRetainQueue.push_back(std::move(packet));
-			while (mScheduledAudioPacketRetainQueue.size() > 64)
-				mScheduledAudioPacketRetainQueue.pop_front();
-		}
-		updateAudioStatus();
-	}
-	else
-	{
-		OutputDebugStringA("DeckLink ScheduleAudioSamples failed while topping up audio output.\n");
-	}
-
-	return scheduleResult;
-}
-
-void OpenGLComposite::AudioSchedulingLoop()
-{
-	while (mAudioSchedulerRunning.load())
-	{
-		ScheduleAudioToWaterLevel();
-
-		std::unique_lock<std::mutex> audioLock(mAudioStateMutex);
-		mAudioPacketQueued.wait_for(audioLock, std::chrono::milliseconds(20), [this]()
-		{
-			return !mAudioSchedulerRunning.load() || !mAudioPacketQueue.empty();
-		});
-	}
-}
-
 // Render the live video texture through the runtime shader into the off-screen framebuffer.
 // Read the result back from the frame buffer and schedule it for playout.
 void OpenGLComposite::PlayoutFrameCompleted(IDeckLinkVideoFrame* completedFrame, BMDOutputFrameCompletionResult completionResult)
 {
-	mPlayoutCallbackActive.store(true, std::memory_order_release);
 	EnterCriticalSection(&pMutex);
-	auto leavePlayoutCallback = [this]()
-	{
-		mPlayoutCallbackActive.store(false, std::memory_order_release);
-		LeaveCriticalSection(&pMutex);
-	};
 
-	if (!completedFrame)
-	{
-		leavePlayoutCallback();
-		return;
-	}
-
-	IDeckLinkVideoFrame* outputVideoFrame = completedFrame;
+	// Get the first frame from the queue
+	IDeckLinkMutableVideoFrame* outputVideoFrame = mDLOutputVideoFrameQueue.front();
+	mDLOutputVideoFrameQueue.push_back(outputVideoFrame);
+	mDLOutputVideoFrameQueue.pop_front();
 
 	// make GL context current in this thread
 	wglMakeCurrent( hGLDC, hGLRC );
@@ -1482,14 +1178,14 @@ void OpenGLComposite::PlayoutFrameCompleted(IDeckLinkVideoFrame* completedFrame,
 	IDeckLinkVideoBuffer* outputVideoFrameBuffer;
 	if (outputVideoFrame->QueryInterface(IID_IDeckLinkVideoBuffer, (void**)&outputVideoFrameBuffer) != S_OK)
 	{
-		leavePlayoutCallback();
+		LeaveCriticalSection(&pMutex);
 		return;
 	}
 
 	if (outputVideoFrameBuffer->StartAccess(bmdBufferAccessWrite) != S_OK)
 	{
 		outputVideoFrameBuffer->Release();
-		leavePlayoutCallback();
+		LeaveCriticalSection(&pMutex);
 		return;
 	}
 
@@ -1530,30 +1226,15 @@ void OpenGLComposite::PlayoutFrameCompleted(IDeckLinkVideoFrame* completedFrame,
 
 	wglMakeCurrent( NULL, NULL );
 
-	leavePlayoutCallback();
+	LeaveCriticalSection(&pMutex);
 }
 
 bool OpenGLComposite::Start()
 {
 	mTotalPlayoutFrames = 0;
-	initializeAudioDelay();
-	if (mAudioPrerollEnabled)
-	{
-		mDLOutput->FlushBufferedAudioSamples();
-		if (mDLOutput->BeginAudioPreroll() != S_OK)
-		{
-			OutputDebugStringA("Could not begin DeckLink audio preroll; continuing without audio.\n");
-			mDLOutput->DisableAudioOutput();
-			mAudioOutputEnabled = false;
-		}
-		else
-		{
-			mAudioPrerolling = true;
-		}
-	}
 
 	// Preroll frames
-	for (unsigned i = 0; i < kVideoPrerollFrameCount; i++)
+	for (unsigned i = 0; i < kPrerollFrameCount; i++)
 	{
 		// Take each video frame from the front of the queue and move it to the back
 		IDeckLinkMutableVideoFrame* outputVideoFrame = mDLOutputVideoFrameQueue.front();
@@ -1584,37 +1265,8 @@ bool OpenGLComposite::Start()
 		mTotalPlayoutFrames++;
 	}
 
-	if (mDLInput->StartStreams() != S_OK)
-	{
-		return false;
-	}
-
-	if (mAudioPrerolling)
-	{
-		const unsigned audioWaterLevel = static_cast<unsigned>(AudioSampleTimeForVideoFrame(kVideoPrerollFrameCount, mFrameDuration, mFrameTimescale));
-		const auto prerollDeadline = std::chrono::steady_clock::now() + std::chrono::milliseconds(750);
-		while (mAudioScheduleEnabled && std::chrono::steady_clock::now() < prerollDeadline)
-		{
-			unsigned bufferedSampleFrames = 0;
-			if (mDLOutput->GetBufferedAudioSampleFrameCount(&bufferedSampleFrames) == S_OK && bufferedSampleFrames >= audioWaterLevel)
-				break;
-			std::this_thread::sleep_for(std::chrono::milliseconds(5));
-		}
-
-		if (mDLOutput->EndAudioPreroll() != S_OK)
-		{
-			OutputDebugStringA("Could not end DeckLink audio preroll; continuing without audio.\n");
-			mDLOutput->DisableAudioOutput();
-			mAudioOutputEnabled = false;
-			mAudioScheduleEnabled = false;
-		}
-		mAudioPrerolling = false;
-	}
-
-	if (mDLOutput->StartScheduledPlayback(0, mFrameTimescale, 1.0) != S_OK)
-	{
-		return false;
-	}
+	mDLInput->StartStreams();
+	mDLOutput->StartScheduledPlayback(0, mFrameTimescale, 1.0);
 
 	return true;
 }
@@ -1644,23 +1296,11 @@ bool OpenGLComposite::Stop()
 		}
 	}
 
-	mAudioSchedulerRunning.store(false);
-	mAudioPacketQueued.notify_all();
-	if (mAudioSchedulerThread.joinable())
-		mAudioSchedulerThread.join();
-
 	mDLInput->StopStreams();
 	mDLInput->DisableVideoInput();
-	if (mAudioEnabled)
-		mDLInput->DisableAudioInput();
 
 	mDLOutput->StopScheduledPlayback(0, NULL, 0);
-	mDLOutput->SetAudioCallback(NULL);
-	mDLOutput->SetScheduledFrameCompletionCallback(NULL);
 	mDLOutput->DisableVideoOutput();
-	mAudioPrerolling = false;
-	if (mAudioOutputEnabled)
-		mDLOutput->DisableAudioOutput();
 
 	return true;
 }
@@ -1772,9 +1412,6 @@ bool OpenGLComposite::compileSingleLayerProgram(const RuntimeRenderState& state,
 	const GLint videoInputLocation = glGetUniformLocation(newProgram.get(), "gVideoInput");
 	if (videoInputLocation >= 0)
 		glUniform1i(videoInputLocation, static_cast<GLint>(kDecodedVideoTextureUnit));
-	const GLint audioDataLocation = glGetUniformLocation(newProgram.get(), "gAudioData");
-	if (audioDataLocation >= 0)
-		glUniform1i(audioDataLocation, static_cast<GLint>(kAudioDataTextureUnit));
 	for (unsigned index = 0; index < historyCap; ++index)
 	{
 		const std::string sourceSamplerName = "gSourceHistory" + std::to_string(index);
@@ -2337,8 +1974,6 @@ void OpenGLComposite::renderShaderProgram(GLuint sourceTexture, GLuint destinati
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glActiveTexture(GL_TEXTURE0 + kDecodedVideoTextureUnit);
 	glBindTexture(GL_TEXTURE_2D, sourceTexture);
-	glActiveTexture(GL_TEXTURE0 + kAudioDataTextureUnit);
-	glBindTexture(GL_TEXTURE_2D, mAudioDataTexture);
 	bindHistorySamplers(state, sourceTexture);
 	bindLayerTextureAssets(layerProgram);
 	glBindVertexArray(mFullscreenVAO);
@@ -2361,8 +1996,6 @@ void OpenGLComposite::renderShaderProgram(GLuint sourceTexture, GLuint destinati
 		glActiveTexture(GL_TEXTURE0 + shaderTextureBase + static_cast<GLuint>(index));
 		glBindTexture(GL_TEXTURE_2D, 0);
 	}
-	glActiveTexture(GL_TEXTURE0 + kAudioDataTextureUnit);
-	glBindTexture(GL_TEXTURE_2D, 0);
 	glActiveTexture(GL_TEXTURE0 + kDecodedVideoTextureUnit);
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glActiveTexture(GL_TEXTURE0);
@@ -2434,58 +2067,6 @@ void OpenGLComposite::broadcastRuntimeState()
 		mControlServer->BroadcastState();
 }
 
-BMDTimeValue OpenGLComposite::delayedAudioStreamTime() const
-{
-	return static_cast<BMDTimeValue>(kVideoPrerollFrameCount) * mFrameDuration;
-}
-
-void OpenGLComposite::initializeAudioDelay()
-{
-	{
-		std::lock_guard<std::mutex> analyzerLock(mAudioAnalyzerMutex);
-		mAudioAnalyzer.Reset();
-	}
-	{
-		std::lock_guard<std::mutex> audioLock(mAudioStateMutex);
-		mAudioAnalysis = AudioAnalysisSnapshot();
-		mAudioPacketQueue.clear();
-		mScheduledAudioPacketRetainQueue.clear();
-		mAudioSampleQueue.clear();
-		mQueuedAudioSampleFrames = 0;
-		mAudioUnderrunCount = 0;
-		mAudioOutputSampleTime = 0;
-		mAudioToneSampleIndex = 0;
-		mHasFirstAudioPacketTime = false;
-		mFirstAudioPacketTime = 0;
-	}
-	updateAudioStatus();
-}
-
-void OpenGLComposite::updateAudioDataTexture(const AudioAnalysisSnapshot& analysis)
-{
-	if (mAudioDataTexture == 0)
-		return;
-
-	glActiveTexture(GL_TEXTURE0 + kAudioDataTextureUnit);
-	glBindTexture(GL_TEXTURE_2D, mAudioDataTexture);
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kAudioTextureWidth, kAudioTextureHeight, GL_RGBA, GL_FLOAT, analysis.texture.data());
-	glBindTexture(GL_TEXTURE_2D, 0);
-	glActiveTexture(GL_TEXTURE0);
-}
-
-void OpenGLComposite::updateAudioStatus()
-{
-	if (!mRuntimeHost)
-		return;
-
-	AudioStatusSnapshot status;
-	status.enabled = mAudioEnabled;
-	status.bufferedSampleFrames = mQueuedAudioSampleFrames;
-	status.underrunCount = mAudioUnderrunCount;
-	status.analysis = mAudioAnalysis;
-	mRuntimeHost->SetAudioStatus(status);
-}
-
 bool OpenGLComposite::updateGlobalParamsBuffer(const RuntimeRenderState& state, unsigned availableSourceHistoryLength, unsigned availableTemporalHistoryLength)
 {
 	std::vector<unsigned char> buffer;
@@ -2505,15 +2086,6 @@ bool OpenGLComposite::updateGlobalParamsBuffer(const RuntimeRenderState& state,
 		: 0u;
 	AppendStd140Int(buffer, static_cast<int>(effectiveSourceHistoryLength));
 	AppendStd140Int(buffer, static_cast<int>(effectiveTemporalHistoryLength));
-	AppendStd140Vec2(buffer, state.audioAnalysis.rms[0], state.audioAnalysis.rms[1]);
-	AppendStd140Vec2(buffer, state.audioAnalysis.peak[0], state.audioAnalysis.peak[1]);
-	AppendStd140Float(buffer, state.audioAnalysis.monoRms);
-	AppendStd140Float(buffer, state.audioAnalysis.monoPeak);
-	AppendStd140Vec4(buffer,
-		state.audioAnalysis.bands[0],
-		state.audioAnalysis.bands[1],
-		state.audioAnalysis.bands[2],
-		state.audioAnalysis.bands[3]);
 
 	for (const ShaderParameterDefinition& definition : state.parameterDefinitions)
 	{
@@ -3052,14 +2624,11 @@ ULONG	CaptureDelegate::Release()
 	return newCount;
 }
 
-HRESULT	CaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame* inputFrame, IDeckLinkAudioInputPacket* audioPacket)
+HRESULT	CaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame* inputFrame, IDeckLinkAudioInputPacket* /*audioPacket*/)
 {
-	if (audioPacket)
-		m_pOwner->AudioPacketArrived(audioPacket);
-
 	if (! inputFrame)
 	{
-		// It's possible to receive a NULL inputFrame, but a valid audioPacket.
+		// It's possible to receive a NULL inputFrame, but a valid audioPacket. Ignore audio-only frame.
 		return S_OK;
 	}
 
@@ -3085,23 +2654,6 @@ PlayoutDelegate::PlayoutDelegate(OpenGLComposite* pOwner) :
 
 HRESULT	PlayoutDelegate::QueryInterface(REFIID iid, LPVOID *ppv)
 {
-	if (ppv == nullptr)
-		return E_POINTER;
-
-	if (iid == IID_IUnknown || iid == IID_IDeckLinkVideoOutputCallback)
-	{
-		*ppv = static_cast<IDeckLinkVideoOutputCallback*>(this);
-		AddRef();
-		return S_OK;
-	}
-
-	if (iid == IID_IDeckLinkAudioOutputCallback)
-	{
-		*ppv = static_cast<IDeckLinkAudioOutputCallback*>(this);
-		AddRef();
-		return S_OK;
-	}
-
 	*ppv = NULL;
 	return E_NOINTERFACE;
 }
@@ -3143,8 +2695,3 @@ HRESULT	PlayoutDelegate::ScheduledPlaybackHasStopped ()
 {
 	return S_OK;
 }
-
-HRESULT	PlayoutDelegate::RenderAudioSamples (BOOL preroll)
-{
-	return m_pOwner->RenderAudioSamples(preroll);
-}

apps/LoopThroughWithOpenGLCompositing/OpenGLComposite.h

@@ -52,18 +52,13 @@
 #include <comutil.h>
 #include "DeckLinkAPI_h.h"
 
-#include "AudioSupport.h"
 #include "VideoFrameTransfer.h"
 #include "RuntimeHost.h"
 
 #include <atomic>
-#include <condition_variable>
-#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
-#include <mutex>
-#include <thread>
 #include <vector>
 #include <deque>
 
@@ -101,10 +96,6 @@ public:
 	void paintGL();
 
 	void VideoFrameArrived(IDeckLinkVideoInputFrame* inputFrame, bool hasNoInputSource);
-	void AudioPacketArrived(IDeckLinkAudioInputPacket* audioPacket);
-	HRESULT RenderAudioSamples(BOOL preroll);
-	HRESULT ScheduleAudioToWaterLevel();
-	void AudioSchedulingLoop();
 	void PlayoutFrameCompleted(IDeckLinkVideoFrame* completedFrame, BMDOutputFrameCompletionResult result);
 
 private:
@@ -121,14 +112,12 @@ private:
 	// DeckLink
 	IDeckLinkInput*							mDLInput;
 	IDeckLinkOutput*						mDLOutput;
-	IDeckLinkConfiguration*					mDLInputConfiguration;
 	IDeckLinkKeyer*							mDLKeyer;
 	std::deque<IDeckLinkMutableVideoFrame*>	mDLOutputVideoFrameQueue;
 	PinnedMemoryAllocator*					mPlayoutAllocator;
 	BMDTimeValue							mFrameDuration;
 	BMDTimeScale							mFrameTimescale;
 	unsigned								mTotalPlayoutFrames;
-	uint64_t								mAudioOutputSampleTime;
 	unsigned								mInputFrameWidth;
 	unsigned								mInputFrameHeight;
 	unsigned								mOutputFrameWidth;
@@ -150,7 +139,6 @@ private:
 	GLuint									mLayerTempTexture;
 	GLuint									mFBOTexture;
 	GLuint									mOutputTexture;
-	GLuint									mAudioDataTexture;
 	GLuint									mUnpinnedTextureBuffer;
 	GLuint									mDecodeFrameBuf;
 	GLuint									mLayerTempFrameBuf;
@@ -169,35 +157,6 @@ private:
 	std::unique_ptr<RuntimeHost>				mRuntimeHost;
 	std::unique_ptr<ControlServer>			mControlServer;
 	std::unique_ptr<OscServer>				mOscServer;
-	bool									mAudioEnabled;
-	bool									mAudioOutputEnabled;
-	bool									mAudioScheduleEnabled;
-	bool									mAudioPrerollEnabled;
-	bool									mAudioScheduleSilence;
-	bool									mAudioScheduleTone;
-	bool									mAudioPrerolling;
-	std::atomic<bool>						mAudioSchedulerRunning;
-	std::atomic<bool>						mPlayoutCallbackActive;
-	std::thread								mAudioSchedulerThread;
-	std::mutex								mAudioStateMutex;
-	std::mutex								mAudioAnalyzerMutex;
-	AudioAnalyzer							mAudioAnalyzer;
-	AudioAnalysisSnapshot					mAudioAnalysis;
-	struct TimestampedAudioPacket
-	{
-		AudioFrameBlock block;
-		std::vector<int32_t> scheduledOutputSamples;
-		BMDTimeValue streamTime = 0;
-	};
-	std::deque<TimestampedAudioPacket>		mAudioPacketQueue;
-	std::deque<TimestampedAudioPacket>		mScheduledAudioPacketRetainQueue;
-	std::deque<int32_t>						mAudioSampleQueue;
-	std::condition_variable					mAudioPacketQueued;
-	unsigned								mQueuedAudioSampleFrames = 0;
-	uint64_t								mAudioUnderrunCount = 0;
-	uint64_t								mAudioToneSampleIndex = 0;
-	bool									mHasFirstAudioPacketTime = false;
-	BMDTimeValue							mFirstAudioPacketTime = 0;
 
 	struct LayerProgram
 	{
@@ -250,10 +209,6 @@ private:
 	void renderEffect();
 	bool PollRuntimeChanges();
 	void broadcastRuntimeState();
-	void initializeAudioDelay();
-	BMDTimeValue delayedAudioStreamTime() const;
-	void updateAudioDataTexture(const AudioAnalysisSnapshot& analysis);
-	void updateAudioStatus();
 	bool updateGlobalParamsBuffer(const RuntimeRenderState& state, unsigned availableSourceHistoryLength, unsigned availableTemporalHistoryLength);
 	bool validateTemporalTextureUnitBudget(const std::vector<RuntimeRenderState>& layerStates, std::string& error) const;
 	bool ensureTemporalHistoryResources(const std::vector<RuntimeRenderState>& layerStates, std::string& error);
@@ -386,7 +341,7 @@ public:
 // Render Delegate Class
 ////////////////////////////////////////////
 
-class PlayoutDelegate : public IDeckLinkVideoOutputCallback, public IDeckLinkAudioOutputCallback
+class PlayoutDelegate : public IDeckLinkVideoOutputCallback
 {
 	OpenGLComposite*	m_pOwner;
 	LONG				mRefCount;
@@ -401,7 +356,6 @@ public:
 
 	virtual HRESULT	STDMETHODCALLTYPE	ScheduledFrameCompleted (IDeckLinkVideoFrame* completedFrame, BMDOutputFrameCompletionResult result);
 	virtual HRESULT	STDMETHODCALLTYPE	ScheduledPlaybackHasStopped ();
-	virtual HRESULT	STDMETHODCALLTYPE	RenderAudioSamples (BOOL preroll);
 };
 
 #endif		// __OPENGL_COMPOSITE_H__

apps/LoopThroughWithOpenGLCompositing/RuntimeHost.cpp

@@ -53,6 +53,25 @@ bool MatchesControlKey(const std::string& candidate, const std::string& key)
 	return candidate == key || SimplifyControlKey(candidate) == SimplifyControlKey(key);
 }
 
+bool TryParseLayerIdNumber(const std::string& layerId, uint64_t& number)
+{
+	const std::string prefix = "layer-";
+	if (layerId.rfind(prefix, 0) != 0 || layerId.size() == prefix.size())
+		return false;
+
+	uint64_t parsed = 0;
+	for (std::size_t index = prefix.size(); index < layerId.size(); ++index)
+	{
+		const unsigned char ch = static_cast<unsigned char>(layerId[index]);
+		if (!std::isdigit(ch))
+			return false;
+		parsed = parsed * 10 + static_cast<uint64_t>(ch - '0');
+	}
+
+	number = parsed;
+	return true;
+}
+
 std::vector<double> JsonArrayToNumbers(const JsonValue& value)
 {
 	std::vector<double> numbers;
@@ -583,6 +602,7 @@ bool RuntimeHost::Initialize(std::string& error)
 			return false;
 		if (!ScanShaderPackages(error))
 			return false;
+		NormalizePersistentLayerIdsLocked();
 
 		for (LayerPersistentState& layer : mPersistentState.layers)
 		{
@@ -1055,12 +1075,6 @@ void RuntimeHost::SetPerformanceStats(double frameBudgetMilliseconds, double ren
 		mSmoothedRenderMilliseconds = mSmoothedRenderMilliseconds * 0.9 + mRenderMilliseconds * 0.1;
 }
 
-void RuntimeHost::SetAudioStatus(const AudioStatusSnapshot& status)
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-	mAudioStatus = status;
-}
-
 void RuntimeHost::AdvanceFrame()
 {
 	std::lock_guard<std::mutex> lock(mMutex);
@@ -1127,7 +1141,6 @@ std::vector<RuntimeRenderState> RuntimeHost::GetLayerRenderStates(unsigned outpu
 		state.inputHeight = mSignalHeight;
 		state.outputWidth = outputWidth;
 		state.outputHeight = outputHeight;
-		state.audioAnalysis = mAudioStatus.analysis;
 		state.parameterDefinitions = shaderIt->second.parameters;
 		state.textureAssets = shaderIt->second.textureAssets;
 		state.isTemporal = shaderIt->second.temporal.enabled;
@@ -1189,31 +1202,6 @@ bool RuntimeHost::LoadConfig(std::string& error)
 	}
 	if (const JsonValue* enableExternalKeyingValue = configJson.find("enableExternalKeying"))
 		mConfig.enableExternalKeying = enableExternalKeyingValue->asBoolean(mConfig.enableExternalKeying);
-	if (const JsonValue* audioEnabledValue = configJson.find("audioEnabled"))
-		mConfig.audioEnabled = audioEnabledValue->asBoolean(mConfig.audioEnabled);
-	if (const JsonValue* audioOutputEnabledValue = configJson.find("audioOutputEnabled"))
-		mConfig.audioOutputEnabled = audioOutputEnabledValue->asBoolean(mConfig.audioOutputEnabled);
-	if (const JsonValue* audioScheduleEnabledValue = configJson.find("audioScheduleEnabled"))
-		mConfig.audioScheduleEnabled = audioScheduleEnabledValue->asBoolean(mConfig.audioScheduleEnabled);
-	if (const JsonValue* audioPrerollEnabledValue = configJson.find("audioPrerollEnabled"))
-		mConfig.audioPrerollEnabled = audioPrerollEnabledValue->asBoolean(mConfig.audioPrerollEnabled);
-	if (const JsonValue* audioScheduleSilenceValue = configJson.find("audioScheduleSilence"))
-		mConfig.audioScheduleSilence = audioScheduleSilenceValue->asBoolean(mConfig.audioScheduleSilence);
-	if (const JsonValue* audioScheduleToneValue = configJson.find("audioScheduleTone"))
-		mConfig.audioScheduleTone = audioScheduleToneValue->asBoolean(mConfig.audioScheduleTone);
-	if (const JsonValue* audioChannelCountValue = configJson.find("audioChannelCount"))
-		mConfig.audioChannelCount = static_cast<unsigned>(audioChannelCountValue->asNumber(static_cast<double>(mConfig.audioChannelCount)));
-	if (const JsonValue* audioSampleRateValue = configJson.find("audioSampleRate"))
-		mConfig.audioSampleRate = static_cast<unsigned>(audioSampleRateValue->asNumber(static_cast<double>(mConfig.audioSampleRate)));
-	if (const JsonValue* audioDelayModeValue = configJson.find("audioDelayMode"))
-	{
-		if (audioDelayModeValue->isString() && !audioDelayModeValue->asString().empty())
-			mConfig.audioDelayMode = audioDelayModeValue->asString();
-	}
-	if (mConfig.audioChannelCount != kAudioChannelCount)
-		mConfig.audioChannelCount = kAudioChannelCount;
-	if (mConfig.audioSampleRate != kAudioSampleRate)
-		mConfig.audioSampleRate = kAudioSampleRate;
 	if (const JsonValue* videoFormatValue = configJson.find("videoFormat"))
 	{
 		if (videoFormatValue->isString() && !videoFormatValue->asString().empty())
@@ -1501,15 +1489,31 @@ bool RuntimeHost::WriteTextFile(const std::filesystem::path& path, const std::st
 	std::error_code fsError;
 	std::filesystem::create_directories(path.parent_path(), fsError);
 
-	std::ofstream output(path, std::ios::binary);
+	const std::filesystem::path temporaryPath = path.string() + ".tmp";
+	std::ofstream output(temporaryPath, std::ios::binary | std::ios::trunc);
 	if (!output)
 	{
-		error = "Could not write file: " + path.string();
+		error = "Could not write file: " + temporaryPath.string();
 		return false;
 	}
 
 	output << contents;
-	return output.good();
+	output.close();
+	if (!output.good())
+	{
+		error = "Could not finish writing file: " + temporaryPath.string();
+		return false;
+	}
+
+	if (!MoveFileExA(temporaryPath.string().c_str(), path.string().c_str(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH))
+	{
+		const DWORD lastError = GetLastError();
+		std::filesystem::remove(temporaryPath, fsError);
+		error = "Could not replace file: " + path.string() + " (Win32 error " + std::to_string(lastError) + ")";
+		return false;
+	}
+
+	return true;
 }
 
 bool RuntimeHost::ResolvePaths(std::string& error)
@@ -1551,15 +1555,6 @@ JsonValue RuntimeHost::BuildStateValue() const
 	app.set("autoReload", JsonValue(mAutoReloadEnabled));
 	app.set("maxTemporalHistoryFrames", JsonValue(static_cast<double>(mConfig.maxTemporalHistoryFrames)));
 	app.set("enableExternalKeying", JsonValue(mConfig.enableExternalKeying));
-	app.set("audioEnabled", JsonValue(mConfig.audioEnabled));
-	app.set("audioOutputEnabled", JsonValue(mConfig.audioOutputEnabled));
-	app.set("audioScheduleEnabled", JsonValue(mConfig.audioScheduleEnabled));
-	app.set("audioPrerollEnabled", JsonValue(mConfig.audioPrerollEnabled));
-	app.set("audioScheduleSilence", JsonValue(mConfig.audioScheduleSilence));
-	app.set("audioScheduleTone", JsonValue(mConfig.audioScheduleTone));
-	app.set("audioChannelCount", JsonValue(static_cast<double>(mConfig.audioChannelCount)));
-	app.set("audioSampleRate", JsonValue(static_cast<double>(mConfig.audioSampleRate)));
-	app.set("audioDelayMode", JsonValue(mConfig.audioDelayMode));
 	app.set("inputVideoFormat", JsonValue(mConfig.inputVideoFormat));
 	app.set("inputFrameRate", JsonValue(mConfig.inputFrameRate));
 	app.set("outputVideoFormat", JsonValue(mConfig.outputVideoFormat));
@@ -1579,26 +1574,6 @@ JsonValue RuntimeHost::BuildStateValue() const
 	video.set("modeName", JsonValue(mSignalModeName));
 	root.set("video", video);
 
-	JsonValue audio = JsonValue::MakeObject();
-	audio.set("enabled", JsonValue(mAudioStatus.enabled));
-	audio.set("bufferedSampleFrames", JsonValue(static_cast<double>(mAudioStatus.bufferedSampleFrames)));
-	audio.set("underrunCount", JsonValue(static_cast<double>(mAudioStatus.underrunCount)));
-	JsonValue rms = JsonValue::MakeArray();
-	rms.pushBack(JsonValue(static_cast<double>(mAudioStatus.analysis.rms[0])));
-	rms.pushBack(JsonValue(static_cast<double>(mAudioStatus.analysis.rms[1])));
-	audio.set("rms", rms);
-	JsonValue peak = JsonValue::MakeArray();
-	peak.pushBack(JsonValue(static_cast<double>(mAudioStatus.analysis.peak[0])));
-	peak.pushBack(JsonValue(static_cast<double>(mAudioStatus.analysis.peak[1])));
-	audio.set("peak", peak);
-	audio.set("monoRms", JsonValue(static_cast<double>(mAudioStatus.analysis.monoRms)));
-	audio.set("monoPeak", JsonValue(static_cast<double>(mAudioStatus.analysis.monoPeak)));
-	JsonValue bands = JsonValue::MakeArray();
-	for (float band : mAudioStatus.analysis.bands)
-		bands.pushBack(JsonValue(static_cast<double>(band)));
-	audio.set("bands", bands);
-	root.set("audio", audio);
-
 	JsonValue deckLink = JsonValue::MakeObject();
 	deckLink.set("modelName", JsonValue(mDeckLinkOutputStatus.modelName));
 	deckLink.set("supportsInternalKeying", JsonValue(mDeckLinkOutputStatus.supportsInternalKeying));
@@ -1789,6 +1764,38 @@ bool RuntimeHost::DeserializeLayerStackLocked(const JsonValue& layersValue, std:
 	return true;
 }
 
+void RuntimeHost::NormalizePersistentLayerIdsLocked()
+{
+	std::set<std::string> usedIds;
+	uint64_t maxLayerNumber = mNextLayerId;
+
+	for (LayerPersistentState& layer : mPersistentState.layers)
+	{
+		uint64_t layerNumber = 0;
+		const bool hasReusableId = !layer.id.empty() &&
+			usedIds.find(layer.id) == usedIds.end() &&
+			TryParseLayerIdNumber(layer.id, layerNumber);
+
+		if (hasReusableId)
+		{
+			usedIds.insert(layer.id);
+			maxLayerNumber = std::max(maxLayerNumber, layerNumber);
+			continue;
+		}
+
+		do
+		{
+			++maxLayerNumber;
+			layer.id = "layer-" + std::to_string(maxLayerNumber);
+		}
+		while (usedIds.find(layer.id) != usedIds.end());
+
+		usedIds.insert(layer.id);
+	}
+
+	mNextLayerId = maxLayerNumber;
+}
+
 std::vector<std::string> RuntimeHost::GetStackPresetNamesLocked() const
 {
 	std::vector<std::string> presetNames;

apps/LoopThroughWithOpenGLCompositing/RuntimeHost.h

@@ -38,7 +38,6 @@ public:
 	void SetDeckLinkOutputStatus(const std::string& modelName, bool supportsInternalKeying, bool supportsExternalKeying,
 		bool keyerInterfaceAvailable, bool externalKeyingRequested, bool externalKeyingActive, const std::string& statusMessage);
 	void SetPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds);
-	void SetAudioStatus(const AudioStatusSnapshot& status);
 	void AdvanceFrame();
 
 	bool BuildLayerFragmentShaderSource(const std::string& layerId, std::string& fragmentShaderSource, std::string& error);
@@ -53,14 +52,6 @@ public:
 	unsigned short GetOscPort() const { return mConfig.oscPort; }
 	unsigned GetMaxTemporalHistoryFrames() const { return mConfig.maxTemporalHistoryFrames; }
 	bool ExternalKeyingEnabled() const { return mConfig.enableExternalKeying; }
-	bool AudioEnabled() const { return mConfig.audioEnabled; }
-	bool AudioOutputEnabled() const { return mConfig.audioOutputEnabled; }
-	bool AudioScheduleEnabled() const { return mConfig.audioScheduleEnabled; }
-	bool AudioPrerollEnabled() const { return mConfig.audioPrerollEnabled; }
-	bool AudioScheduleSilence() const { return mConfig.audioScheduleSilence; }
-	bool AudioScheduleTone() const { return mConfig.audioScheduleTone; }
-	unsigned AudioChannelCount() const { return mConfig.audioChannelCount; }
-	unsigned AudioSampleRate() const { return mConfig.audioSampleRate; }
 	const std::string& GetInputVideoFormat() const { return mConfig.inputVideoFormat; }
 	const std::string& GetInputFrameRate() const { return mConfig.inputFrameRate; }
 	const std::string& GetOutputVideoFormat() const { return mConfig.outputVideoFormat; }
@@ -77,15 +68,6 @@ private:
 		bool autoReload = true;
 		unsigned maxTemporalHistoryFrames = 4;
 		bool enableExternalKeying = false;
-		bool audioEnabled = true;
-		bool audioOutputEnabled = true;
-		bool audioScheduleEnabled = true;
-		bool audioPrerollEnabled = true;
-		bool audioScheduleSilence = false;
-		bool audioScheduleTone = false;
-		unsigned audioChannelCount = kAudioChannelCount;
-		unsigned audioSampleRate = kAudioSampleRate;
-		std::string audioDelayMode = "matchVideoPreroll";
 		std::string inputVideoFormat = "1080p";
 		std::string inputFrameRate = "59.94";
 		std::string outputVideoFormat = "1080p";
@@ -130,6 +112,7 @@ private:
 	JsonValue BuildStateValue() const;
 	JsonValue SerializeLayerStackLocked() const;
 	bool DeserializeLayerStackLocked(const JsonValue& layersValue, std::vector<LayerPersistentState>& layers, std::string& error);
+	void NormalizePersistentLayerIdsLocked();
 	std::vector<std::string> GetStackPresetNamesLocked() const;
 	std::string MakeSafePresetFileStem(const std::string& presetName) const;
 	JsonValue SerializeParameterValue(const ShaderParameterDefinition& definition, const ShaderParameterValue& value) const;
@@ -166,7 +149,6 @@ private:
 	double mRenderMilliseconds;
 	double mSmoothedRenderMilliseconds;
 	DeckLinkOutputStatus mDeckLinkOutputStatus;
-	AudioStatusSnapshot mAudioStatus;
 	unsigned short mServerPort;
 	bool mAutoReloadEnabled;
 	std::chrono::steady_clock::time_point mStartTime;

apps/LoopThroughWithOpenGLCompositing/ShaderTypes.h

@@ -5,8 +5,6 @@
 #include <string>
 #include <vector>
 
-#include "AudioSupport.h"
-
 enum class ShaderParameterType
 {
 	Float,
@@ -97,7 +95,6 @@ struct RuntimeRenderState
 	unsigned inputHeight = 0;
 	unsigned outputWidth = 0;
 	unsigned outputHeight = 0;
-	AudioAnalysisSnapshot audioAnalysis;
 	bool isTemporal = false;
 	TemporalHistorySource temporalHistorySource = TemporalHistorySource::None;
 	unsigned requestedTemporalHistoryLength = 0;

config/runtime-host.json

@@ -8,14 +8,5 @@
   "outputFrameRate": "59.94",
   "autoReload": true,
   "maxTemporalHistoryFrames": 12,
-  "audioEnabled": true,
-  "audioOutputEnabled": true,
-  "audioScheduleEnabled": true,
-  "audioPrerollEnabled": true,
-  "audioScheduleSilence": false,
-  "audioScheduleTone": false,
-  "audioChannelCount": 2,
-  "audioSampleRate": 48000,
-  "audioDelayMode": "matchVideoPreroll",
   "enableExternalKeying": true
 }

docs/AUDIO_TEARING_INVESTIGATION.md

@@ -1,406 +0,0 @@
-# Audio / SDI Tearing Investigation
-
-Date: 2026-05-05
-
-## Problem
-
-After adding DeckLink audio pass-through, the SDI output intermittently shows a torn/corrupted frame. The preview window does not show the artifact.
-
-Observed artifact:
-
-- Bottom portion of the SDI image can show an offset mix of current/previous frame.
-- Looks like a frame-buffer or output-transfer issue rather than shader rendering.
-- Occurs even with all shaders bypassed.
-- Main branch is known good with no tearing.
-
-Later tests also showed audio tearing/stutter when non-silent audio was scheduled.
-
-## Known Good Baseline
-
-- `main` branch has no SDI tearing.
-- Current branch with `audioEnabled: false` ran for several minutes with no visible tearing.
-
-This strongly suggests the issue is tied to DeckLink audio output/scheduling rather than the shader stack.
-
-## SDK References Checked
-
-### `InputLoopThrough`
-
-Location:
-
-`3rdParty/Blackmagic DeckLink SDK 16.0/Win/Samples/InputLoopThrough`
-
-Findings:
-
-- This is the SDK loop-through sample that keeps audio.
-- It preserves DeckLink audio packet timestamps using `GetPacketTime(..., m_frameTimescale)`.
-- It schedules audio packets with `ScheduleAudioSamples(..., packetTime, m_frameTimescale, ...)`.
-- It uses 16-channel 32-bit embedded audio by default.
-- It has separate scheduling threads for video/audio.
-- It waits for both video and audio preroll before `StartScheduledPlayback`.
-
-### `LoopThroughWithOpenGLCompositing`
-
-Location:
-
-`3rdParty/Blackmagic DeckLink SDK 16.0/Win/Samples/LoopThroughWithOpenGLCompositing`
-
-Findings:
-
-- This sample is the base for this app.
-- It ignores `IDeckLinkAudioInputPacket`.
-- It does not demonstrate audio pass-through.
-
-### `SignalGenerator`
-
-Location:
-
-`3rdParty/Blackmagic DeckLink SDK 16.0/Win/Samples/SignalGenerator`
-
-Findings:
-
-- Uses `RenderAudioSamples()` callback to top up audio when DeckLink requests samples.
-- Uses `GetBufferedAudioSampleFrameCount()` and a water level before scheduling more audio.
-
-## Tests Tried And Results
-
-### 1. Initial audio pass-through with FIFO and sample-time accumulator
-
-Implementation:
-
-- Copied incoming audio into a stereo FIFO.
-- Scheduled audio with a generated `mNextAudioSampleFrame` clock in 48 kHz timescale.
-- Matched delay to video preroll.
-
-Result:
-
-- Audio eventually worked.
-- SDI video tearing appeared.
-
-Conclusion:
-
-- Basic audio output path triggered SDI instability.
-
-### 2. Reworked audio toward SDK `InputLoopThrough` packet-timestamp model
-
-Implementation:
-
-- Preserved incoming packet time via `GetPacketTime(..., mFrameTimescale)`.
-- Queued timestamped audio packets.
-- Scheduled packets with `ScheduleAudioSamples(..., packet.streamTime, mFrameTimescale, ...)`.
-
-Result:
-
-- Tearing persisted.
-
-Conclusion:
-
-- Simply matching SDK timestamp domain did not fix the issue.
-
-### 3. Restored video callback closer to `main`
-
-Implementation:
-
-- Removed extra `glFinish()` calls.
-- Restored preview/readback ordering closer to `main`.
-- Re-enabled fast transfer path after earlier tests disabled it.
-- Removed audio texture upload from video playout callback.
-- Removed audio analysis and audio locks from video playout callback.
-- Removed DeckLink scheduling mutex around `ScheduleVideoFrame`.
-
-Result:
-
-- Tearing frequency seemed reduced at one point, but tearing persisted.
-
-Conclusion:
-
-- Extra work in the playout callback may have made timing worse, but was not the root cause.
-
-### 4. Disabled audio completely
-
-Config:
-
-```json
-"audioEnabled": false
-```
-
-Result:
-
-- Ran for several minutes with no visible tearing.
-
-Conclusion:
-
-- The tearing is tied to audio being enabled.
-
-### 5. Enabled audio input/analysis but disabled DeckLink audio output
-
-Config:
-
-```json
-"audioEnabled": true,
-"audioOutputEnabled": false
-```
-
-Result:
-
-- No tearing appeared.
-
-Conclusion:
-
-- DeckLink audio input and CPU analysis are not the trigger.
-- The problem is on the DeckLink audio output side.
-
-### 6. Enabled DeckLink audio output but disabled scheduling
-
-Config:
-
-```json
-"audioEnabled": true,
-"audioOutputEnabled": true,
-"audioScheduleEnabled": false
-```
-
-Result:
-
-- No video tearing.
-- Slight stutter appeared.
-
-Conclusion:
-
-- `EnableAudioOutput()` alone did not produce the tearing.
-- Stutter was likely from enabling an audio output stream without feeding it samples.
-
-### 7. Enabled audio scheduling but skipped audio preroll
-
-Config:
-
-```json
-"audioEnabled": true,
-"audioOutputEnabled": true,
-"audioScheduleEnabled": true,
-"audioPrerollEnabled": false
-```
-
-Result:
-
-- Video tearing returned.
-- Stutter also present.
-
-Conclusion:
-
-- `BeginAudioPreroll()` / `EndAudioPreroll()` are not required to trigger the tear.
-- `ScheduleAudioSamples()` is strongly implicated.
-
-### 8. Retained scheduled audio packet memory after `ScheduleAudioSamples`
-
-Implementation:
-
-- Kept scheduled packet buffers alive in a retain queue after scheduling.
-- Avoided passing DeckLink pointers to vectors that immediately went out of scope.
-
-Result:
-
-- Video tearing and stutter persisted.
-
-Conclusion:
-
-- Buffer lifetime after `ScheduleAudioSamples()` was not the root cause.
-
-### 9. Added audio water-level cap
-
-Implementation:
-
-- Restored SDK-style `GetBufferedAudioSampleFrameCount()` check.
-- Only scheduled more audio if DeckLink buffer was below the target water level.
-
-Result:
-
-- Stutter was reduced.
-- Video tearing persisted.
-
-Conclusion:
-
-- Overscheduling contributed to stutter/timing pressure.
-- It did not explain the tearing.
-
-### 10. Removed standalone audio scheduler thread
-
-Implementation:
-
-- Stopped starting the dedicated audio scheduler thread.
-- Audio top-up occurred from input packet arrival and `RenderAudioSamples()` callback.
-
-Result:
-
-- No meaningful change.
-
-Conclusion:
-
-- The polling thread itself was not the cause.
-
-### 11. Switched from timestamped audio output to continuous audio output
-
-Implementation:
-
-- Changed audio output to `bmdAudioOutputStreamContinuous`.
-- Scheduled audio using a monotonic 48 kHz sample clock.
-
-Result:
-
-- Video tearing and stutter persisted.
-
-Conclusion:
-
-- The issue was not specific to timestamped output mode.
-
-### 12. Rendered into the actual `completedFrame`
-
-Implementation:
-
-- Changed `PlayoutFrameCompleted()` to reuse the exact `completedFrame` passed by DeckLink rather than rotating an independent output-frame queue.
-
-Result:
-
-- No change.
-
-Conclusion:
-
-- The app was probably not overwriting a still-in-use frame from its output queue.
-
-### 13. Scheduled generated silence instead of captured audio
-
-Config:
-
-```json
-"audioScheduleSilence": true
-```
-
-Result:
-
-- Occasional stutter.
-- No video tearing.
-
-Conclusion:
-
-- Scheduling audio buffers itself can be stable if the audio data is zero.
-- Non-zero audio data appears to be important.
-
-### 14. Flattened captured audio into PCM FIFO and scheduled fixed chunks
-
-Implementation:
-
-- Captured packets were flattened into a PCM FIFO.
-- DeckLink received fixed 10 ms chunks rather than original packet boundaries.
-- Missing audio was padded with silence.
-
-Result:
-
-- Video tearing returned.
-- Audio stutter/tearing returned.
-
-Conclusion:
-
-- Packet boundaries/timestamps were not the whole cause.
-- Non-zero captured audio data still triggered instability.
-
-### 15. Scheduled generated 440 Hz tone
-
-Config:
-
-```json
-"audioScheduleTone": true
-```
-
-Result:
-
-- Video tearing occurred.
-- Tone/audio also tore.
-
-Conclusion:
-
-- The issue is not specific to captured input data.
-- Non-zero scheduled audio, even generated tone, triggers the problem.
-
-### 16. Changed DeckLink output to 16 embedded audio channels
-
-Implementation:
-
-- Enabled DeckLink audio output with 16 channels instead of 2.
-- Mapped stereo to channels 1/2.
-- Filled channels 3-16 with silence.
-
-Result:
-
-- Video tearing and audio tearing still occurred.
-
-Conclusion:
-
-- The issue is not simply caused by 2-channel embedded audio output.
-
-### 17. Used DeckLink-owned output video frames with audio enabled
-
-Implementation:
-
-- When audio output is enabled:
-  - disabled fast transfer path
-  - created output frames with `CreateVideoFrame()`
-  - avoided `CreateVideoFrameWithBuffer()` and the custom pinned playout allocator
-
-Result:
-
-- Video tearing and audio tearing still occurred.
-
-Conclusion:
-
-- The custom pinned output video buffers are likely not the root cause.
-
-## Current Strong Conclusions
-
-- Shader stack is not the cause.
-- Preview/render output is not showing the issue, so the artifact is SDI/output-side.
-- DeckLink audio input is not the cause.
-- DeckLink audio output enabled but unscheduled does not cause tearing.
-- `ScheduleAudioSamples()` with zero/silent buffers does not cause tearing.
-- `ScheduleAudioSamples()` with non-zero audio causes both video tearing and audio tearing.
-- The problem persists across:
-  - timestamped audio output
-  - continuous audio output
-  - captured audio
-  - generated tone
-  - 2-channel output
-  - 16-channel embedded output
-  - app-owned/pinned output video buffers
-  - DeckLink-owned output video frames
-
-## Current Hypothesis
-
-The issue appears to be a DeckLink output interaction where non-zero embedded audio samples disturb SDI video/audio output in this app’s scheduling model.
-
-Since silence is stable but tone is not, the next likely areas to investigate are:
-
-- Audio sample format/range/endian expectations.
-- Whether DeckLink expects 32-bit audio samples to be in a different effective range than we are providing.
-- Whether the scheduled audio buffer layout for the selected hardware/output mode differs from our assumptions.
-- Whether the selected output mode/keyer/SDI configuration has constraints when non-zero embedded audio is present.
-- Whether the SDK sample behaves correctly on the same hardware with a generated tone and same video mode.
-
-## Suggested Next Tests
-
-1. Schedule very low amplitude non-zero audio, e.g. constant `1`, then `256`, then a very quiet sine.
-2. Try 16-bit audio output instead of 32-bit if supported.
-3. Try `bmdAudioOutputStreamContinuousDontResample`.
-4. Disable external keying and test with non-zero audio.
-5. Build/run the SDK `SignalGenerator` or `InputLoopThrough` sample on the same DeckLink device, video mode, and SDI output path with non-zero embedded audio.
-6. Add instrumentation for DeckLink status/errors around scheduled video/audio completion.
-7. Confirm Desktop Video setup panel audio/SDI settings for the selected output.
-
-## Current Config At Time Of Note
-
-```json
-"audioEnabled": true,
-"audioOutputEnabled": true,
-"audioScheduleEnabled": true,
-"audioPrerollEnabled": true,
-"audioScheduleSilence": false,
-"audioScheduleTone": false
-```

runtime/README.md

@@ -17,7 +17,7 @@ Generated files:
 - `shader_cache/active_shader_wrapper.slang`: generated Slang wrapper for the active shader/layer.
 - `shader_cache/active_shader.raw.frag`: raw GLSL emitted by `slangc`.
 - `shader_cache/active_shader.frag`: patched GLSL consumed by the OpenGL path.
-- `runtime_state.json`: persisted layer stack and parameter values.
+- `runtime_state.json`: autosaved latest layer stack, layer order, bypass state, shader assignments, and parameter values. The host reloads this file on startup.
 - `stack_presets/*.json`: user-saved layer stack presets.
 
 Git policy:

runtime/templates/shader_wrapper.slang.in

@@ -16,11 +16,6 @@ struct ShaderContext
 	float bypass;
 	int sourceHistoryLength;
 	int temporalHistoryLength;
-	float2 audioRms;
-	float2 audioPeak;
-	float audioMonoRms;
-	float audioMonoPeak;
-	float4 audioBands;
 };
 
 cbuffer GlobalParams
@@ -33,31 +28,15 @@ cbuffer GlobalParams
 	float gBypass;
 	int gSourceHistoryLength;
 	int gTemporalHistoryLength;
-	float2 gAudioRms;
-	float2 gAudioPeak;
-	float gAudioMonoRms;
-	float gAudioMonoPeak;
-	float4 gAudioBands;
 {{PARAMETER_UNIFORMS}}};
 
 Sampler2D<float4> gVideoInput;
-Sampler2D<float4> gAudioData;
 {{SOURCE_HISTORY_SAMPLERS}}{{TEMPORAL_HISTORY_SAMPLERS}}{{TEXTURE_SAMPLERS}}
 float4 sampleVideo(float2 tc)
 {
 	return gVideoInput.Sample(tc);
 }
 
-float4 sampleAudioWaveform(float x)
-{
-	return gAudioData.Sample(float2(saturate(x), 0.25));
-}
-
-float4 sampleAudioSpectrum(float x)
-{
-	return gAudioData.Sample(float2(saturate(x), 0.75));
-}
-
 float4 sampleSourceHistory(int framesAgo, float2 tc)
 {
 	if (gSourceHistoryLength <= 0)
@@ -104,11 +83,6 @@ float4 fragmentMain(FragmentInput input) : SV_Target
 	context.bypass = gBypass;
 	context.sourceHistoryLength = gSourceHistoryLength;
 	context.temporalHistoryLength = gTemporalHistoryLength;
-	context.audioRms = gAudioRms;
-	context.audioPeak = gAudioPeak;
-	context.audioMonoRms = gAudioMonoRms;
-	context.audioMonoPeak = gAudioMonoPeak;
-	context.audioBands = gAudioBands;
 	float4 effectedColor = {{ENTRY_POINT_CALL}};
 	float mixValue = clamp(gBypass > 0.5 ? 0.0 : gMixAmount, 0.0, 1.0);
 	return lerp(context.sourceColor, effectedColor, mixValue);

shaders/audio-vu-meter/shader.json

@@ -1,76 +0,0 @@
-{
-  "id": "audio-vu-meter",
-  "name": "Audio VU Meter",
-  "description": "Draws stereo audio level meters from the runtime audio analysis data.",
-  "category": "Utility",
-  "entryPoint": "shadeVideo",
-  "parameters": [
-    {
-      "id": "meterPosition",
-      "label": "Position",
-      "type": "vec2",
-      "default": [0.08, 0.82],
-      "min": [0.0, 0.0],
-      "max": [1.0, 1.0],
-      "step": [0.01, 0.01]
-    },
-    {
-      "id": "meterScale",
-      "label": "Scale",
-      "type": "float",
-      "default": 0.35,
-      "min": 0.1,
-      "max": 1.0,
-      "step": 0.01
-    },
-    {
-      "id": "meterOpacity",
-      "label": "Opacity",
-      "type": "float",
-      "default": 0.9,
-      "min": 0.0,
-      "max": 1.0,
-      "step": 0.01
-    },
-    {
-      "id": "noiseGate",
-      "label": "Noise Gate",
-      "type": "float",
-      "default": 0.03,
-      "min": 0.0,
-      "max": 0.5,
-      "step": 0.01
-    },
-    {
-      "id": "meterColor",
-      "label": "Meter Color",
-      "type": "color",
-      "default": [0.2, 1.0, 0.55, 1.0]
-    },
-    {
-      "id": "peakColor",
-      "label": "Peak Color",
-      "type": "color",
-      "default": [1.0, 0.85, 0.2, 1.0]
-    },
-    {
-      "id": "backgroundOpacity",
-      "label": "Background",
-      "type": "float",
-      "default": 0.45,
-      "min": 0.0,
-      "max": 1.0,
-      "step": 0.01
-    },
-    {
-      "id": "orientation",
-      "label": "Orientation",
-      "type": "enum",
-      "default": "horizontal",
-      "options": [
-        { "value": "horizontal", "label": "Horizontal" },
-        { "value": "vertical", "label": "Vertical" }
-      ]
-    }
-  ]
-}

shaders/audio-vu-meter/shader.slang

@@ -1,59 +0,0 @@
-float rectMask(float2 uv, float2 minUv, float2 maxUv)
-{
-	float2 insideMin = step(minUv, uv);
-	float2 insideMax = step(uv, maxUv);
-	return insideMin.x * insideMin.y * insideMax.x * insideMax.y;
-}
-
-float denoiseLevel(float value)
-{
-	float gate = saturate(noiseGate);
-	float clean = saturate((value - gate) / max(1.0 - gate, 0.001));
-	return smoothstep(0.0, 1.0, clean);
-}
-
-float4 shadeVideo(ShaderContext context)
-{
-	float4 color = context.sourceColor;
-	float2 size = orientation == 0 ? float2(meterScale, meterScale * 0.18) : float2(meterScale * 0.18, meterScale);
-	float2 minUv = clamp(meterPosition, 0.0, 1.0 - size);
-	float2 local = (context.uv - minUv) / max(size, float2(0.001));
-	float inside = rectMask(local, float2(0.0), float2(1.0));
-	if (inside <= 0.0)
-		return color;
-
-	float3 bg = lerp(color.rgb, float3(0.0), saturate(backgroundOpacity));
-	float leftLevel = denoiseLevel(context.audioRms.x * 2.4);
-	float rightLevel = denoiseLevel(context.audioRms.y * 2.4);
-	float leftPeak = denoiseLevel(context.audioPeak.x);
-	float rightPeak = denoiseLevel(context.audioPeak.y);
-
-	float bar = 0.0;
-	float peak = 0.0;
-	if (orientation == 0)
-	{
-		float leftRow = rectMask(local, float2(0.04, 0.58), float2(0.96, 0.86));
-		float rightRow = rectMask(local, float2(0.04, 0.14), float2(0.96, 0.42));
-		float leftFill = rectMask(local, float2(0.04, 0.58), float2(0.04 + 0.92 * leftLevel, 0.86));
-		float rightFill = rectMask(local, float2(0.04, 0.14), float2(0.04 + 0.92 * rightLevel, 0.42));
-		float leftPeakLine = rectMask(local, float2(0.04 + 0.92 * leftPeak - 0.006, 0.55), float2(0.04 + 0.92 * leftPeak + 0.006, 0.89));
-		float rightPeakLine = rectMask(local, float2(0.04 + 0.92 * rightPeak - 0.006, 0.11), float2(0.04 + 0.92 * rightPeak + 0.006, 0.45));
-		bar = max(leftFill, rightFill);
-		peak = max(leftPeakLine * leftRow, rightPeakLine * rightRow);
-	}
-	else
-	{
-		float leftColumn = rectMask(local, float2(0.14, 0.04), float2(0.42, 0.96));
-		float rightColumn = rectMask(local, float2(0.58, 0.04), float2(0.86, 0.96));
-		float leftFill = rectMask(local, float2(0.14, 0.04), float2(0.42, 0.04 + 0.92 * leftLevel));
-		float rightFill = rectMask(local, float2(0.58, 0.04), float2(0.86, 0.04 + 0.92 * rightLevel));
-		float leftPeakLine = rectMask(local, float2(0.11, 0.04 + 0.92 * leftPeak - 0.006), float2(0.45, 0.04 + 0.92 * leftPeak + 0.006));
-		float rightPeakLine = rectMask(local, float2(0.55, 0.04 + 0.92 * rightPeak - 0.006), float2(0.89, 0.04 + 0.92 * rightPeak + 0.006));
-		bar = max(leftFill * leftColumn, rightFill * rightColumn);
-		peak = max(leftPeakLine, rightPeakLine);
-	}
-
-	float3 metered = lerp(bg, meterColor.rgb, bar * saturate(meterOpacity) * meterColor.a);
-	metered = lerp(metered, peakColor.rgb, peak * saturate(meterOpacity) * peakColor.a);
-	return float4(metered, color.a);
-}

tests/AudioSupportTests.cpp

@@ -1,115 +0,0 @@
-#include "AudioSupport.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <iostream>
-#include <vector>
-
-namespace
-{
-int gFailures = 0;
-
-void Expect(bool condition, const char* message)
-{
-	if (condition)
-		return;
-
-	std::cerr << "FAIL: " << message << "\n";
-	++gFailures;
-}
-
-int32_t ToSample(float value)
-{
-	const double clamped = std::max(-1.0, std::min(1.0, static_cast<double>(value)));
-	return static_cast<int32_t>(clamped * 2147483647.0);
-}
-
-void TestFrameSampleCounts()
-{
-	Expect(AudioSamplesForVideoFrame(0, 1, 50) == 960, "50 fps first frame has 960 audio samples");
-	Expect(AudioSamplesForVideoFrame(0, 1, 60) == 800, "60 fps first frame has 800 audio samples");
-
-	uint64_t total = 0;
-	for (uint64_t frame = 0; frame < 600; ++frame)
-		total += AudioSamplesForVideoFrame(frame, 1001, 60000);
-	Expect(total == AudioSampleTimeForVideoFrame(600, 1001, 60000), "59.94 fps sample counts do not drift");
-}
-
-void TestDelayBuffer()
-{
-	AudioDelayBuffer buffer;
-	buffer.Reset(4);
-	std::vector<int32_t> input = {
-		11, 12,
-		21, 22,
-		31, 32,
-		41, 42
-	};
-	buffer.PushInterleaved(input.data(), 4);
-
-	bool underrun = false;
-	AudioFrameBlock first = buffer.Pop(4, underrun);
-	Expect(!underrun, "delay-buffer initial silence does not underrun");
-	Expect(first.frameCount() == 4, "delay-buffer returns requested frame count");
-	Expect(first.interleavedSamples[0] == 0 && first.interleavedSamples[7] == 0, "delay-buffer emits initial silence");
-
-	AudioFrameBlock second = buffer.Pop(4, underrun);
-	Expect(!underrun, "delay-buffer emits delayed input without underrun");
-	Expect(second.interleavedSamples == input, "delay-buffer preserves delayed interleaved samples");
-
-	AudioFrameBlock third = buffer.Pop(2, underrun);
-	Expect(underrun, "delay-buffer reports underrun");
-	Expect(third.interleavedSamples[0] == 0 && third.interleavedSamples[3] == 0, "delay-buffer underrun fills silence");
-}
-
-void TestAnalyzerSilence()
-{
-	AudioAnalyzer analyzer;
-	AudioFrameBlock block;
-	block.interleavedSamples.resize(512 * kAudioChannelCount, 0);
-
-	AudioAnalysisSnapshot analysis = analyzer.Analyze(block);
-	Expect(analysis.rms[0] == 0.0f && analysis.rms[1] == 0.0f, "silence rms is zero");
-	Expect(analysis.peak[0] == 0.0f && analysis.peak[1] == 0.0f, "silence peak is zero");
-	Expect(analysis.bands[0] == 0.0f && analysis.bands[3] == 0.0f, "silence bands are zero");
-}
-
-void TestAnalyzerSineAndStereo()
-{
-	AudioAnalyzer analyzer;
-	AudioFrameBlock block;
-	block.interleavedSamples.resize(1024 * kAudioChannelCount, 0);
-
-	for (std::size_t frame = 0; frame < 1024; ++frame)
-	{
-		const float phase = static_cast<float>(frame) * 2.0f * 3.14159265f * 300.0f / static_cast<float>(kAudioSampleRate);
-		block.interleavedSamples[frame * 2] = ToSample(std::sin(phase) * 0.8f);
-		block.interleavedSamples[frame * 2 + 1] = ToSample(0.25f);
-	}
-
-	AudioAnalysisSnapshot analysis = analyzer.Analyze(block);
-	Expect(analysis.peak[0] > 0.75f && analysis.peak[0] <= 0.81f, "left sine peak is detected");
-	Expect(analysis.rms[0] > 0.45f && analysis.rms[0] < 0.65f, "left sine rms is detected");
-	Expect(analysis.peak[1] > 0.24f && analysis.peak[1] < 0.26f, "right constant peak remains independent");
-	Expect(analysis.rms[1] > 0.24f && analysis.rms[1] < 0.26f, "right constant rms remains independent");
-	Expect(analysis.bands[1] >= analysis.bands[0], "300 Hz sine activates lower-mid band");
-}
-}
-
-int main()
-{
-	TestFrameSampleCounts();
-	TestDelayBuffer();
-	TestAnalyzerSilence();
-	TestAnalyzerSineAndStereo();
-
-	if (gFailures != 0)
-	{
-		std::cerr << gFailures << " AudioSupport test failure(s).\n";
-		return 1;
-	}
-
-	std::cout << "AudioSupport tests passed.\n";
-	return 0;
-}

ui/src/App.jsx

@@ -19,7 +19,6 @@ function App() {
   const performance = appState?.performance ?? {};
   const runtime = appState?.runtime ?? {};
   const video = appState?.video ?? {};
-  const audio = appState?.audio ?? {};
   const app = appState?.app ?? {};
   const stackPresets = appState?.stackPresets ?? [];
 
@@ -48,8 +47,11 @@ function App() {
     return (
       <main className="layout">
         <section className="panel">
-          <h2>Loading</h2>
+          <h3>Loading</h3>
           <p className="muted">Waiting for control state from the native host.</p>
+          <div className="progress-track" aria-hidden="true">
+            <div className="progress-bar is-indeterminate" />
+          </div>
         </section>
       </main>
     );
@@ -59,7 +61,7 @@ function App() {
     <main className="layout">
       <header className="app-header">
         <div>
-          <h1>Video Shader Toys</h1>
+          <h2>Video Shader Toys</h2>
           <p className="muted">Live shader stack, DeckLink status, and runtime controls.</p>
         </div>
         <div className={`status-pill${runtime.compileSucceeded ? " status-pill--ready" : " status-pill--error"}`}>
@@ -67,8 +69,29 @@ function App() {
         </div>
       </header>
 
+      <section className="panel app-summary" aria-label="Runtime summary">
+        <dl className="summary-grid">
+          <div className="summary-item">
+            <dt>Shaders</dt>
+            <dd>{shaders.length}</dd>
+          </div>
+          <div className="summary-item">
+            <dt>Layers</dt>
+            <dd>{layers.length}</dd>
+          </div>
+          <div className="summary-item">
+            <dt>Signal</dt>
+            <dd>{video.hasSignal ? "Present" : "Missing"}</dd>
+          </div>
+          <div className="summary-item">
+            <dt>Render</dt>
+            <dd>{Number(performance.renderMs ?? 0).toFixed(2)} ms</dd>
+          </div>
+        </dl>
+      </section>
+
       <section className="dashboard-grid">
-        <StatusPanels app={app} audio={audio} performance={performance} runtime={runtime} video={video} />
+        <StatusPanels app={app} performance={performance} runtime={runtime} video={video} />
         <StackPresetToolbar
           presetName={presetName}
           selectedPresetName={selectedPresetName}

ui/src/components/KvList.jsx

@@ -1,18 +1,12 @@
-export function KvList({ values }) {
+export function KvList({ values, variant = "cards" }) {
   return (
-    <dl className="kv">
+    <dl className={variant === "rows" ? "kv-rows" : "definition-grid compact"}>
       {values.map(([key, value]) => (
-        <FragmentRow key={key} label={key} value={value} />
+        <div className={variant === "rows" ? "kv-row" : "definition-card"} key={key}>
+          <dt>{key}</dt>
+          <dd>{value}</dd>
+        </div>
       ))}
     </dl>
   );
 }
-
-function FragmentRow({ label, value }) {
-  return (
-    <>
-      <dt>{label}</dt>
-      <dd>{value}</dd>
-    </>
-  );
-}

ui/src/components/LayerStack.jsx

@@ -83,9 +83,11 @@ export function LayerStack({
   return (
     <section className="panel">
       <div className="panel__header">
-        <h2>Layers</h2>
+        <div>
+          <h3>Layers</h3>
           <p className="muted">Drag layers to reorder them. Each layer processes the output of the one above it.</p>
         </div>
+      </div>
 
       <div className="layer-stack">
         {layers.map((layer, index) => (

ui/src/components/StackPresetToolbar.jsx

@@ -11,17 +11,17 @@ export function StackPresetToolbar({
     <div className="panel stack-panel">
       <div className="panel__header stack-panel__header">
         <div>
-          <h2>Stack Presets</h2>
+          <h3>Stack presets</h3>
           <p className="muted">Save or recall the current layer chain.</p>
         </div>
         <button type="button" className="stack-panel__reload" onClick={() => postJson("/api/reload", {})}>
-          Reload Shader
+          Reload shader
         </button>
       </div>
 
       <div className="stack-panel__grid">
         <div className="toolbar__group">
-        <label htmlFor="preset-name">Save Stack</label>
+          <label htmlFor="preset-name">Save stack</label>
           <div className="toolbar__inline">
             <input
               id="preset-name"
@@ -50,7 +50,7 @@ export function StackPresetToolbar({
         </div>
 
         <div className="toolbar__group">
-        <label htmlFor="preset-select">Recall Stack</label>
+          <label htmlFor="preset-select">Recall stack</label>
           <div className="toolbar__inline">
             <select
               id="preset-select"

ui/src/components/StatusPanels.jsx

@@ -4,56 +4,67 @@ function formatNumber(value, digits = 3) {
   return Number(value ?? 0).toFixed(digits);
 }
 
-export function StatusPanels({ app, audio, performance, runtime, video }) {
+export function StatusPanels({ app, performance, runtime, video }) {
+  const budgetUsedPercent = Math.max(0, Math.min(100, Number(performance.budgetUsedPercent) || 0));
+
   return (
     <>
-      <div className="panel panel--runtime">
-        <h2>Runtime</h2>
-        <KvList
-          values={[
-            ["Layer Count", `${runtime.layerCount || 0}`],
-            ["Auto Reload", app.autoReload ? "On" : "Off"],
-            ["Temporal Cap", `${app.maxTemporalHistoryFrames ?? 0}`],
-            ["Control URL", `http://127.0.0.1:${app.serverPort}`],
-            ["Compile Status", runtime.compileSucceeded ? "Ready" : "Error"],
-            ["Render Time", `${formatNumber(performance.renderMs, 2)} ms`],
-            ["Smoothed Time", `${formatNumber(performance.smoothedRenderMs, 2)} ms`],
-            ["Frame Budget", `${formatNumber(performance.frameBudgetMs, 2)} ms`],
-            ["Budget Used", `${formatNumber(performance.budgetUsedPercent, 1)}%`],
-          ]}
-        />
+      <div className="panel panel--telemetry">
+        <div className="telemetry-header">
+          <h3>Status</h3>
+          <div className="status-badges" aria-label="Current status">
+            <span className={`mini-status${runtime.compileSucceeded ? " mini-status--ready" : " mini-status--error"}`}>
+              {runtime.compileSucceeded ? "Ready" : "Error"}
+            </span>
+            <span className={`mini-status${video.hasSignal ? " mini-status--ready" : " mini-status--error"}`}>
+              {video.hasSignal ? "Signal" : "No signal"}
+            </span>
+          </div>
         </div>
 
-      <div className="panel panel--video">
-        <h2>Video</h2>
+        <div className="telemetry-sections">
+          <section className="telemetry-section" aria-labelledby="runtime-status-heading">
+            <h4 id="runtime-status-heading">Runtime</h4>
             <KvList
+              variant="rows"
               values={[
-            ["Signal", video.hasSignal ? "Present" : "Missing"],
-            ["Input Mode", video.modeName || "Unknown"],
-            ["Input Resolution", `${video.width || 0} x ${video.height || 0}`],
-            ["Output Mode", `${app.outputVideoFormat || "Unknown"}${app.outputFrameRate ? ` ${app.outputFrameRate}` : ""}`],
+                ["Layers", `${runtime.layerCount || 0}`],
+                ["Auto reload", app.autoReload ? "On" : "Off"],
+                ["Temporal cap", `${app.maxTemporalHistoryFrames ?? 0}`],
+                ["Control URL", `127.0.0.1:${app.serverPort}`],
+                ["Render", `${formatNumber(performance.renderMs, 2)} ms`],
+                ["Smoothed", `${formatNumber(performance.smoothedRenderMs, 2)} ms`],
+                ["Frame budget", `${formatNumber(performance.frameBudgetMs, 2)} ms`],
               ]}
             />
+            <div className="meter-row">
+              <span>Budget used</span>
+              <div className="progress-track" aria-hidden="true">
+                <div className="progress-bar" style={{ width: `${budgetUsedPercent}%` }} />
               </div>
+              <strong>{formatNumber(performance.budgetUsedPercent, 1)}%</strong>
+            </div>
+          </section>
 
-      <div className="panel panel--audio">
-        <h2>Audio</h2>
+          <section className="telemetry-section" aria-labelledby="video-status-heading">
+            <h4 id="video-status-heading">Video</h4>
             <KvList
+              variant="rows"
               values={[
-            ["Enabled", audio.enabled ? "On" : "Off"],
-            ["Sample Rate", `${app.audioSampleRate || 0} Hz`],
-            ["Channels", `${app.audioChannelCount || 0}`],
-            ["Buffered", `${audio.bufferedSampleFrames || 0} samples`],
-            ["Underruns", `${audio.underrunCount || 0}`],
-            ["RMS L/R", `${formatNumber(audio.rms?.[0], 3)} / ${formatNumber(audio.rms?.[1], 3)}`],
-            ["Peak L/R", `${formatNumber(audio.peak?.[0], 3)} / ${formatNumber(audio.peak?.[1], 3)}`],
+                ["Input mode", video.modeName || "Unknown"],
+                ["Input size", `${video.width || 0} x ${video.height || 0}`],
+                ["Output", `${app.outputVideoFormat || "Unknown"}${app.outputFrameRate ? ` ${app.outputFrameRate}` : ""}`],
               ]}
             />
+          </section>
+        </div>
       </div>
 
       <div className="panel panel--compiler">
-        <h2>Compiler</h2>
-        <pre>{runtime.compileMessage || "No compiler output."}</pre>
+        <h3>Compiler</h3>
+        <pre className="log-panel" aria-live="polite">
+          {runtime.compileMessage || "No compiler output."}
+        </pre>
       </div>
     </>
   );