RIO-8834: AAC lib - Fix for random crash under certain test condition

Change-Id: I8c801c46d42e144fc874e40899c4e29d3ca9b51e

diff --git a/codecs_v2/audio/aac/dec/src/get_cce.h b/codecs_v2/audio/aac/dec/src/get_cce.h
index 51fe26b..0fe23d6 100644 (file)
--- a/codecs_v2/audio/aac/dec/src/get_cce.h
+++ b/codecs_v2/audio/aac/dec/src/get_cce.h
@@ -17,18 +17,12 @@
  */
 /*
 
- Pathname: get_dse.h
+ Filename: get_cce.h
  Funtions:
-    get_dse
+    get_cce
 
 
 ------------------------------------------------------------------------------
- REVISION HISTORY
-
-
- Who:                                   Date: MM/DD/YYYY
- Description:
-------------------------------------------------------------------------------
 
 */
 
@@ -41,8 +35,8 @@
 /*----------------------------------------------------------------------------
 ; INCLUDES
 ----------------------------------------------------------------------------*/
-#include    "s_tdec_int_file.h"
-#include    "s_tdec_int_chan.h"
+#include "s_tdec_int_file.h"
+#include "s_tdec_int_chan.h"
 #include "pv_audio_type_defs.h"
 #include "s_elelist.h"
 #include "s_bits.h"

diff --git a/codecs_v2/audio/aac/dec/src/huffspec_fxp.cpp b/codecs_v2/audio/aac/dec/src/huffspec_fxp.cpp
index ee58948..ae9ff5b 100644 (file)
--- a/codecs_v2/audio/aac/dec/src/huffspec_fxp.cpp
+++ b/codecs_v2/audio/aac/dec/src/huffspec_fxp.cpp
@@ -542,7 +542,8 @@ Int huffspec_fxp(
         {
             sfbWidth   =  pFrameInfo->win_sfb_top[0][sfb] - stop_idx;
 
-            if ((sfbWidth < 0) || (sfbWidth > 1024))
+            /* sfbWidth must be possitive, lesser than 1024 and multiple of 4 */
+            if ((sfbWidth < 0) || (sfbWidth > 1024) || (sfbWidth & 3))
             {
                 return (-1);   /*  error condition */
             }

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 279a28b..a8649c4 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1325571"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1326667"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100316
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 7884154..30e8680 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1325571"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1326667"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100316
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 5eeda0f..3761e4d 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1325571"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1326667"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100316
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED