finish beta release

CMakeLists.txt

@@ -16,7 +16,7 @@ if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 endif()
 
 
-project(exhale VERSION 1.0.4 LANGUAGES CXX)
+project(exhale VERSION 1.0.5 LANGUAGES CXX)
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE Release
@@ -35,6 +35,9 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS_DEBUG "/WX /D_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
 else()
     set(CMAKE_CXX_FLAGS "-Wall -Wshadow ${CMAKE_CXX_FLAGS}")
+    if(WIN32 AND MINGW)
+        set(CMAKE_CXX_FLAGS "-municode ${CMAKE_CXX_FLAGS}")
+    endif()
     set(CMAKE_CXX_FLAGS_RELEASE "-Wuninitialized ${CMAKE_CXX_FLAGS_RELEASE}")
     set(CMAKE_CXX_FLAGS_DEBUG "-Werror -D_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
 endif()

include/Release.htm

@@ -25,9 +25,16 @@
 <td valign="top">
 
 <h1><br><span class="pink">exhale</span> - <span class="pink">e</span>codis e<span class="pink">x</span>tended <span class="pink">h</span>igh-efficiency <span class="pink">a</span>nd <span class="pink">l</span>ow-complexity <span class="pink">e</span>ncoder<br><span class="gray"><sup><br>Software Release Notes, Version History, Known Issues, Upcoming Feature Roadmap</sup></span><br><br></h1>
-<h3>&nbsp; &nbsp;The version of this distribution of the &laquo;exhale&raquo; software release is <b>1.0.4</b> (official pub&shy;lic minor release) from May 30, 2020. Please check <a href="http://www.ecodis.de">www.ecodis.de</a> regularly for new versions of this software. A summary of each version up to this release, a list of known issues with this release, and a roadmap of additional functionality are provided below.</h3>
+<h3>&nbsp; &nbsp;The version of this distribution of the &laquo;exhale&raquo; software release is <b>1.0.5</b> (official pub&shy;lic minor release) from June 30, 2020. Please check <a href="http://www.ecodis.de">www.ecodis.de</a> regularly for new versions of this software. A summary of each version up to this release, a list of known issues with this release, and a roadmap of additional functionality are provided below.</h3>
 <h3><br><b>Chronological Version History</b></h3>
-<h3>&nbsp; &nbsp;Version <b>1.0.4 <span class="gray">&nbsp;May 2020, this release</span></b></h3>
+<h3>&nbsp; &nbsp;Version <b>1.0.5 <span class="gray">&nbsp;June 2020, this release</span></b></h3>
+<ul>
+ <li><h3>slightly reduced bit-rates with lower modes, better compatibility when using stdin</h3></li>
+ <li><h3>exhaleApp: support for Unicode text on Windows&trade;, 44100 Hz with CVBR mode 1</h3></li>
+ <li><h3>exhaleApp: automatic upsampling of low-sample-rate input, better WAVE reading</h3></li>
+ <li><h3>exhaleLib: optimized noise filling tool for slightly lower bit-rates at CVBR mode &lt;4</h3></li>
+</ul>
+<h3>&nbsp; &nbsp;Version <b>1.0.4 <span class="gray">&nbsp;May 2020</span></b></h3>
 <ul>
  <li><h3>finalized basic joint-stereo and TNS coding functionality, quality and stability fixes</h3></li>
  <li><h3>exhaleApp: support for 32000 Hz with CVBR mode 1, added '-v' version command</h3></li>
@@ -77,13 +84,12 @@
 <h3>&nbsp; &nbsp;If you are in need of an additional library or application feature <b>not</b> mentioned below, please contact ecodis or a contributor with a request, and we will see what we can do.</h3>
 <ul>
  <li><h3>support for coding with a core coder frame length of 768 samples, no version plan</h3></li>
- <li><h3>exhaleLib: completed integration of predictive joint-channel coding, version 1.0.5</h3></li>
- <li><h3>exhaleLib: automatic input downsampling for CVBR modes 1 and 2, version 1.0.5</h3></li>
- <li><h3>exhaleLib: finalization of support for 3.0 &#x2013; 5.1 multichannel coding, version 1.0.5</h3></li>
+ <li><h3>exhaleLib: completed integration of predictive joint-channel coding, version 1.0.6</h3></li>
+ <li><h3>exhaleLib: finalization of support for 3.0 &#x2013; 5.1 multichannel coding, no version plan</h3></li>
  <li><h3>exhaleLib: speed-ups and further quality tuning for difficult signals, as necessary.</h3></li>
 </ul>
 <h3><br></h3>
-<h4><span class="gray">Written by C. R. Helmrich for exhale 1.0.4, May 2020. Available at www.ecodis.de/exhale/release.htm.</span><br><br></h4>
+<h4><span class="gray">Written by C. R. Helmrich for exhale 1.0.5, June 2020. Available at www.ecodis.de/exhale/release.htm.</span><br><br></h4>
 
 </td>
 <td valign="top" colspan="2">

include/version.h

@@ -15,5 +15,5 @@
 # define EXHALELIB_VERSION_MINOR "0"
 #endif
 #ifndef EXHALELIB_VERSION_BUGFIX
-# define EXHALELIB_VERSION_BUGFIX ".4" // "RC" or ".0", ".1", ...
+# define EXHALELIB_VERSION_BUGFIX ".5" // "RC" or ".0", ".1", ...
 #endif

src/app/exhaleApp.cpp

@@ -30,7 +30,7 @@
 #include <share.h>
 #endif
 
-#if defined (_MSC_VER) || defined (__INTEL_COMPILER) // || defined (__GNUC__) || defined (__MINGW32__)
+#if defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__) // || defined (__GNUC__)
 #define EXHALE_APP_WCHAR
 #define _SOPENS _wsopen_s
 #else
@@ -54,6 +54,9 @@
 
 // main routine
 #ifdef EXHALE_APP_WCHAR
+# ifdef __MINGW32__
+extern "C"
+# endif
 int wmain (const int argc, wchar_t* argv[])
 #else
 int main (const int argc, char* argv[])

src/app/exhaleApp.rc

@@ -13,7 +13,7 @@
 
 0 ICON "exhaleApp.ico"
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,0,4
+FILEVERSION 1,0,5
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN

src/lib/specGapFilling.cpp

@@ -42,7 +42,7 @@ uint8_t SpecGapFiller::getSpecGapFillParams (const SfbQuantizer& sfbQuantizer, c
   const uint16_t       sfbsPerGrp = grpData.sfbsPerGroup;
   const uint16_t       windowNfso = noiseFillingStartOffset[grpData.numWindowGroups == 1 ? 0 : 1][nSamplesInFrame >> 10];
   const bool saveRate = (samplingRate >= sampRateBitSave);
-  uint8_t scaleFacLim = 0; // limit range of scale factors
+  uint8_t scaleFacLim = 0; // limit range
   uint16_t u = 0;
   short diff = 0, s = 0;
   double    magnSum = 0.0;
@@ -216,7 +216,7 @@ uint8_t SpecGapFiller::getSpecGapFillParams (const SfbQuantizer& sfbQuantizer, c
 
           if ((samplingRate <= 32000) && (b < m_1stGapFillSfb + 4)) // lower mid-freq. noise
           {
-            grpScFacs[b] = __max (1, grpScFacs[b] - int ((m_1stGapFillSfb + 4 - b) << 1));
+            grpScFacs[b] = __max (0, grpScFacs[b] - int ((m_1stGapFillSfb + 4 - b) * (grpScFacs[b] >> 6)));
           }
           if (grpScFacs[b] > scaleFacLim) grpScFacs[b] = scaleFacLim;
         }

src/makefile.base

@@ -57,6 +57,9 @@ RELEASE_CPPFLAGS  = -O3 -Wuninitialized
 
 ## specification of linker flags
 ALL_LDFLAGS       = -Wall $(ADDITIONAL_LDFLAGS)
+ifeq ($(OS), Windows_NT)
+  ALL_LDFLAGS+=-municode
+endif
 
 # setting of 32-bit linker flags
 ifeq ($(MM32), 1)