winlin

for #310, the aac profile must be object plus one. 1.0.26

@@ -385,6 +385,7 @@ Supported operating systems and hardware: @@ -385,6 +385,7 @@ Supported operating systems and hardware:
385 385
386 ## History 386 ## History
387 387
  388 +* 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
388 * 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 389 * 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
389 * 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 390 * 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
390 * 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 391 * 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
@@ -247,6 +247,13 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample @@ -247,6 +247,13 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
247 return ret; 247 return ret;
248 } 248 }
249 249
  250 + // the profile = object_id + 1
  251 + // @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 78,
  252 + // Table 1. A.9 ¨C MPEG-2 Audio profiles and MPEG-4 Audio object types
  253 + // so the aac_profile should plus 1, not minus 1, and nginx-rtmp used it to
  254 + // downcast aac SSR to LC.
  255 + // @see https://github.com/winlinvip/simple-rtmp-server/issues/310
  256 + // TODO: FIXME: fix the following in future version.
250 // aac_profile = audioObjectType - 1 257 // aac_profile = audioObjectType - 1
251 aac_profile--; 258 aac_profile--;
252 259
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 1 32 #define VERSION_MAJOR 1
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 25 34 +#define VERSION_REVISION 26
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"