Decode and SYS lib cleanup

* AAC-Encoder

   - Remove source snippets related to unsupported frame length of 960.
   - Adjust minBits initialization for disabled VBR configuration.
     Modified file(s):
        libAACenc/src/aacenc.h
        libAACenc/src/aacenc_lib.cpp
        libAACenc/src/aacenc_tns.cpp
        libAACenc/src/bandwidth.cpp
        libAACenc/src/psy_const.h
        libAACenc/src/transform.h

   - Revise encoder parameter restrictions: "Error Resilient(ER) AAC Low Complexity"
     is not supported. Where the AAC part of the FDK encoder threw an
     initialization error, now the aacEncoder_SetParam() returns an error
     before initialization if the application tries to configure this
     audio object type.
     Modified file(s):
        libAACenc/src/aacenc_lib.cpp

* SYS-Library

   - Portability fix for Mingw32.
     Modified file(s):
        libSYS/include/machine_type.h

   - Minor changes.
     Modified file(s):
        libSYS/include/wav_file.h
        libSYS/src/wav_file.cpp
        libSYS/src/cmdl_parser.cpp
        libSYS/src/genericStds.cpp

Bug 9428126

Change-Id: I9fa44923d34f033d0dc607f2b85abacb8a85eb61

2 files changed, 26 insertions, 5 deletions

diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h
index e5017ea..4745e43 100644
--- a/libSYS/include/machine_type.h
+++ b/libSYS/include/machine_type.h
@@ -173,7 +173,7 @@ amm-info@iis.fraunhofer.de
 
 
 /* Define 64 bit base integer type. */
-#ifdef _WIN32
+#ifdef _MSC_VER
   typedef __int64 INT64;
   typedef unsigned __int64 UINT64;
 #else
diff --git a/libSYS/include/wav_file.h b/libSYS/include/wav_file.h
index a48634b..2bc43b2 100644
--- a/libSYS/include/wav_file.h
+++ b/libSYS/include/wav_file.h
@@ -111,16 +111,36 @@ amm-info@iis.fraunhofer.de
 extern "C" {
 #endif
 
+#define SPEAKER_FRONT_LEFT             0x1
+#define SPEAKER_FRONT_RIGHT            0x2
+#define SPEAKER_FRONT_CENTER           0x4
+#define SPEAKER_LOW_FREQUENCY          0x8
+#define SPEAKER_BACK_LEFT              0x10
+#define SPEAKER_BACK_RIGHT             0x20
+#define SPEAKER_FRONT_LEFT_OF_CENTER   0x40
+#define SPEAKER_FRONT_RIGHT_OF_CENTER  0x80
+#define SPEAKER_BACK_CENTER            0x100
+#define SPEAKER_SIDE_LEFT              0x200
+#define SPEAKER_SIDE_RIGHT             0x400
+#define SPEAKER_TOP_CENTER             0x800
+#define SPEAKER_TOP_FRONT_LEFT         0x1000
+#define SPEAKER_TOP_FRONT_CENTER       0x2000
+#define SPEAKER_TOP_FRONT_RIGHT        0x4000
+#define SPEAKER_TOP_BACK_LEFT          0x8000
+#define SPEAKER_TOP_BACK_CENTER        0x10000
+#define SPEAKER_TOP_BACK_RIGHT         0x20000
+#define SPEAKER_RESERVED               0x80000000
+
 /*!
  * RIFF WAVE file struct.
  * For details see WAVE file format documentation (for example at http://www.wotsit.org).
  */
 typedef struct WAV_HEADER
 {
-  char  riffType[4];
+  char   riffType[4];
   UINT   riffSize;
-  char  waveType[4];
-  char  formatType[4];
+  char   waveType[4];
+  char   formatType[4];
   UINT   formatSize;
   USHORT compressionCode;
   USHORT numChannels;
@@ -128,7 +148,7 @@ typedef struct WAV_HEADER
   UINT   bytesPerSecond;
   USHORT blockAlign;
   USHORT bitsPerSample;
-  char  dataType[4];
+  char   dataType[4];
   UINT   dataSize;
 } WAV_HEADER;
 
@@ -136,6 +156,7 @@ struct WAV
 {
   WAV_HEADER header;
   FDKFILE *fp;
+  UINT channelMask;
 };
 
 typedef struct WAV *HANDLE_WAV;