From d5e3ac4e7d830e617a6a503616bd8940928bf0aa Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 10 Feb 2015 17:15:50 +0800
Subject: [PATCH] for #310, the aac profile must be object plus one. 1.0.26

---
 README.md                         | 1 +
 trunk/src/app/srs_app_avc_aac.cpp | 7 +++++++
 trunk/src/core/srs_core.hpp       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 378d76adc..790aa70cd 100755
--- a/README.md
+++ b/README.md
@@ -385,6 +385,7 @@ Supported operating systems and hardware:
 
 ## History
 
+* v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26
 * v1.0, 2015-01-25, hotfix [#268](https://github.com/winlinvip/simple-rtmp-server/issues/268), refine the pcr start at 0, dts/pts plus delay. 1.0.25
 * v1.0, 2015-01-25, hotfix [#151](https://github.com/winlinvip/simple-rtmp-server/issues/151), refine pcr=dts-800ms and use dts/pts directly. 1.0.24
 * v1.0, 2015-01-23, hotfix [#151](https://github.com/winlinvip/simple-rtmp-server/issues/151), use absolutely overflow to make jwplayer happy. 1.0.23
diff --git a/trunk/src/app/srs_app_avc_aac.cpp b/trunk/src/app/srs_app_avc_aac.cpp
index 1611b5819..cfb861eb4 100644
--- a/trunk/src/app/srs_app_avc_aac.cpp
+++ b/trunk/src/app/srs_app_avc_aac.cpp
@@ -247,6 +247,13 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
             return ret;
         }
         
+        // the profile = object_id + 1
+        // @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 78,
+        //      Table 1. A.9 ¨C MPEG-2 Audio profiles and MPEG-4 Audio object types
+        // so the aac_profile should plus 1, not minus 1, and nginx-rtmp used it to 
+        // downcast aac SSR to LC.
+        // @see https://github.com/winlinvip/simple-rtmp-server/issues/310
+        // TODO: FIXME: fix the following in future version.
         // aac_profile = audioObjectType - 1
         aac_profile--;
         
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 9c74cea4a..c16ae0bc7 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       1
 #define VERSION_MINOR       0
-#define VERSION_REVISION    25
+#define VERSION_REVISION    26
 
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"