external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix #212, support publish aac adts raw stream. 2.0.31.

Browse source
This commit is contained in:
winlin 2014-11-24 16:28:52 +08:00
parent 3d97048c3a
commit e492fa5353
15 changed files with 620 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_avc_aac.cpp
View file

@ -249,9 +249,6 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
return ret;
}
// aac_profile = audioObjectType - 1
aac_profile--;
// TODO: FIXME: to support aac he/he-v2, see: ngx_rtmp_codec_parse_aac_header
// @see: https://github.com/winlinvip/nginx-rtmp-module/commit/3a5f9eea78fc8d11e8be922aea9ac349b9dcbfc2
//

24
trunk/src/app/srs_app_avc_aac.hpp
View file

@ -38,25 +38,6 @@ class SrsAmf0Object;
#define __SRS_SRS_MAX_CODEC_SAMPLE 128
#define __SRS_AAC_SAMPLE_RATE_UNSET 15
/**
* the FLV/RTMP supported audio sample rate.
* Sampling rate. The following values are defined:
* 0 = 5.5 kHz = 5512 Hz
* 1 = 11 kHz = 11025 Hz
* 2 = 22 kHz = 22050 Hz
* 3 = 44 kHz = 44100 Hz
*/
enum SrsCodecAudioSampleRate
{
// set to the max value to reserved, for array map.
SrsCodecAudioSampleRateReserved = 4,
SrsCodecAudioSampleRate5512 = 0,
SrsCodecAudioSampleRate11025 = 1,
SrsCodecAudioSampleRate22050 = 2,
SrsCodecAudioSampleRate44100 = 3,
};
/**
* the FLV/RTMP supported audio sample size.
* Size of each audio sample. This parameter only pertains to
@ -224,8 +205,9 @@ public:
public:
/**
* audio specified
* 1.6.2.1 AudioSpecificConfig, in aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 33.
* audioObjectType, value defines in 7.1 Profiles, aac-iso-13818-7.pdf, page 40.
* audioObjectType, in 1.6.2.1 AudioSpecificConfig, page 33,
* 1.5.1.1 Audio object type definition, page 23,
* in aac-mp4a-format-ISO_IEC_14496-3+2001.pdf.
*/
u_int8_t aac_profile;
/**