OSDN Git Service

(root) / lamexp / LameXP.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 65385d5)
Updated Opus encoder/decoder libraries v1.1.2 release and Opus-Tools to v0.1.9 from...
authorLoRd_MuldeR <mulder2@gmx.de>
Sat, 20 Feb 2016 15:00:49 +0000 (16:00 +0100)
committerLoRd_MuldeR <mulder2@gmx.de>
Sat, 20 Feb 2016 15:00:49 +0000 (16:00 +0100)
17 files changed:
LameXP_VS2010.vcxproj patch | blob | history
LameXP_VS2010.vcxproj.filters patch | blob | history
LameXP_VS2013.vcxproj patch | blob | history
LameXP_VS2013.vcxproj.filters patch | blob | history
LameXP_VS2015.vcxproj patch | blob | history
LameXP_VS2015.vcxproj.filters patch | blob | history
doc/Changelog.html patch | blob | history
doc/Changelog.md patch | blob | history
res/Tools_Decd_A.qrc patch | blob | history
res/Tools_Encd_C.qrc patch | blob | history
res/tools/opusdec.avx.exe [new file with mode: 0644] patch | blob
res/tools/opusdec.i386.exe patch | blob | history
res/tools/opusdec.sse2.exe patch | blob | history
res/tools/opusenc.avx.exe [new file with mode: 0644] patch | blob
res/tools/opusenc.i386.exe patch | blob | history
res/tools/opusenc.sse2.exe patch | blob | history
src/Config.h patch | blob | history

diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj
index 11cef2c..b1c6443 100644 (file)
--- a/LameXP_VS2010.vcxproj
+++ b/LameXP_VS2010.vcxproj
@@ -405,6 +405,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_B.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_B.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_C.cpp" />
@@ -1272,6 +1273,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LameXP.rc">
diff --git a/LameXP_VS2010.vcxproj.filters b/LameXP_VS2010.vcxproj.filters
index 83259fb..eba31ba 100644 (file)
--- a/LameXP_VS2010.vcxproj.filters
+++ b/LameXP_VS2010.vcxproj.filters
@@ -424,6 +424,9 @@
     <ClCompile Include="src\FileHash.cpp">
       <Filter>Source Files\Misc</Filter>
     </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Config.h">
@@ -779,6 +782,9 @@
     <CustomBuild Include="src\Model_FileExts.h">
       <Filter>Header Files\Models</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj
index a78e162..5030a26 100644 (file)
--- a/LameXP_VS2013.vcxproj
+++ b/LameXP_VS2013.vcxproj
@@ -407,6 +407,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_B.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_B.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_C.cpp" />
@@ -1274,6 +1275,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LameXP.rc">
diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters
index 83259fb..eba31ba 100644 (file)
--- a/LameXP_VS2013.vcxproj.filters
+++ b/LameXP_VS2013.vcxproj.filters
@@ -424,6 +424,9 @@
     <ClCompile Include="src\FileHash.cpp">
       <Filter>Source Files\Misc</Filter>
     </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Config.h">
@@ -779,6 +782,9 @@
     <CustomBuild Include="src\Model_FileExts.h">
       <Filter>Header Files\Models</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj
index 78f564c..e369b47 100644 (file)
--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -407,6 +407,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_B.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_B.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_C.cpp" />
@@ -1274,6 +1275,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LameXP.rc">
diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index 83259fb..eba31ba 100644 (file)
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -424,6 +424,9 @@
     <ClCompile Include="src\FileHash.cpp">
       <Filter>Source Files\Misc</Filter>
     </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_C.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Config.h">
@@ -779,6 +782,9 @@
     <CustomBuild Include="src\Model_FileExts.h">
       <Filter>Header Files\Models</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_C.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
diff --git a/doc/Changelog.html b/doc/Changelog.html
index 7d250d9..bd47146 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -87,6 +87,7 @@
 <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li>
 <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li>
 <li>The &quot;Algorithm Quality&quot; slider now also effects the QAAC encoder</li>
