external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.

Browse source
This commit is contained in:
winlin 2015-03-08 17:36:43 +08:00
parent d3e2838fc6
commit 8dbabe3708
4 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -550,6 +550,7 @@ Supported operating systems and hardware:
### SRS 2.0 history ### SRS 2.0 history
* v2.0, 2015-03-08, fix [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), refine aac LC, support aac HE/HEv2. 2.0.134.
* v2.0, 2015-03-06, for [#322](https://github.com/winlinvip/simple-rtmp-server/issues/322), fix http-flv stream bug, support multiple streams. 2.0.133. * v2.0, 2015-03-06, for [#322](https://github.com/winlinvip/simple-rtmp-server/issues/322), fix http-flv stream bug, support multiple streams. 2.0.133.
* v2.0, 2015-03-06, refine http request parse. 2.0.132. * v2.0, 2015-03-06, refine http request parse. 2.0.132.
* v2.0, 2015-03-01, for [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179), revert dvr http api. 2.0.128. * v2.0, 2015-03-01, for [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179), revert dvr http api. 2.0.128.

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 133 #define VERSION_REVISION 134
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

14
trunk/src/kernel/srs_kernel_codec.cpp
View file

@ -87,6 +87,18 @@ string srs_codec_aac_profile2str(SrsAacProfile aac_profile)
} }
} }
string srs_codec_aac_object2str(SrsAacObjectType aac_object)
{
switch (aac_object) {
case SrsAacObjectTypeAacMain: return "Main";
case SrsAacObjectTypeHE: return "HE";
case SrsAacObjectTypeHEV2: return "HEv2";
case SrsAacObjectTypeAacLC: return "LC";
case SrsAacObjectTypeAacSSR: return "SSR";
default: return "Other";
}
}
SrsAacObjectType srs_codec_aac_ts2rtmp(SrsAacProfile profile) SrsAacObjectType srs_codec_aac_ts2rtmp(SrsAacProfile profile)
{ {
switch (profile) { switch (profile) {
@ -101,6 +113,8 @@ SrsAacProfile srs_codec_aac_rtmp2ts(SrsAacObjectType object_type)
{ {
switch (object_type) { switch (object_type) {
case SrsAacObjectTypeAacMain: return SrsAacProfileMain; case SrsAacObjectTypeAacMain: return SrsAacProfileMain;
case SrsAacObjectTypeHE:
case SrsAacObjectTypeHEV2:
case SrsAacObjectTypeAacLC: return SrsAacProfileLC; case SrsAacObjectTypeAacLC: return SrsAacProfileLC;
case SrsAacObjectTypeAacSSR: return SrsAacProfileSSR; case SrsAacObjectTypeAacSSR: return SrsAacProfileSSR;
default: return SrsAacProfileReserved; default: return SrsAacProfileReserved;

6
trunk/src/kernel/srs_kernel_codec.hpp
View file

@ -404,7 +404,13 @@ enum SrsAacObjectType
SrsAacObjectTypeAacMain = 1, SrsAacObjectTypeAacMain = 1,
SrsAacObjectTypeAacLC = 2, SrsAacObjectTypeAacLC = 2,
SrsAacObjectTypeAacSSR = 3, SrsAacObjectTypeAacSSR = 3,
// AAC HE = LC+SBR
SrsAacObjectTypeHE = 5,
// AAC HEv2 = LC+SBR+PS
SrsAacObjectTypeHEV2 = 29,
}; };
std::string srs_codec_aac_object2str(SrsAacObjectType aac_object);
// ts/hls/adts audio header profile to RTMP sequence header object type. // ts/hls/adts audio header profile to RTMP sequence header object type.
SrsAacObjectType srs_codec_aac_ts2rtmp(SrsAacProfile profile); SrsAacObjectType srs_codec_aac_ts2rtmp(SrsAacProfile profile);
// RTMP sequence header object type to ts/hls/adts audio header profile. // RTMP sequence header object type to ts/hls/adts audio header profile.