Bump version to 0.6.1

That's old news ;)

.github/workflows/build.yml

@@ -48,5 +48,40 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: compiled-binaries
-          path: |
-            libv4a_re_*.so
+          path: libv4a_re_*.so
+
+  package:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Download the compiled binaries from the 'build' workflow
+      - name: Download compiled libraries
+        uses: actions/download-artifact@v3
+        with:
+          name: compiled-binaries
+          path: compiled/
+
+      # Prepare Magisk module directory by copying the necessary ABI files
+      - name: Prepare Magisk Module
+        run: |
+          for abi in armeabi-v7a arm64-v8a x86 x86_64; do
+            mkdir -p module/common/files
+            cp compiled/libv4a_re_$abi.so module/common/files/
+          done
+
+      # Zip the Magisk module
+      - name: Zip Magisk Module
+        run: |
+          cd module
+          zip -r ../magisk_module.zip ./
+
+      # Upload the zipped Magisk module as an artifact
+      - name: Upload Magisk Module
+        uses: actions/upload-artifact@v3
+        with:
+          name: V4A_Magisk_Module
+          path: module

CMakeLists.txt

@@ -8,8 +8,8 @@ set(CMAKE_CXX_COMPILER_VERSION 20)
 #add_compile_definitions(ANDROID_PLATFORM=android-24)
 
 project("ViPER4Android")
-add_compile_definitions(VERSION_CODE=20230515)
-add_compile_definitions(VERSION_NAME="0.4.0")
+add_compile_definitions(VERSION_CODE=20231210)
+add_compile_definitions(VERSION_NAME="0.6.1")
 
 # FFTS
 #add_subdirectory(src/viper/ffts)
@@ -82,4 +82,5 @@ add_library(
         ${FILES})
 
 target_link_libraries(v4a_re log) # kissfft)
+target_compile_options(v4a_re PRIVATE -flto -O3 -DNDEBUG)
 #target_compile_options(v4afx_r PRIVATE -O2 -DNDEBUG -Wall -Wsign-conversion -Wno-unused-result -Wno-unneeded-internal-declaration -fstrict-aliasing -fvisibility=hidden -Wextra -Wno-unused-parameter)

module/LICENSE

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  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
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  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.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE 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.
+
+                     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
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the 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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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.

module/META-INF/com/google/android/update-binary