+<li>Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12)</li>
 <li>Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0</li>
 <li>Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)</li>
 <li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li>
diff --git a/doc/Changelog.md b/doc/Changelog.md
index b565193..ed8a586 100644 (file)
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -7,6 +7,7 @@
 * Fixed the location of temporary intermediate files for SoX-based audio effects
 * Enabled the "built-in" resampler for QAAC encoder
 * The "Algorithm Quality" slider now also effects the QAAC encoder
+* Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12)
 * Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
 * Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
 * Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
diff --git a/res/Tools_Decd_A.qrc b/res/Tools_Decd_A.qrc
index 5bc0e70..748c030 100644 (file)
--- a/res/Tools_Decd_A.qrc
+++ b/res/Tools_Decd_A.qrc
@@ -10,7 +10,6 @@
     <file>tools/oggdec.exe</file>
     <file>tools/opusdec.i386.exe</file>
     <file>tools/opusdec.sse2.exe</file>
-    <file>tools/refalac.i386.exe</file>
-    <file>tools/refalac.x64.exe</file>
+    <file>tools/opusdec.avx.exe</file>
   </qresource>
 </RCC>
diff --git a/res/Tools_Encd_C.qrc b/res/Tools_Encd_C.qrc
index d3a206d..673c8fe 100644 (file)
--- a/res/Tools_Encd_C.qrc
+++ b/res/Tools_Encd_C.qrc
@@ -3,5 +3,6 @@
   <qresource>
     <file>tools/opusenc.i386.exe</file>
     <file>tools/opusenc.sse2.exe</file>
+    <file>tools/opusenc.avx.exe</file>
   </qresource>
 </RCC>
diff --git a/res/tools/opusdec.avx.exe b/res/tools/opusdec.avx.exe
new file mode 100644 (file)
index 0000000..0b2f02b
Binary files /dev/null and b/res/tools/opusdec.avx.exe differ
diff --git a/res/tools/opusdec.i386.exe b/res/tools/opusdec.i386.exe
index 748f087..97cb9b0 100644 (file)
Binary files a/res/tools/opusdec.i386.exe and b/res/tools/opusdec.i386.exe differ
diff --git a/res/tools/opusdec.sse2.exe b/res/tools/opusdec.sse2.exe
index f31cadd..4180af2 100644 (file)
Binary files a/res/tools/opusdec.sse2.exe and b/res/tools/opusdec.sse2.exe differ
diff --git a/res/tools/opusenc.avx.exe b/res/tools/opusenc.avx.exe
new file mode 100644 (file)
index 0000000..a073018
Binary files /dev/null and b/res/tools/opusenc.avx.exe differ
diff --git a/res/tools/opusenc.i386.exe b/res/tools/opusenc.i386.exe
index 5bccd00..2ca45e4 100644 (file)
Binary files a/res/tools/opusenc.i386.exe and b/res/tools/opusenc.i386.exe differ
diff --git a/res/tools/opusenc.sse2.exe b/res/tools/opusenc.sse2.exe
index bc2330d..03b6887 100644 (file)
Binary files a/res/tools/opusenc.sse2.exe and b/res/tools/opusenc.sse2.exe differ
diff --git a/src/Config.h b/src/Config.h
index eac5872..5bd8687 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI                                    1
 #define VER_LAMEXP_MINOR_LO                                    4
 #define VER_LAMEXP_TYPE                                                Alpha
-#define VER_LAMEXP_PATCH                                       4
-#define VER_LAMEXP_BUILD                                       1866
+#define VER_LAMEXP_PATCH                                       5
+#define VER_LAMEXP_BUILD                                       1870
 #define VER_LAMEXP_CONFG                                       1818
 
 ///////////////////////////////////////////////////////////////////////////////
LameXP development repository
About OSDN
Find Software
Develop Software
Help