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 #266, aac profile is object id plus one. 2.0.80

Browse source
This commit is contained in:
winlin 2014-12-29 14:24:22 +08:00
parent c0a6c3efa3
commit 12f4abd553
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -501,6 +501,7 @@ Supported operating systems and hardware:
* 2013-10-17, Created.<br/> * 2013-10-17, Created.<br/>
## History ## History
* v2.0, 2014-12-12, fix [#266](https://github.com/winlinvip/simple-rtmp-server/issues/266), aac profile is object id plus one. 2.0.80
* v2.0, 2014-12-29, hotfix [#267](https://github.com/winlinvip/simple-rtmp-server/issues/267), the forward dest ep should use server. 2.0.79 * v2.0, 2014-12-29, hotfix [#267](https://github.com/winlinvip/simple-rtmp-server/issues/267), the forward dest ep should use server. 2.0.79
* v2.0, 2014-12-29, hotfix [#268](https://github.com/winlinvip/simple-rtmp-server/issues/268), the hls pcr is negative when startup. 2.0.78 * v2.0, 2014-12-29, hotfix [#268](https://github.com/winlinvip/simple-rtmp-server/issues/268), the hls pcr is negative when startup. 2.0.78
* v2.0, 2014-12-22, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), ignore NALU when sequence header to make HLS happy. 2.0.76 * v2.0, 2014-12-22, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), ignore NALU when sequence header to make HLS happy. 2.0.76

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 79 #define VERSION_REVISION 80
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_ROLE "origin/edge server"

7
trunk/src/libs/srs_librtmp.cpp
View file

@ -1065,10 +1065,15 @@ int __srs_write_aac_adts_frames(Context* context,
return ERROR_AAC_ADTS_HEADER; return ERROR_AAC_ADTS_HEADER;
} }
// the profile = object_id + 1
// @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 78,
// Table 1. A.9 – MPEG-2 Audio profiles and MPEG-4 Audio object types
char aac_profile = fh_Profile_ObjectType + 1;
char* raw_data = stream->data() + stream->pos(); char* raw_data = stream->data() + stream->pos();
if ((ret = __srs_write_aac_adts_frame(context, if ((ret = __srs_write_aac_adts_frame(context,
sound_format, sound_rate, sound_size, sound_type, sound_format, sound_rate, sound_size, sound_type,
fh_Profile_ObjectType, fh_sampling_frequency_index, fh_channel_configuration, aac_profile, fh_sampling_frequency_index, fh_channel_configuration,
raw_data, raw_data_size, timestamp)) != ERROR_SUCCESS raw_data, raw_data_size, timestamp)) != ERROR_SUCCESS
) { ) {
return ret; return ret;