From 0421ca2b5f9a50bc2408b983eb8c807aebaf0f2a Mon Sep 17 00:00:00 2001 From: David Gilman Date: Mon, 30 Dec 2019 21:56:03 -0500 Subject: [PATCH] Release 2.0.0 --- .appveyor.yml | 12 +++-- .travis.yml | 32 +++++-------- README | 130 ++++---------------------------------------------- 3 files changed, 30 insertions(+), 144 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 627a9b7..59b3192 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,13 +11,17 @@ build_script: test_script: - C:\Python38\python.exe tests\test.py build\aacgain\Release\aacgain.exe -before_deploy: - - cmake.exe --build build --target install - - copy "C:\Program Files\aacgain\aacgain.exe" aacgain-2.0.0-windows-amd64.exe +after_build: + - copy build\aacgain\Release\aacgain.exe build\aacgain\Release\aacgain-2.0.0-windows-amd64.exe + +artifacts: + - path: 'build\aacgain\Release\aacgain-*.exe' + name: aacgain-exe + type: file deploy: - provider: GitHub - artifact: aacgain-*.exe + artifact: aacgain-exe draft: false auth_token: secure: efNJ/b8h3rXqahkooeZS+I4N/1DJIOgg8ek1X/sjKC+8f0Vgs+9Yy+vrR6f1t96X diff --git a/.travis.yml b/.travis.yml index 72d32e9..2b84ba6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ -sudo: required language: cpp + os: - linux - osx @@ -12,21 +12,15 @@ script: - cd build; make - cd $TRAVIS_BUILD_DIR; python3 tests/test.py build/aacgain/aacgain before_deploy: - - cmake --build build --target install - - cp /usr/local/bin/aacgain aacgain-2.0.0-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH} -jobs: - include: - - stage: deploy - if: tag IS present - compiler: - - gcc - os: - - linux - - osx - deploy: - skip_cleanup: true - provider: releases - api_key: - secure: 0q1PGXpaGEEcUilPcMbrHkuCR8GhlloVSsCRwox2Xfhe1rrAV1fGTAUF5m0zetXPY5A8h+aFMotEhEkH6tMlcJYOLqWhBMmWidVM6cdimlSP6OmCP/zHbJdoAFLXaGHtdUAnrdkSnm32H9sYzcfOtgaDCyQ20oc1hL1IxHQveCS1//i3gjjBMq7UT4T4MEoq7//vk3FwflzaoTRJ2ydYyoweWR7qy1PcVys3Q9mp9FYUxz2QZYgkF3YhWQXWFbV29VeXxDAyS7hcXC7V66bKT2rxVDUzu6rNqMjPstzWpRr5Kh9Orsp8Xsuox1cG6uAynXoTC0XqFDKP4J1sZruJ6xt10CNS4YpEcZnyRGOYX93c31ueryTJnQ+GEdl3rxbuswtkqccVqRowZgEFodHFrfbnjisdOH4kVzMGi/DjySr7noD7Y4OaX8+IENDVgt2p4KsazhXhUB6rJ/iOJHBedDCSLz9mIa14iBuU3yUpSUPXCdScc3TnloHCGGqq5Gxy7iu5QNhGfNCq4ErUFOYWcob8ETsoWCG1+nbDStECCcCr6kwMU/8B2ThmbDHO41YVDx9VjGXnnY5nfJNdHtwKa5wr1FQq3ROb1HM6jjlGNC8IF+jKzMs5mmFNSaM/r8D/cs2wE/IymH+1l+PXSjOw4Xulm4GdioYxFWyFzpIF13M= - on: - tags: true + - strip build/aacgain/aacgain + - cp build/aacgain/aacgain build/aacgain/aacgain-2.0.0-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH} +deploy: + - provider: releases + api_key: + secure: 0q1PGXpaGEEcUilPcMbrHkuCR8GhlloVSsCRwox2Xfhe1rrAV1fGTAUF5m0zetXPY5A8h+aFMotEhEkH6tMlcJYOLqWhBMmWidVM6cdimlSP6OmCP/zHbJdoAFLXaGHtdUAnrdkSnm32H9sYzcfOtgaDCyQ20oc1hL1IxHQveCS1//i3gjjBMq7UT4T4MEoq7//vk3FwflzaoTRJ2ydYyoweWR7qy1PcVys3Q9mp9FYUxz2QZYgkF3YhWQXWFbV29VeXxDAyS7hcXC7V66bKT2rxVDUzu6rNqMjPstzWpRr5Kh9Orsp8Xsuox1cG6uAynXoTC0XqFDKP4J1sZruJ6xt10CNS4YpEcZnyRGOYX93c31ueryTJnQ+GEdl3rxbuswtkqccVqRowZgEFodHFrfbnjisdOH4kVzMGi/DjySr7noD7Y4OaX8+IENDVgt2p4KsazhXhUB6rJ/iOJHBedDCSLz9mIa14iBuU3yUpSUPXCdScc3TnloHCGGqq5Gxy7iu5QNhGfNCq4ErUFOYWcob8ETsoWCG1+nbDStECCcCr6kwMU/8B2ThmbDHO41YVDx9VjGXnnY5nfJNdHtwKa5wr1FQq3ROb1HM6jjlGNC8IF+jKzMs5mmFNSaM/r8D/cs2wE/IymH+1l+PXSjOw4Xulm4GdioYxFWyFzpIF13M= + file: build/aacgain/aacgain-* + file_glob: true + skip_cleanup: true + on: + tags: true + condition: $TRAVIS_COMPILER = gcc diff --git a/README b/README index 77ff7f7..d2e8815 100644 --- a/README +++ b/README @@ -17,7 +17,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA **/ -AACGAIN VERSION 1.9 +AACGAIN VERSION 2.0.0 AACgain is a modification to Glen Sawyer's mp3gain, to support AAC (mp4/m4a/QuickTime) files as well as mp3 files. If you are not familiar with @@ -82,6 +82,14 @@ If you have what you believe to be a valid .m4a/.mp4 file that is not processed correctly by aacgain, please attach it to your email. I do not support the original mp3gain code. +WHAT'S NEW IN VERSION 2.0 +a) Fixed a bug where mp4 files would be silently deleted on error. + Thanks to Sappharad for the fix. http://www.sappharad.com/ +b) Add support for files with multiple audio tracks. + Thanks to Carter Thaxton for the fix. +a) Rewrote the build system +b) Updated faad2 to 2.9.1, mp4v2 to 3.0.4 + WHAT'S NEW IN VERSION 1.9 a) Fixed a bug in mp4v2 which caused iTunes music video files to fail with "not a valid mp4/m4a file" error. @@ -165,126 +173,6 @@ c) /f option is ignored for AAC files - see usage notes below. d) Uses portable versions of all library functions, and has been successfully compiled under Linux. Thanks to Prakash Punnoor for his help with this. - -BUILDING AACGAIN FOR WINDOWS FROM SOURCE CODE - -MSVC++ solution and project files have been converted for Visual C++ -2010 Express Edition. The MVSC++ 2005 and 6.0 project and solution files -are no longer being maintained. It is now required to use VC++ 2010 to -build aacgain for Windows. - -In order to build AACGain for Windows, the following components are -required. You may download them from the links listed below: - -a) aacgain - - Thanks to Glen Sawyer, aacgain source code is checked into the sourceforge - CVS repository as part of the mp3gain project. A CVS client is required. - See the instructions at http://sourceforge.net/cvs/?group_id=49979. The - commands to check out the aacgain source code are: - cvs -d:pserver:anonymous@mp3gain.cvs.sourceforge.net:/cvsroot/mp3gain login - cvs -z3 -d:pserver:anonymous@mp3gain.cvs.sourceforge.net:/cvsroot/mp3gain co -P aacgain - -b) mp3gain - You may use either the zipped version 1.5.1 source code at - http://mp3gain.sourceforge.net/download.php or check out the code from - the latest CVS. The CVS commands to check out the mp3gain source code are: - cvs -d:pserver:anonymous@mp3gain.cvs.sourceforge.net:/cvsroot/mp3gain login - cvs -z3 -d:pserver:anonymous@mp3gain.cvs.sourceforge.net:/cvsroot/mp3gain co -P mp3gain - The latest version of aacgain was build from mp3gain source files from CVS - that were most recently modified on May 19 03:48:34 2010 UTC. - -c) faad2 - aacgain was built using the the FAAD2 release 2.7 dated 2009-02-10 - downloaded from http://sourceforge.net/projects/faac/files/. - - Download any of the faad2-2.7 source files and expand the archive as a peer - to the aacgain directory. Rename its top-level directory to faad2. - - Due to the way aacgain is programmed, using modified copies of faad2's - decoder.c and syntax.c, use of any earlier or later version of faad2 - is not recommended. - -d) mp4v2 - As of version 1.9, aacgain uses the mp4v2 code found at - http://code.google.com/p/mp4v2/. aacgain is built using the mp4v2 r355 - snapshot. aacgain uses the r355 snapshot, rather than the official - release 1.9.1, due to its use of iTMF tags. - - Download the tarball mp4v2-trunk-r355.tar.bz2, and expand the archive. - Rename its top level directory to mp4v2. - - Due to the patches described below, use of any earlier or later version - of mp4v2 is not recommended. - - A patch file mp4v2.patch is in the aacgain directory. This patch - fixes two issues: - - 1) The first 2 groups of patches to mp4track.cpp remove code which - recomputes the maximum and average bitrates. If this code is not - removed, a file with a nominal bitrate of 128KB may have its bitrate - changed to something like 131287. - - 2) The last group in the patch to mp4track.cpp fixes a bug which prevents - iTunes music videos from being processed correctly. See the comments - in the patch for details. I reported this bug to the mp4v2 developers, - and it is fixed in the latest mp4v2 svn. However, the Visual Studio project - files in svn will not convert to VC++ Express, due to their use of features - only in the full (paid) version of Visual Studio. Therefore, I am - using the r355 tarball, and patching the bug myself. - - cd to the aacgain directory where mp4v2.patch is located. Apply the patch with - the command - - patch -p0