From f4b5781650186df70e455218035e7d80ac05c3fb Mon Sep 17 00:00:00 2001
From: PacketVideo CM <engbuild@pv.com>
Date: Thu, 11 Feb 2010 18:47:25 -0800
Subject: [PATCH] RIO-8532: Use config parser information to configure OMX AAC
 component. Still expect to get Port settings changed event in case of
 implicit AAC+ (minor additional change 2)

---
 codecs_v2/omx/omx_aac/src/aac_decode_frame.cpp  | 3 ++-
 codecs_v2/omx/omx_aac/src/omx_aac_component.cpp | 4 +++-
 engines/2way/src/pv_2way_sdkinfo.h              | 4 ++--
 engines/author/src/pv_author_sdkinfo.h          | 4 ++--
 engines/player/src/pv_player_sdkinfo.h          | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/codecs_v2/omx/omx_aac/src/aac_decode_frame.cpp b/codecs_v2/omx/omx_aac/src/aac_decode_frame.cpp
index c9fbd68f..f2f2b02b 100644
--- a/codecs_v2/omx/omx_aac/src/aac_decode_frame.cpp
+++ b/codecs_v2/omx/omx_aac/src/aac_decode_frame.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ OMX_BOOL OmxAacDecoder::AacDecInit(OMX_U32 aDesiredChannels)
 
     oscl_memset(&iExt, 0, sizeof(tPVMP4AudioDecoderExternal));
 
+    aDesiredChannels = 2; // aac decoder outputs 2 channels even in mono case. Keep it that way
     iExt.inputBufferCurrentLength = 0;
     iExt.remainderBits        = 0;      // Not needed anymore.
     iExt.inputBufferMaxLength = PVMP4AUDIODECODER_INBUFSIZE;
diff --git a/codecs_v2/omx/omx_aac/src/omx_aac_component.cpp b/codecs_v2/omx/omx_aac/src/omx_aac_component.cpp
index d5df4bc9..90f555cd 100644
--- a/codecs_v2/omx/omx_aac/src/omx_aac_component.cpp
+++ b/codecs_v2/omx/omx_aac/src/omx_aac_component.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -813,6 +813,8 @@ OMX_ERRORTYPE OpenmaxAacAO::ComponentInit()
     //aac lib init
     if (!iCodecReady)
     {
+        // note: even if the omx port settings were configured to mono (by the IL client), the decoder will still be
+        // configured to output 2 channels (in case of mono, left & right channels will be the same)
         Status = ipAacDec->AacDecInit(ipPorts[OMX_PORT_OUTPUTPORT_INDEX]->AudioPcmMode.nChannels);
         iCodecReady = OMX_TRUE;
     }
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 728f00eb..37195a35 100644
--- 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 "1245024"
-#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100203
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1246016"
+#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100204
 
 #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 8b794a30..9a0cf660 100644
--- 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 "1245024"
-#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100203
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1246016"
+#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100204
 
 #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 80af1002..87e4105e 100644
--- 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 "1245024"
-#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100203
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1246016"
+#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100204
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
-- 
2.11.0