@@ -0,0 +1,33 @@
+#!/sbin/sh
+
+#################
+# Initialization
+#################
+
+umask 022
+
+# echo before loading util_functions
+ui_print() { echo "$1"; }
+
+require_new_magisk() {
+  ui_print "*******************************"
+  ui_print " Please install Magisk v20.4+! "
+  ui_print "*******************************"
+  exit 1
+}
+
+#########################
+# Load util_functions.sh
+#########################
+
+OUTFD=$2
+ZIPFILE=$3
+
+mount /data 2>/dev/null
+
+[ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk
+. /data/adb/magisk/util_functions.sh
+[ $MAGISK_VER_CODE -lt 20400 ] && require_new_magisk
+
+install_module
+exit 0

module/META-INF/com/google/android/updater-script

@@ -0,0 +1 @@
+#MAGISK

module/README.md

@@ -0,0 +1,37 @@
+<h1 align="center">Magisk Module Template Extended (MMT-Ex)</h1>
+
+<div align="center">
+  <!-- Version -->
+    <img src="https://img.shields.io/badge/Version-v2.0-blue.svg?longCache=true&style=popout-square"
+      alt="Version" />
+  <!-- Last Updated -->
+    <img src="https://img.shields.io/badge/Updated-January 21, 2022-green.svg?longCache=true&style=flat-square"
+      alt="_time_stamp_" />
+  <!-- Min Magisk -->
+    <img src="https://img.shields.io/badge/MinMagisk-20.4-red.svg?longCache=true&style=flat-square"
+      alt="_time_stamp_" /></div>
+
+<div align="center">
+  <strong>MMT Extended is the spiritual successor of Unity and makes magisk module creation easy. Instructions in the 
+    <h3><a href="https://github.com/Zackptg5/MMT-Extended/wiki">Wiki</a></h3>
+</div>
+
+<div align="center">
+  <h3>
+    <a href="https://github.com/Zackptg5/MMT-Extended">
+      Source Code
+    </a>
+    <span> | </span>
+    <a href="https://github.com/Zackptg5/MMT-Extended-Addons">
+      Addons Repository
+    </a>
+    <span> | </span>
+    <a href="https://forum.xda-developers.com/apps/magisk/magisk-module-template-extended-mmt-ex-t4029819">
+      XDA
+    </a>
+  </h3>
+</div>
+
+### Usage
+- [Follow the directions here (DO NOT FORK)](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-from-a-template)
+- Then follow instructions in [Wiki](https://github.com/Zackptg5/MMT-Extended/wiki)

module/changelog.md

@@ -0,0 +1,51 @@
+### v2.0 - 1.29.2022
+* Update for magisk 24
+  * Added zygisk module support
+* Misc fixes
+
+### v1.8 - 11.21.2021
+* Fix for magisk canary
+* Minimum magisk version now 20.4
+
+### v1.7 - 9.9.2021
+* Small fix for magisk canary
+
+### v1.6 - 9.12.2020
+* Updates for latest magisk - minmagisk is 20 now
+* Added back ro.build.product to device_check for older roms
+* Moved credits so it'll work with latest magisk mod template
+
+### v1.5 - 3.27.2020
+* Have debug log be part of regular log, remove superfluous stuff, module dev can just add what they want
+* Removed addon runtime confusion - all scripts are install.sh now
+* Added manufacturer option to device_check
+* Fixes for Magisk 20.4
+
+### v1.4 - 2.20.2020
+* Add more vendor perms
+* Fixed uninstall.sh script install behavior - it'll install if there's files outside of modpath or if there's custom logic at the top of it
+* Misc bug fixes
+
+### v1.3 - 1.22.2020
+* Move debug log to same location as magisk log - Download folder
+* Add proper chcon for vendor files - fixes various issues with audioflinger and maybe more with android Q
+* Remove empty folders after moving files for DYNLIB
+* Fix api check bug
+
+### v1.2 - 1.17.2020
+* Fixed bug in debug log
+* Fixed DYNLIB so it won't move empty files (replacements) to vendor
+* Magisk manager only installs now - will automatically remove module if flashed in recovery
+* Removed extra crap that was needed for recovery installs
+* Removed common/uninstall and upgrade scripts, no need for them anymore
+* Removed mount_part function - no need for it now since recovery is no longer supported - just remount partition as rw
+* More in line with regular magisk module template now - flashing zip always installs/upgrades mod. To uninstall, use magisk manager
+
+### v1.1 - 1.11.2020
+* No longer use .core - it'll be deprecated soon
+* Fix for uninstall
+* Fix bug in debug function during uninstalls
+* Misc fixes
+
+### v1.0 - 1.4.2020
+* Initial release

module/common/functions.sh

@@ -0,0 +1,238 @@
+##########################################################################################
+#
+# MMT Extended Utility Functions
+#
+##########################################################################################
+
+cleanup() {
+  rm -rf $MODPATH/common 2>/dev/null
+}
+
+abort() {
+  ui_print "$1"
+  rm -rf $MODPATH 2>/dev/null
+  cleanup
+  rm -rf $TMPDIR 2>/dev/null
+  exit 1
+}
+
+device_check() {
+  local opt=`getopt -o dm -- "$@"` type=device
+  eval set -- "$opt"
+  while true; do
+    case "$1" in
+      -d) local type=device; shift;;
+      -m) local type=manufacturer; shift;;
+      --) shift; break;;
+      *) abort "Invalid device_check argument $1! Aborting!";;
+    esac
+  done
+  local prop=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+  for i in /system /vendor /odm /product; do
+    if [ -f $i/build.prop ]; then
+      for j in "ro.product.$type" "ro.build.$type" "ro.product.vendor.$type" "ro.vendor.product.$type"; do
+        [ "$(sed -n "s/^$j=//p" $i/build.prop 2>/dev/null | head -n 1 | tr '[:upper:]' '[:lower:]')" == "$prop" ] && return 0
+      done
+      [ "$type" == "device" ] && [ "$(sed -n "s/^"ro.build.product"=//p" $i/build.prop 2>/dev/null | head -n 1 | tr '[:upper:]' '[:lower:]')" == "$prop" ] && return 0
+    fi
+  done
+  return 1
+}
+
+cp_ch() {
+  local opt=`getopt -o nr -- "$@"` BAK=true UBAK=true FOL=false
+  eval set -- "$opt"
+  while true; do
+    case "$1" in
+      -n) UBAK=false; shift;;
+      -r) FOL=true; shift;;
+      --) shift; break;;
+      *) abort "Invalid cp_ch argument $1! Aborting!";;
+    esac
+  done
+  local SRC="$1" DEST="$2" OFILES="$1"
+  $FOL && local OFILES=$(find $SRC -type f 2>/dev/null)
+  [ -z $3 ] && PERM=0644 || PERM=$3
+  case "$DEST" in
+    $TMPDIR/*|$MODULEROOT/*|$NVBASE/modules/$MODID/*) BAK=false;;
+  esac
+  for OFILE in ${OFILES}; do
+    if $FOL; then
+      if [ "$(basename $SRC)" == "$(basename $DEST)" ]; then
+        local FILE=$(echo $OFILE | sed "s|$SRC|$DEST|")
+      else
+        local FILE=$(echo $OFILE | sed "s|$SRC|$DEST/$(basename $SRC)|")
+      fi
+    else
+      [ -d "$DEST" ] && local FILE="$DEST/$(basename $SRC)" || local FILE="$DEST"
+    fi
+    if $BAK && $UBAK; then
+      [ ! "$(grep "$FILE$" $INFO 2>/dev/null)" ] && echo "$FILE" >> $INFO
+      [ -f "$FILE" -a ! -f "$FILE~" ] && { mv -f $FILE $FILE~; echo "$FILE~" >> $INFO; }
+    elif $BAK; then
+      [ ! "$(grep "$FILE$" $INFO 2>/dev/null)" ] && echo "$FILE" >> $INFO
+    fi
+    install -D -m $PERM "$OFILE" "$FILE"
+  done
+}
+
+install_script() {
+  case "$1" in
+    -l) shift; local INPATH=$NVBASE/service.d;;
+    -p) shift; local INPATH=$NVBASE/post-fs-data.d;;
+    *) local INPATH=$NVBASE/service.d;;
+  esac
+  [ "$(grep "#!/system/bin/sh" $1)" ] || sed -i "1i #!/system/bin/sh" $1
+  local i; for i in "MODPATH" "LIBDIR" "MODID" "INFO" "MODDIR"; do
+    case $i in
+      "MODPATH") sed -i "1a $i=$NVBASE/modules/$MODID" $1;;
+      "MODDIR") sed -i "1a $i=\${0%/*}" $1;;
+      *) sed -i "1a $i=$(eval echo \$$i)" $1;;
+    esac
+  done
+  [ "$1" == "$MODPATH/uninstall.sh" ] && return 0
+  case $(basename $1) in
+    post-fs-data.sh|service.sh) ;;
+    *) cp_ch -n $1 $INPATH/$(basename $1) 0755;;
+  esac
+}
+
+prop_process() {
+  sed -i -e "/^#/d" -e "/^ *$/d" $1
+  [ -f $MODPATH/system.prop ] || mktouch $MODPATH/system.prop
+  while read LINE; do
+    echo "$LINE" >> $MODPATH/system.prop
+  done < $1
+}
+
+# Credits
+ui_print "**************************************"
+ui_print "*   MMT Extended by Zackptg5 @ XDA   *"
+ui_print "**************************************"
+ui_print " "
+
+# Check for min/max api version
+[ -z $MINAPI ] || { [ $API -lt $MINAPI ] && abort "! Your system API of $API is less than the minimum api of $MINAPI! Aborting!"; }
+[ -z $MAXAPI ] || { [ $API -gt $MAXAPI ] && abort "! Your system API of $API is greater than the maximum api of $MAXAPI! Aborting!"; }
+
+# Set variables
+[ -z $ARCH32 ] && ARCH32="$(echo $ABI32 | cut -c-3)"
+[ $API -lt 26 ] && DYNLIB=false
+[ -z $DYNLIB ] && DYNLIB=false
+[ -z $DEBUG ] && DEBUG=false
+INFO=$NVBASE/modules/.$MODID-files
+ORIGDIR="$MAGISKTMP/mirror"
+if $DYNLIB; then
+  LIBPATCH="\/vendor"
+  LIBDIR=/system/vendor
+else
+  LIBPATCH="\/system"
+  LIBDIR=/system
+fi
+if ! $BOOTMODE; then
+  ui_print "- Only uninstall is supported in recovery"
+  ui_print "  Uninstalling!"
+  touch $MODPATH/remove
+  [ -s $INFO ] && install_script $MODPATH/uninstall.sh || rm -f $INFO $MODPATH/uninstall.sh
+  recovery_cleanup
+  cleanup
+  rm -rf $NVBASE/modules_update/$MODID $TMPDIR 2>/dev/null
+  exit 0
+fi
+
+# Debug
+if $DEBUG; then
+  ui_print "- Debug mode"
+  ui_print "  Module install log will include debug info"
+  ui_print "  Be sure to save it after module install"
+  set -x
+fi
+
+# Extract files
+ui_print "- Extracting module files"
+unzip -o "$ZIPFILE" -x 'META-INF/*' 'common/functions.sh' -d $MODPATH >&2
+[ -f "$MODPATH/common/addon.tar.xz" ] && tar -xf $MODPATH/common/addon.tar.xz -C $MODPATH/common 2>/dev/null
+
+# Run addons
+if [ "$(ls -A $MODPATH/common/addon/*/install.sh 2>/dev/null)" ]; then
+  ui_print " "; ui_print "- Running Addons -"
+  for i in $MODPATH/common/addon/*/install.sh; do
+    ui_print "  Running $(echo $i | sed -r "s|$MODPATH/common/addon/(.*)/install.sh|\1|")..."
+    . $i
+  done
+fi
+
+# Remove files outside of module directory
+ui_print "- Removing old files"
+
+if [ -f $INFO ]; then
+  while read LINE; do
+    if [ "$(echo -n $LINE | tail -c 1)" == "~" ]; then
+      continue
+    elif [ -f "$LINE~" ]; then
+      mv -f $LINE~ $LINE
+    else
+      rm -f $LINE
+      while true; do
+        LINE=$(dirname $LINE)
+        [ "$(ls -A $LINE 2>/dev/null)" ] && break 1 || rm -rf $LINE
+      done
+    fi
+  done < $INFO
+  rm -f $INFO
+fi
+
+### Install
+ui_print "- Installing"
+
+[ -f "$MODPATH/common/install.sh" ] && . $MODPATH/common/install.sh
+
+ui_print "   Installing for $ARCH SDK $API device..."
+# Remove comments from files and place them, add blank line to end if not already present
+for i in $(find $MODPATH -type f -name "*.sh" -o -name "*.prop" -o -name "*.rule"); do
+  [ -f $i ] && { sed -i -e "/^#/d" -e "/^ *$/d" $i; [ "$(tail -1 $i)" ] && echo "" >> $i; } || continue
+  case $i in
+    "$MODPATH/service.sh") install_script -l $i;;
+    "$MODPATH/post-fs-data.sh") install_script -p $i;;
+    "$MODPATH/uninstall.sh") if [ -s $INFO ] || [ "$(head -n1 $MODPATH/uninstall.sh)" != "# Don't modify anything after this" ]; then
+                               install_script $MODPATH/uninstall.sh
+                             else
+                               rm -f $INFO $MODPATH/uninstall.sh
+                             fi;;
+  esac
+done
+
+$IS64BIT || for i in $(find $MODPATH/system -type d -name "lib64"); do rm -rf $i 2>/dev/null; done  
+[ -d "/system/priv-app" ] || mv -f $MODPATH/system/priv-app $MODPATH/system/app 2>/dev/null
+[ -d "/system/xbin" ] || mv -f $MODPATH/system/xbin $MODPATH/system/bin 2>/dev/null
+if $DYNLIB; then
+  for FILE in $(find $MODPATH/system/lib* -type f 2>/dev/null | sed "s|$MODPATH/system/||"); do
+    [ -s $MODPATH/system/$FILE ] || continue
+    case $FILE in
+      lib*/modules/*) continue;;
+    esac
+    mkdir -p $(dirname $MODPATH/system/vendor/$FILE)
+    mv -f $MODPATH/system/$FILE $MODPATH/system/vendor/$FILE
+    [ "$(ls -A `dirname $MODPATH/system/$FILE`)" ] || rm -rf `dirname $MODPATH/system/$FILE`
+  done
+  # Delete empty lib folders (busybox find doesn't have this capability)
+  toybox find $MODPATH/system/lib* -type d -empty -delete >/dev/null 2>&1
+fi
+
+# Set permissions
+ui_print " "
+ui_print "- Setting Permissions"
+set_perm_recursive $MODPATH 0 0 0755 0644
+if [ -d $MODPATH/system/vendor ]; then
+  set_perm_recursive $MODPATH/system/vendor 0 0 0755 0644 u:object_r:vendor_file:s0
+  [ -d $MODPATH/system/vendor/app ] && set_perm_recursive $MODPATH/system/vendor/app 0 0 0755 0644 u:object_r:vendor_app_file:s0
+  [ -d $MODPATH/system/vendor/etc ] && set_perm_recursive $MODPATH/system/vendor/etc 0 0 0755 0644 u:object_r:vendor_configs_file:s0
+  [ -d $MODPATH/system/vendor/overlay ] && set_perm_recursive $MODPATH/system/vendor/overlay 0 0 0755 0644 u:object_r:vendor_overlay_file:s0
+  for FILE in $(find $MODPATH/system/vendor -type f -name *".apk"); do
+    [ -f $FILE ] && chcon u:object_r:vendor_app_file:s0 $FILE
+  done
+fi
+set_permissions
+
+# Complete install
+cleanup

module/common/install.sh

@@ -0,0 +1,29 @@
+echo -n $LIBPATCH > $MODPATH/libpatch.txt
+
+ui_print "    Copying lib files..."
+
+cp_ch -n $MODPATH/common/files/libv4a_re_$ABI32.so $MODPATH$LIBDIR/lib/soundfx/libv4a_re.so
+if [ "$IS64BIT" ]; then
+cp_ch -n $MODPATH/common/files/libv4a_re_$ABI.so $MODPATH$LIBDIR/lib64/soundfx/libv4a_re.so
+fi
+
+ui_print "    Patching audio_effects config files"
+CFGS="$(find /odm /system /vendor -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml")"
+for OFILE in ${CFGS}; do
+  FILE="$MODPATH$(echo $OFILE | sed "s|^/vendor|/system/vendor|g")"
+  cp_ch -n $OFILE $FILE
+  case $FILE in
+    *.conf)
+        sed -i "/v4a_standard_re {/,/}/d" $FILE
+        sed -i "/v4a_re {/,/}/d" $FILE
+        sed -i "s/^effects {/effects {\n  v4a_standard_re {\n    library v4a_re\n    uuid 90380da3-8536-4744-a6a3-5731970e640f\n  }/g" $FILE
+        sed -i "s/^libraries {/libraries {\n  v4a_re {\n    path $LIBPATCH\/lib\/soundfx\/libv4a_re.so\n  }/g" $FILE
+        ;;
+    *.xml) 
+        sed -i "/v4a_standard_re/d" $FILE
+        sed -i "/v4a_re/d" $FILE
+        sed -i "/<libraries>/ a\        <library name=\"v4a_re\" path=\"libv4a_re.so\"\/>" $FILE
+        sed -i "/<effects>/ a\        <effect name=\"v4a_standard_re\" library=\"v4a_re\" uuid=\"90380da3-8536-4744-a6a3-5731970e640f\"\/>" $FILE
+        ;;
+  esac
+done

module/customize.sh

@@ -0,0 +1,68 @@
+##########################################################################################
+#
+# MMT Extended Config Script
+#
+##########################################################################################
+
+##########################################################################################
+# Config Flags
+##########################################################################################
+
+# Uncomment and change 'MINAPI' and 'MAXAPI' to the minimum and maximum android version for your mod
+# Uncomment DYNLIB if you want libs installed to vendor for oreo+ and system for anything older
+# Uncomment DEBUG if you want full debug logs (saved to /sdcard)
+#MINAPI=21
+#MAXAPI=25
+DYNLIB=true
+#DEBUG=true
+
+##########################################################################################
+# Replace list
+##########################################################################################
+
+# List all directories you want to directly replace in the system
+# Check the documentations for more info why you would need this
+
+# Construct your list in the following format
+# This is an example
+REPLACE_EXAMPLE="
+/system/app/Youtube
+/system/priv-app/SystemUI
+/system/priv-app/Settings
+/system/framework
+"
+
+# Construct your own list here
+REPLACE="
+"
+
+##########################################################################################
+# Permissions
+##########################################################################################
+
+set_permissions() {
+  : # Remove this if adding to this function
+
+  # Note that all files/folders in magisk module directory have the $MODPATH prefix - keep this prefix on all of your files/folders
+  # Some examples:
+  
+  # For directories (includes files in them):
+  # set_perm_recursive  <dirname>                <owner> <group> <dirpermission> <filepermission> <contexts> (default: u:object_r:system_file:s0)
+  
+  # set_perm_recursive $MODPATH/system/lib 0 0 0755 0644
+  # set_perm_recursive $MODPATH/system/vendor/lib/soundfx 0 0 0755 0644
+
+  # For files (not in directories taken care of above)
+  # set_perm  <filename>                         <owner> <group> <permission> <contexts> (default: u:object_r:system_file:s0)
+  
+  # set_perm $MODPATH/system/lib/libart.so 0 0 0644
+  # set_perm /data/local/tmp/file.txt 0 0 644
+}
+
+##########################################################################################
+# MMT Extended Logic - Don't modify anything after this
+##########################################################################################
+
+SKIPUNZIP=1
+unzip -qjo "$ZIPFILE" 'common/functions.sh' -d $TMPDIR >&2
+. $TMPDIR/functions.sh

module/module.prop

@@ -0,0 +1,6 @@
+id=ViPER4Android-RE
+name=ViPER4Android Reverse Engineered
+version=v0.6.1
+versionCode=20231210
+author=pittvandewitt, MrWhite214, Zackptg5, Martmists, Iscle
+description=ViPER4Android Reverse Engineered is an audio enhancing software to provide everyone with a better audio experience

module/post-fs-data.sh

@@ -0,0 +1,23 @@
+LIBPATCH=`cat $MODPATH/libpatch.txt`
+CFGS="$(find /odm /system /vendor -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml")"
+for FILE in ${CFGS}; do
+  case $FILE in
+    *.conf)
+        sed -i "/v4a_standard_re {/,/}/d" $FILE
+        sed -i "/v4a_re {/,/}/d" $FILE
+        sed -i "s/^effects {/effects {\n  v4a_standard_re {\n    library v4a_re\n    uuid 90380da3-8536-4744-a6a3-5731970e640f\n  }/g" $FILE
+        sed -i "s/^libraries {/libraries {\n  v4a_re {\n    path $LIBPATCH\/lib\/soundfx\/libv4a_re.so\n  }/g" $FILE
+        ;;
+    *.xml) 
+        sed -i "/v4a_standard_re/d" $FILE
+        sed -i "/v4a_re/d" $FILE
+        sed -i "/<libraries>/ a\        <library name=\"v4a_re\" path=\"libv4a_re.so\"\/>" $FILE
+        sed -i "/<effects>/ a\        <effect name=\"v4a_standard_re\" library=\"v4a_re\" uuid=\"90380da3-8536-4744-a6a3-5731970e640f\"\/>" $FILE
+        ;;
+  esac
+done
+
+if [ -d "/odm/etc/" ]; then
+  echo "Binding audio_effects.xml to odm partition..."
+  mount -o bind /data/adb/modules/ViPER4Android-RE/odm/etc/audio_effects.xml /odm/etc/audio_effects.xml
+fi

module/uninstall.sh

@@ -0,0 +1,17 @@
+# Don't modify anything after this
+if [ -f $INFO ]; then
+  while read LINE; do
+    if [ "$(echo -n $LINE | tail -c 1)" == "~" ]; then
+      continue
+    elif [ -f "$LINE~" ]; then
+      mv -f $LINE~ $LINE
+    else
+      rm -f $LINE
+      while true; do
+        LINE=$(dirname $LINE)
+        [ "$(ls -A $LINE 2>/dev/null)" ] && break 1 || rm -rf $LINE
+      done
+    fi
+  done < $INFO
+  rm -f $INFO
+fi

module/update.json

@@ -0,0 +1,6 @@
+{
+  "version": "v1.0",
+  "versionCode": 1,
+  "zipUrl": "https://raw.githubusercontent.com/AndroidAudioMods/ViPER4Android-Magisk-Module/install.zip",
+  "changelog": "https://raw.githubusercontent.com/AndroidAudioMods/ViPER4Android-Magisk-Module/changelog.md"
+}

src/ViPER4Android.h

@@ -19,6 +19,7 @@ extern "C" {
 #define PARAM_GET_DISABLE_REASON 8
 #define PARAM_GET_DISABLE_REASON_MESSAGE 9
 #define PARAM_GET_CONFIG 10
+#define PARAM_GET_ARCHITECTURE 11
 
 // Param set
 #define PARAM_SET_UPDATE_STATUS 0x9002

src/ViperContext.cpp

@@ -4,6 +4,7 @@
 #include <chrono>
 #include "ViperContext.h"
 #include "log.h"
+#include "viper/constants.h"
 
 #define SET(type, ptr, value) (*(type *) (ptr) = (value))
 
@@ -280,6 +281,13 @@ int32_t ViperContext::handleGetParam(effect_param_t *pCmdParam, effect_param_t *
             *pReplySize = sizeof(effect_param_t) + pReplyParam->psize + vOffset + pReplyParam->vsize;
             return 0;
         }
+        case PARAM_GET_ARCHITECTURE: {
+            pReplyParam->status = 0;
+            pReplyParam->vsize = sizeof(VIPER_ARCHITECTURE) - 1; // Exclude null terminator
+            memcpy(pReplyParam->data + vOffset, VIPER_ARCHITECTURE, pReplyParam->vsize);
+            *pReplySize = sizeof(effect_param_t) + pReplyParam->psize + vOffset + pReplyParam->vsize;
+            return 0;
+        }
         default: {
             return -EINVAL;
         }

src/viper/ViPER.cpp

@@ -228,7 +228,7 @@ void ViPER::DispatchCommand(int param, int val1, int val2, int val3, int val4, u
             break;
         } // 0x1000A
         case PARAM_DDC_COEFFICIENTS: {
-            this->viperDdc.SetCoeffs(arrSize, (float *) arr, (float *) (arr + arrSize * 4));
+            this->viperDdc.SetCoeffs(arrSize, (float *) arr, (float *) (arr + arrSize * sizeof(float)));
             break;
         } // 0x1000B
         case PARAM_SPECTRUM_EXTENSION_ENABLE: {

src/viper/constants.h

@@ -8,6 +8,21 @@
 
 #include "../log.h" // TODO: Remove this dependency
 
+#if defined(__arm__)
+#define VIPER_ARCHITECTURE "ARM"
+#elif defined(__aarch64__)
+#define VIPER_ARCHITECTURE "ARM64"
+#elif defined(__i386__)
+#define VIPER_ARCHITECTURE "x86"
+#elif defined(__x86_64__)
+#define VIPER_ARCHITECTURE "x86_64"
+#else
+#error "Unknown architecture"
+// Note from the developer:
+// There's no architecture dependent code in ViPER4Android, this is just for debugging purposes.
+// Feel free to add your architecture if it's not listed here.
+#endif
+
 #define VIPER_NAME "ViPER4Android"
 #define VIPER_AUTHORS "viper.WYF, Martmists, Iscle"
 #define VIPER_DEFAULT_SAMPLING_RATE 44100

src/viper/effects/ViPERBass.cpp

@@ -3,7 +3,7 @@
 
 // Iscle: Verified with the latest version at 13/12/2022
 
-ViPERBass::ViPERBass() {
+ViPERBass::ViPERBass() : polyphase(2), waveBuffer(2, 4096) {
     this->speaker = 60;
     this->enable = false;
     this->processMode = ProcessMode::NATURAL_BASS;
@@ -11,24 +11,15 @@ ViPERBass::ViPERBass() {
     this->bassFactor = 0.0;
     this->samplingRate = VIPER_DEFAULT_SAMPLING_RATE;
     this->samplingRatePeriod = 1.0 / VIPER_DEFAULT_SAMPLING_RATE;
-    this->polyphase = new Polyphase(2);
-    this->biquad = new Biquad();
-    this->subwoofer = new Subwoofer();
-    this->waveBuffer = new WaveBuffer(1, 4096);
 
-    this->biquad->Reset();
-    this->biquad->SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
-    this->subwoofer->SetBassGain(this->samplingRate, 0.0);
+    for (auto &biquad : this->biquad) {
+        biquad.Reset();
+        biquad.SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+    }
+    this->subwoofer.SetBassGain(this->samplingRate, 0.0);
     Reset();
 }
 
-ViPERBass::~ViPERBass() {
-    delete this->polyphase;
-    delete this->biquad;
-    delete this->subwoofer;
-    delete this->waveBuffer;
-}
-
 void ViPERBass::Process(float *samples, uint32_t size) {
     if (!this->enable) return;
     if (size == 0) return;
@@ -48,49 +39,46 @@ void ViPERBass::Process(float *samples, uint32_t size) {
     switch (this->processMode) {
         case ProcessMode::NATURAL_BASS: {
             for (uint32_t i = 0; i < size * 2; i += 2) {
-                double sample = ((double) samples[i] + (double) samples[i + 1]) / 2.0;
-                float x = (float) this->biquad->ProcessSample(sample) * this->bassFactor;
-                samples[i] += x;
-                samples[i + 1] += x;
+                samples[i] += (float) this->biquad[0].ProcessSample(samples[i]) * this->bassFactor;
+                samples[i + 1] += (float) this->biquad[1].ProcessSample(samples[i + 1]) * this->bassFactor;
             }
             break;
         }
         case ProcessMode::PURE_BASS_PLUS: {
-            if (this->waveBuffer->PushSamples(samples, size)) {
-                float *buffer = this->waveBuffer->GetBuffer();
-                uint32_t bufferOffset = this->waveBuffer->GetBufferOffset();
+            if (this->waveBuffer.PushSamples(samples, size)) {
+                float *buffer = this->waveBuffer.GetBuffer();
+                uint32_t bufferOffset = this->waveBuffer.GetBufferOffset();
 
                 for (uint32_t i = 0; i < size * 2; i += 2) {
-                    double sample = ((double) samples[i] + (double) samples[i + 1]) / 2.0;
-                    auto x = (float) this->biquad->ProcessSample(sample);
-                    buffer[bufferOffset - size + i / 2] = x;
+                    buffer[bufferOffset - size + i] = (float) this->biquad[0].ProcessSample(samples[i]);
+                    buffer[bufferOffset - size + i + 1] = (float) this->biquad[1].ProcessSample(samples[i + 1]);
                 }
 
-                if (this->polyphase->Process(samples, size) == size) {
+                if (this->polyphase.Process(samples, size) == size) {
                     for (uint32_t i = 0; i < size * 2; i += 2) {
-                        float x = buffer[i / 2] * this->bassFactor;
-                        samples[i] += x;
-                        samples[i + 1] += x;
+                        samples[i] += buffer[i] * this->bassFactor;
+                        samples[i + 1] += buffer[i + 1] * this->bassFactor;
                     }
-                    this->waveBuffer->PopSamples(size, true);
+                    this->waveBuffer.PopSamples(size, true);
                 }
             }
             break;
         }
         case ProcessMode::SUBWOOFER: {
-            this->subwoofer->Process(samples, size);
+            this->subwoofer.Process(samples, size);
             break;
         }
     }
 }
 
 void ViPERBass::Reset() {
-    this->polyphase->SetSamplingRate(this->samplingRate);
-    this->polyphase->Reset();
-    this->waveBuffer->Reset();
-    this->waveBuffer->PushZeros(this->polyphase->GetLatency());
-    this->subwoofer->SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
-    this->biquad->SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+    this->polyphase.SetSamplingRate(this->samplingRate);
+    this->polyphase.Reset();
+    this->waveBuffer.Reset();
+    this->waveBuffer.PushZeros(this->polyphase.GetLatency());
+    this->subwoofer.SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
+    this->biquad[0].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+    this->biquad[1].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
     this->samplingRatePeriod = 1.0f / (float) this->samplingRate;
     this->antiPop = 0.0f;
 }
@@ -98,7 +86,7 @@ void ViPERBass::Reset() {
 void ViPERBass::SetBassFactor(float bassFactor) {
     if (this->bassFactor != bassFactor) {
         this->bassFactor = bassFactor;
-        this->subwoofer->SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
+        this->subwoofer.SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
     }
 }
 
@@ -120,15 +108,17 @@ void ViPERBass::SetSamplingRate(uint32_t samplingRate) {
     if (this->samplingRate != samplingRate) {
         this->samplingRate = samplingRate;
         this->samplingRatePeriod = 1.0f / (float) samplingRate;
-        this->polyphase->SetSamplingRate(this->samplingRate);
-        this->biquad->SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
-        this->subwoofer->SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
+        this->polyphase.SetSamplingRate(this->samplingRate);
+        this->biquad[0].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+        this->biquad[1].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+        this->subwoofer.SetBassGain(this->samplingRate, this->bassFactor * 2.5f);
     }
 }
 
 void ViPERBass::SetSpeaker(uint32_t speaker) {
     if (this->speaker != speaker) {
         this->speaker = speaker;
-        this->biquad->SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+        this->biquad[0].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
+        this->biquad[1].SetLowPassParameter((float) this->speaker, this->samplingRate, 0.53);
     }
 }

src/viper/effects/ViPERBass.h

@@ -17,7 +17,6 @@ public:
     };
 
     ViPERBass();
-    ~ViPERBass();
 
     void Process(float *samples, uint32_t size);
     void Reset();
@@ -28,10 +27,10 @@ public:
     void SetSpeaker(uint32_t speaker);
 
 private:
-    Polyphase *polyphase;
-    Biquad *biquad;
-    Subwoofer *subwoofer;
-    WaveBuffer *waveBuffer;
+    Polyphase polyphase;
+    Biquad biquad[2];
+    Subwoofer subwoofer;
+    WaveBuffer waveBuffer;
     bool enable;
     ProcessMode processMode;
     uint32_t samplingRate;

src/viper/effects/ViPERDDC.cpp

@@ -1,41 +1,27 @@
 #include "ViPERDDC.h"
 #include "../../log.h"
+#include "../constants.h"
 #include <cstring>
 
-ViPERDDC::ViPERDDC() {
-    this->enable = false;
-    this->samplingRate = 44100;
-    this->setCoeffsOk = false;
-    this->arrSize = 0;
-    this->coeffsArr44100 = nullptr;
-    this->coeffsArr48000 = nullptr;
-    this->x2R = nullptr;
-    this->x2L = nullptr;
-    this->x1R = nullptr;
-    this->x1L = nullptr;
-    this->y2R = nullptr;
-    this->y2L = nullptr;
-    this->y1R = nullptr;
-    this->y1L = nullptr;
-}
-
-ViPERDDC::~ViPERDDC() {
-    ReleaseResources();
-}
+ViPERDDC::ViPERDDC() :
+    enable(false),
+    setCoeffsOk(false),
+    samplingRate(VIPER_DEFAULT_SAMPLING_RATE),
+    arrSize(0) {}
 
 void ViPERDDC::Process(float *samples, uint32_t size) {
-    if (!this->setCoeffsOk) return;
+    if (!this->setCoeffsOk || this->arrSize == 0) return;
     if (!this->enable) return;
 
-    float **coeffsArr;
+    std::vector<std::array<float, 5>> *coeffsArr;
 
     switch (this->samplingRate) {
         case 44100: {
-            coeffsArr = this->coeffsArr44100;
+            coeffsArr = &this->coeffsArr44100;
             break;
         }
         case 48000: {
-            coeffsArr = this->coeffsArr48000;
+            coeffsArr = &this->coeffsArr48000;
             break;
         }
         default: {
@@ -45,145 +31,108 @@ void ViPERDDC::Process(float *samples, uint32_t size) {
     }
 
     for (uint32_t i = 0; i < size * 2; i += 2) {
-        if (this->arrSize == 0) {
-            samples[i] = 0.0;
-            samples[i + 1] = 0.0;
-        } else {
-            float sample = samples[i];
-            for (uint32_t j = 0; j < this->arrSize; j++) {
-                float *coeffs = coeffsArr[j];
+        float sampleL = samples[i];
+        float sampleR = samples[i + 1];
 
-                float b0 = coeffs[0];
-                float b1 = coeffs[1];
-                float b2 = coeffs[2];
-                float a1 = coeffs[3];
-                float a2 = coeffs[4];
+        for (uint32_t j = 0; j < this->arrSize; j++) {
+            std::array<float, 5> *coeffs = &(*coeffsArr)[j];
 
-                float out =
-                        sample * b0 +
-                        x1L[j] * b1 +
-                        x2L[j] * b2 +
-                        y1L[j] * a1 +
-                        y2L[j] * a2;
+            float b0 = (*coeffs)[0];
+            float b1 = (*coeffs)[1];
+            float b2 = (*coeffs)[2];
+            float a1 = (*coeffs)[3];
+            float a2 = (*coeffs)[4];
 
-                x2L[j] = x1L[j];
-                x1L[j] = sample;
-                y2L[j] = y1L[j];
-                y1L[j] = out;
+            float outL =
+                    sampleL * b0 +
+                    x1L[j] * b1 +
+                    x2L[j] * b2 +
+                    y1L[j] * a1 +
+                    y2L[j] * a2;
 
-                sample = out;
-            }
-            samples[i] = sample;
+            x2L[j] = x1L[j];
+            x1L[j] = sampleL;
+            y2L[j] = y1L[j];
+            y1L[j] = outL;
 
-            sample = samples[i + 1];
-            for (uint32_t j = 0; j < this->arrSize; j++) {
-                float *coeffs = coeffsArr[j];
+            sampleL = outL;
 
-                float b0 = coeffs[0];
-                float b1 = coeffs[1];
-                float b2 = coeffs[2];
-                float a1 = coeffs[3];
-                float a2 = coeffs[4];
+            float outR =
+                    sampleR * b0 +
+                    x1R[j] * b1 +
+                    x2R[j] * b2 +
+                    y1R[j] * a1 +
+                    y2R[j] * a2;
 
-                float out =
-                        sample * b0 +
-                        x1R[j] * b1 +
-                        x2R[j] * b2 +
-                        y1R[j] * a1 +
-                        y2R[j] * a2;
+            x2R[j] = x1R[j];
+            x1R[j] = sampleR;
+            y2R[j] = y1R[j];
+            y1R[j] = outR;
 
-                x2R[j] = x1R[j];
-                x1R[j] = sample;
-                y2R[j] = y1R[j];
-                y1R[j] = out;
-
-                sample = out;
-            }
-            samples[i + 1] = sample;
+            sampleR = outR;
         }
+
+        samples[i] = sampleL;
+        samples[i + 1] = sampleR;
     }
 }
 
 void ViPERDDC::ReleaseResources() {
-    for (uint32_t i = 0; i < this->arrSize; i++) {
-        delete[] this->coeffsArr44100[i];
-        delete[] this->coeffsArr48000[i];
-    }
-
-    delete[] this->coeffsArr44100;
-    this->coeffsArr44100 = nullptr;
-
-    delete[] this->coeffsArr48000;
-    this->coeffsArr48000 = nullptr;
-
-    delete[] this->x1L;
-    this->x1L = nullptr;
-
-    delete[] this->x1R;
-    this->x1R = nullptr;
-
-    delete[] this->x2L;
-    this->x2L = nullptr;
-
-    delete[] this->x2R;
-    this->x2R = nullptr;
-
-    delete[] this->y1L;
-    this->y1L = nullptr;
-
-    delete[] this->y1R;
-    this->y1R = nullptr;
-
-    delete[] this->y2L;
-    this->y2L = nullptr;
-
-    delete[] this->y2R;
-    this->y2R = nullptr;
-
     this->setCoeffsOk = false;
+
+    this->coeffsArr44100.resize(0);
+    this->coeffsArr48000.resize(0);
+
+    this->x1L.resize(0);
+    this->x1R.resize(0);
+    this->x2L.resize(0);
+    this->x2R.resize(0);
+    this->y1L.resize(0);
+    this->y1R.resize(0);
+    this->y2L.resize(0);
+    this->y2R.resize(0);
 }
 
 void ViPERDDC::Reset() {
     if (!this->setCoeffsOk) return;
     if (this->arrSize == 0) return;
 
-    memset(this->x1L, 0, this->arrSize * 4);
-    memset(this->x1R, 0, this->arrSize * 4);
+    memset(this->x1L.data(), 0, this->arrSize * sizeof(float));
+    memset(this->x1R.data(), 0, this->arrSize * sizeof(float));
 }
 
-void ViPERDDC::SetCoeffs(uint32_t param_1, float *param_2, float *param_3) {
+void ViPERDDC::SetCoeffs(uint32_t newCoeffsSize, float *newCoeffs44100, float *newCoeffs48000) {
     ReleaseResources();
 
-    if (param_1 == 0) return;
+    if (newCoeffsSize == 0) return;
 
-    this->arrSize = param_1 / 5;
-    this->coeffsArr44100 = new float *[this->arrSize]();
-    this->coeffsArr48000 = new float *[this->arrSize]();
+    this->arrSize = newCoeffsSize / 5;
+    this->coeffsArr44100.resize(this->arrSize);
+    this->coeffsArr48000.resize(this->arrSize);
 
     for (uint32_t i = 0; i < this->arrSize; i++) {
-        this->coeffsArr44100[i] = new float[5];
-        this->coeffsArr44100[i][0] = param_2[i * 5];
-        this->coeffsArr44100[i][1] = param_2[i * 5 + 1];
-        this->coeffsArr44100[i][2] = param_2[i * 5 + 2];
-        this->coeffsArr44100[i][3] = param_2[i * 5 + 3];
-        this->coeffsArr44100[i][4] = param_2[i * 5 + 4];
+        this->coeffsArr44100[i][0] = newCoeffs44100[i * 5];
+        this->coeffsArr44100[i][1] = newCoeffs44100[i * 5 + 1];
+        this->coeffsArr44100[i][2] = newCoeffs44100[i * 5 + 2];
+        this->coeffsArr44100[i][3] = newCoeffs44100[i * 5 + 3];
+        this->coeffsArr44100[i][4] = newCoeffs44100[i * 5 + 4];
 
-        this->coeffsArr48000[i] = new float[5];
-        this->coeffsArr48000[i][0] = param_3[i * 5];
-        this->coeffsArr48000[i][1] = param_3[i * 5 + 1];
-        this->coeffsArr48000[i][2] = param_3[i * 5 + 2];
-        this->coeffsArr48000[i][3] = param_3[i * 5 + 3];
-        this->coeffsArr48000[i][4] = param_3[i * 5 + 4];
+        this->coeffsArr48000[i][0] = newCoeffs48000[i * 5];
+        this->coeffsArr48000[i][1] = newCoeffs48000[i * 5 + 1];
+        this->coeffsArr48000[i][2] = newCoeffs48000[i * 5 + 2];
+        this->coeffsArr48000[i][3] = newCoeffs48000[i * 5 + 3];
+        this->coeffsArr48000[i][4] = newCoeffs48000[i * 5 + 4];
     }
 
-    this->x1L = new float[this->arrSize]();
-    this->x1R = new float[this->arrSize]();
-    this->x2L = new float[this->arrSize]();
-    this->x2R = new float[this->arrSize]();
-    this->y1L = new float[this->arrSize]();
-    this->y1R = new float[this->arrSize]();
-    this->y2L = new float[this->arrSize]();
-    this->y2R = new float[this->arrSize]();
+    this->x1L.resize(this->arrSize);
+    this->x1R.resize(this->arrSize);
+    this->x2L.resize(this->arrSize);
+    this->x2R.resize(this->arrSize);
+    this->y1L.resize(this->arrSize);
+    this->y1R.resize(this->arrSize);
+    this->y2L.resize(this->arrSize);
+    this->y2R.resize(this->arrSize);
+
     this->setCoeffsOk = true;
 }
 

src/viper/effects/ViPERDDC.h

@@ -1,16 +1,16 @@
 #pragma once
 
 #include <cstdint>
+#include <vector>
+#include <array>
 
 class ViPERDDC {
 public:
     ViPERDDC();
-    ~ViPERDDC();
 
     void Process(float *samples, uint32_t size);
-    void ReleaseResources();
     void Reset();
-    void SetCoeffs(uint32_t param_1, float *param_2, float *param_3);
+    void SetCoeffs(uint32_t newCoeffsSize, float *newCoeffs44100, float *newCoeffs48000);
     void SetEnable(bool enable);
     void SetSamplingRate(uint32_t samplingRate);
 
@@ -19,16 +19,18 @@ private:
     bool setCoeffsOk;
     uint32_t samplingRate;
     uint32_t arrSize;
-    float **coeffsArr44100;
-    float **coeffsArr48000;
-    float *x1L;
-    float *x1R;
-    float *x2L;
-    float *x2R;
-    float *y1L;
-    float *y1R;
-    float *y2L;
-    float *y2R;
+    std::vector<std::array<float, 5>> coeffsArr44100;
+    std::vector<std::array<float, 5>> coeffsArr48000;
+    std::vector<float> x1L;
+    std::vector<float> x1R;
+    std::vector<float> x2L;
+    std::vector<float> x2R;
+    std::vector<float> y1L;
+    std::vector<float> y1R;
+    std::vector<float> y2L;
+    std::vector<float> y2R;
+
+    void ReleaseResources();
 };
 
 

src/viper/utils/PConvSingle.cpp

@@ -22,7 +22,11 @@ void PConvSingle::ConvolveInterleaved(float *buffer, int channel) {
 }
 
 void PConvSingle::ConvSegment(float *buffer, bool interleaved, int channel) {
-    // TODO
+    if (!interleaved) {
+
+    } else {
+        // TODO
+    }
 }
 
 int PConvSingle::GetFFTSize() {
@@ -41,13 +45,13 @@ bool PConvSingle::InstanceUsable() {
     return this->instanceUsable;
 }
 
-int PConvSingle::LoadKernel(float *buf, int param_2, int segmentSize) {
-    if (buf != nullptr && param_2 > 0 && segmentSize > 0 && segmentSize % 2 == 0) {
+int PConvSingle::LoadKernel(const float *kernel, int kernelSize, int segmentSize) {
+    if (kernel != nullptr && kernelSize >= 2 && segmentSize >= 2 && (segmentSize & (segmentSize - 1)) == 0) {
         this->instanceUsable = false;
         ReleaseResources();
         this->data = new PConvData(); //(PConvData *) malloc(0x140);  // TODO: Sizeof
         this->segmentSize = segmentSize;
-        int n = ProcessKernel(buf, param_2, 1);
+        int n = ProcessKernel(kernel, kernelSize, 1);
         if (n != 0) {
             this->instanceUsable = true;
             return n;
@@ -57,28 +61,28 @@ int PConvSingle::LoadKernel(float *buf, int param_2, int segmentSize) {
     return 0;
 }
 
-int PConvSingle::LoadKernel(const float *param_2,float param_3,int param_4,int param_5) {
-//    if (buf != nullptr && param_5 > 0 && segmentSize > 0 && segmentSize % 2 == 0) {
-//        this->enable = false;
-//        ReleaseResources();
-////        this->data = new PConvData(); //(PConvData *) malloc(0x140);  // TODO: Sizeof
-//        this->segmentSize = segmentSize;
-//        int n = ProcessKernel(1, param_2, param_4, param_5);
-//        if (n != 0) {
-//            this->enable = true;
-//            return n;
-//        }
-//        ReleaseResources();
-//    }
+int PConvSingle::LoadKernel(const float *kernel, float param_3, int kernelSize, int segmentSize) {
+    if (kernel != nullptr && kernelSize >= 2 && segmentSize >= 2 && (segmentSize & (segmentSize - 1)) == 0) {
+        this->instanceUsable = false;
+        ReleaseResources();
+        this->data = new PConvData(); //(PConvData *) malloc(0x140);  // TODO: Sizeof
+        this->segmentSize = segmentSize;
+        int n = ProcessKernel(kernel, param_3, kernelSize, 1);
+        if (n != 0) {
+            this->instanceUsable = true;
+            return n;
+        }
+        ReleaseResources();
+    }
     return 0;
 }
 
-int PConvSingle::ProcessKernel(float *param_1, int param_2, int param_3) {
+int PConvSingle::ProcessKernel(const float *kernel, int kernelSize, int param_4) {
     // TODO
     return 0;
 }
 
-int PConvSingle::ProcessKernel(int param_2, float *param_3, int param_4, int param_5) {
+int PConvSingle::ProcessKernel(const float *kernel, float param_3, int kernelSize, int param_5) {
     // TODO
     return 0;
 }

src/viper/utils/PConvSingle.h

@@ -25,13 +25,13 @@ public:
 
     void ConvSegment(float *buffer, bool interleaved, int channel);
 
-    int LoadKernel(float *buf, int param_2, int segmentSize);
+    int LoadKernel(const float *kernel, int kernelSize, int segmentSize);
 
-    int LoadKernel(const float *param_2,float param_3,int param_4,int param_5);
+    int LoadKernel(const float *kernel, float param_3, int kernelSize, int segmentSize);
 
-    int ProcessKernel(float *param_1, int param_2, int param_3);
+    int ProcessKernel(const float *kernel, int kernelSize, int param_4);
 
-    int ProcessKernel(int param_2, float *param_3, int param_4, int param_5);
+    int ProcessKernel(const float *kernel, float param_3, int kernelSize, int param_5);
 
     void ReleaseResources();