From 577fcbb570d023be4cea9564292dd2bd95f40c3b Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 8 Aug 2013 17:32:50 -0700
Subject: 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
---
 libSYS/src/cmdl_parser.cpp |  4 ++--
 libSYS/src/genericStds.cpp |  2 +-
 libSYS/src/wav_file.cpp    | 24 +++++++++++++++---------
 3 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'libSYS/src')

diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp
index ed37d8d..24ec0d5 100644
--- a/libSYS/src/cmdl_parser.cpp
+++ b/libSYS/src/cmdl_parser.cpp
@@ -465,7 +465,7 @@ INT CheckArg(TEXTCHAR* arg, TEXTCHAR* str, UINT numArgs, TEXTCHAR type, TEXTCHAR
 
   for ( i = 0; i < _tcslen(arg); ++i )
     {
-      if ( (type == 'd') && !_istdigit(arg[i]) && arg[i] != 'x' )
+      if ( (type == 'd') && !_istdigit(arg[i]) && arg[i] != 'x' && arg[i] != '-')
         {
 #ifdef _UNICODE
           _ftprintf(stderr, _TEXT("\n\nError: Argument '%ls' for switch '%ls' is not a valid number.\n" ), arg, cur_str);
@@ -549,7 +549,7 @@ int IIS_ProcessCmdlList(const char* param_filename, int (*pFunction)(int, TEXTCH
       /* Skip consecutive blanks. */
       while (*line_ptr == ' ' && line_ptr < line+CMDL_MAX_STRLEN)
         line_ptr++;
-      /* Assign argument. TODO: maybe handle quotes */
+      /* Assign argument. */
       argv_ptr[argc] = line_ptr;
       /* Get pointer to next blank. */
       line_ptr = (char*)FDKstrchr(line_ptr, ' ');
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp
index c4d8d8f..07dd3e3 100644
--- a/libSYS/src/genericStds.cpp
+++ b/libSYS/src/genericStds.cpp
@@ -99,7 +99,7 @@ amm-info@iis.fraunhofer.de
 /* library info */
 #define SYS_LIB_VL0 1
 #define SYS_LIB_VL1 3
-#define SYS_LIB_VL2 0
+#define SYS_LIB_VL2 1
 #define SYS_LIB_TITLE "System Integration Library"
 #define SYS_LIB_BUILD_DATE __DATE__
 #define SYS_LIB_BUILD_TIME __TIME__
diff --git a/libSYS/src/wav_file.cpp b/libSYS/src/wav_file.cpp
index 38b4a37..58bcfaa 100644
--- a/libSYS/src/wav_file.cpp
+++ b/libSYS/src/wav_file.cpp
@@ -174,7 +174,6 @@ INT WAV_InputOpen (HANDLE_WAV *pWav, const char *filename)
           0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
       };
       USHORT extraFormatBytes, validBitsPerSample;
-      UINT channelMask;
       UCHAR guid[16];
       INT i;
 
@@ -184,7 +183,7 @@ INT WAV_InputOpen (HANDLE_WAV *pWav, const char *filename)
 
       if (extraFormatBytes >= 22) {
         FDKfread_EL(&(validBitsPerSample), 2, 1, wav->fp);
-        FDKfread_EL(&(channelMask), 4, 1, wav->fp);
+        FDKfread_EL(&(wav->channelMask), 4, 1, wav->fp);
         FDKfread_EL(&(guid), 16, 1, wav->fp);
 
         /* check for PCM GUID */
@@ -228,12 +227,12 @@ INT WAV_InputOpen (HANDLE_WAV *pWav, const char *filename)
 
     /* Error path */
 error:
-    if (wav->fp) {
-      FDKfclose(wav->fp);
-      wav->fp = NULL;
-    }
 
     if (wav) {
+      if (wav->fp) {
+        FDKfclose(wav->fp);
+        wav->fp = NULL;
+      }
       FDKfree(wav);
     }
 
@@ -388,6 +387,11 @@ INT WAV_OutputOpen(HANDLE_WAV *pWav, const char *outputFilename, INT sampleRate,
   HANDLE_WAV wav = (HANDLE_WAV)FDKcalloc(1, sizeof(struct WAV));
   UINT size = 0;
 
+  if (wav == NULL) {
+    FDKprintfErr("WAV_OutputOpen(): Unable to allocate WAV struct.\n");
+    goto bail;
+  }
+
   if (bitsPerSample != 16 && bitsPerSample != 24 && bitsPerSample != 32)
   {
       FDKprintfErr("WAV_OutputOpen(): Invalid argument (bitsPerSample).\n");
@@ -433,10 +437,12 @@ INT WAV_OutputOpen(HANDLE_WAV *pWav, const char *outputFilename, INT sampleRate,
   return 0;
 
 bail:
-  if (wav->fp)
-    FDKfclose(wav->fp);
-  if (wav)
+  if (wav) {
+    if (wav->fp) {
+      FDKfclose(wav->fp);
+    }
     FDKfree(wav);
+  }
 
   pWav = NULL;
 
-- 
cgit v1.2.3