external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-04-09 07:20:57 +08:00
commit 263ead07f0
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -186,6 +186,7 @@ Other documents:
> Remark: About the milestone and product plan, please read ([CN][v1_CN_Product], [EN][v1_EN_Product]) wiki. > Remark: About the milestone and product plan, please read ([CN][v1_CN_Product], [EN][v1_EN_Product]) wiki.
<a name="history"></a> <a name="history"></a>
<a name="changes"></a>
<a name="change-logs"></a> <a name="change-logs"></a>
## V5 changes ## V5 changes

2
trunk/3rdparty/st-srs/io.c vendored
View file

@ -112,7 +112,7 @@ int _st_io_init(void)
/** /**
* by SRS, for osx. * by SRS, for osx.
* when rlimit max is negative, for example, osx, use cur directly. * when rlimit max is negative, for example, osx, use cur directly.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/336 * @see https://github.com/ossrs/srs/issues/336
*/ */
if ((int)rlim.rlim_max < 0) { if ((int)rlim.rlim_max < 0) {
_st_osfd_limit = (int)(fdlim > 0? fdlim : rlim.rlim_cur); _st_osfd_limit = (int)(fdlim > 0? fdlim : rlim.rlim_cur);

14
trunk/research/players/srs_player/src/HlsNetStream.as
View file

@ -1369,7 +1369,7 @@ class SrsTsHanlder implements ISrsTsHandler
private function write_h264_ipb_frame(ibps:ByteArray, frame_type:uint, dts:uint, pts:uint, piece:ByteArray):void private function write_h264_ipb_frame(ibps:ByteArray, frame_type:uint, dts:uint, pts:uint, piece:ByteArray):void
{ {
// when sps or pps not sent, ignore the packet. // when sps or pps not sent, ignore the packet.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/203 // @see https://github.com/ossrs/srs/issues/203
if (video_sh_tag.length == 0) { if (video_sh_tag.length == 0) {
return; return;
} }
@ -2197,7 +2197,7 @@ class SrsRawAacStream
// decode the ADTS. // decode the ADTS.
// @see aac-iso-13818-7.pdf, page 26 // @see aac-iso-13818-7.pdf, page 26
// 6.2 Audio Data Transport Stream, ADTS // 6.2 Audio Data Transport Stream, ADTS
// @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64145885 // @see https://github.com/ossrs/srs/issues/212#issuecomment-64145885
// byte_alignment() // byte_alignment()
// adts_fixed_header: // adts_fixed_header:
@ -2260,7 +2260,7 @@ class SrsRawAacStream
var channel_configuration:uint = (sfiv >> 6) & 0x07; var channel_configuration:uint = (sfiv >> 6) & 0x07;
/*int8_t original = (sfiv >> 5) & 0x01;*/ /*int8_t original = (sfiv >> 5) & 0x01;*/
/*int8_t home = (sfiv >> 4) & 0x01;*/ /*int8_t home = (sfiv >> 4) & 0x01;*/
//int8_t Emphasis; @remark, Emphasis is removed, @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64154736 //int8_t Emphasis; @remark, Emphasis is removed, @see https://github.com/ossrs/srs/issues/212#issuecomment-64154736
// 4bits left. // 4bits left.
// adts_variable_header(), 1.A.2.2.2 Variable Header of ADTS // adts_variable_header(), 1.A.2.2.2 Variable Header of ADTS
// copyright_identification_bit 1 bslbf // copyright_identification_bit 1 bslbf
@ -2357,7 +2357,7 @@ class SrsRawAacStream
var samplingFrequencyIndex:uint = codec.sampling_frequency_index; var samplingFrequencyIndex:uint = codec.sampling_frequency_index;
// override the aac samplerate by user specified. // override the aac samplerate by user specified.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64146899 // @see https://github.com/ossrs/srs/issues/212#issuecomment-64146899
switch (codec.sound_rate) { switch (codec.sound_rate) {
case SrsConsts.SrsCodecAudioSampleRate11025: case SrsConsts.SrsCodecAudioSampleRate11025:
samplingFrequencyIndex = 0x0a; break; samplingFrequencyIndex = 0x0a; break;
@ -2478,7 +2478,7 @@ class SrsEnum
/** /**
* the aac profile, for ADTS(HLS/TS) * the aac profile, for ADTS(HLS/TS)
* @see https://github.com/winlinvip/simple-rtmp-server/issues/310 * @see https://github.com/ossrs/srs/issues/310
*/ */
class SrsAacProfile extends SrsEnum class SrsAacProfile extends SrsEnum
{ {
@ -3697,7 +3697,7 @@ class SrsTsAdaptationField
// @remark, for as, should never shift the Number object. // @remark, for as, should never shift the Number object.
// @remark, use pcr base and ignore the extension // @remark, use pcr base and ignore the extension
// @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370 // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370
// first 33bits is pcr base. // first 33bits is pcr base.
program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe; program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe;
var ch:uint = stream.readUnsignedByte(); var ch:uint = stream.readUnsignedByte();
@ -3715,7 +3715,7 @@ class SrsTsAdaptationField
} }
// @remark, for as, should never shift the Number object. // @remark, for as, should never shift the Number object.
// @remark, use pcr base and ignore the extension // @remark, use pcr base and ignore the extension
// @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370 // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370
// first 33bits is pcr base. // first 33bits is pcr base.
original_program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe; original_program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe;
ch = stream.readUnsignedByte(); ch = stream.readUnsignedByte();

2
trunk/scripts/git.commit.sh
View file

@ -45,7 +45,7 @@ function remote_check()
ok_msg "remote $remote ok, url is $url" ok_msg "remote $remote ok, url is $url"
} }
remote_check origin git@github.com:ossrs/srs.git remote_check origin git@github.com:ossrs/srs.git
remote_check srs.winlin git@github.com:winlinvip/simple-rtmp-server.git remote_check srs.winlin git@github.com:winlinvip/srs.git
remote_check srs.csdn git@code.csdn.net:winlinvip/srs-csdn.git remote_check srs.csdn git@code.csdn.net:winlinvip/srs-csdn.git
remote_check srs.oschina git@git.oschina.net:winlinvip/srs.oschina.git remote_check srs.oschina git@git.oschina.net:winlinvip/srs.oschina.git
remote_check srs.gitlab git@gitlab.com:winlinvip/srs-gitlab.git remote_check srs.gitlab git@gitlab.com:winlinvip/srs-gitlab.git