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

SquashSRS3: Update players

This commit is contained in:
winlin 2021-04-28 15:45:34 +08:00
parent dee4fd404b
commit 7cae97e4d3
4 changed files with 13 additions and 11 deletions

View file

@ -238,6 +238,8 @@ Other important wiki:
## V3 changes ## V3 changes
* <strong>v3.0, 2021-04-28, [3.0 release5(3.0.161)][r3.0r5] released. 122750 lines.</strong>
* v3.0, 2021-04-28, Upgrade players. 3.0.161
* <strong>v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines.</strong> * <strong>v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines.</strong>
* v3.0, 2021-04-24, Package players and console to zip and docker. 3.0.160 * v3.0, 2021-04-24, Package players and console to zip and docker. 3.0.160
* v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159 * v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159
@ -876,6 +878,7 @@ Other important wiki:
## Releases ## Releases
* 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
* 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines. * 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines.
* 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines. * 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines.
* 2020-10-31, [Release v3.0-r2][r3.0r2], 3.0 release2, 3.0.153, 122663 lines. * 2020-10-31, [Release v3.0-r2][r3.0r2], 3.0 release2, 3.0.153, 122663 lines.
@ -1867,6 +1870,7 @@ Winlin
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828
[r3.0r5]: https://github.com/ossrs/srs/releases/tag/v3.0-r5
[r3.0r4]: https://github.com/ossrs/srs/releases/tag/v3.0-r4 [r3.0r4]: https://github.com/ossrs/srs/releases/tag/v3.0-r4
[r3.0r3]: https://github.com/ossrs/srs/releases/tag/v3.0-r3 [r3.0r3]: https://github.com/ossrs/srs/releases/tag/v3.0-r3
[r3.0r2]: https://github.com/ossrs/srs/releases/tag/v3.0-r2 [r3.0r2]: https://github.com/ossrs/srs/releases/tag/v3.0-r2

View file

@ -422,9 +422,7 @@ html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=l
# copy players to nginx html dir. # copy players to nginx html dir.
rm -rf ${SRS_OBJS}/nginx/html/players && rm -rf ${SRS_OBJS}/nginx/html/players &&
ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players
rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
# for favicon.ico # for favicon.ico
rm -rf ${SRS_OBJS}/nginx/html/favicon.ico && rm -rf ${SRS_OBJS}/nginx/html/favicon.ico &&

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();

View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION3_HPP #ifndef SRS_CORE_VERSION3_HPP
#define SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP
#define SRS_VERSION3_REVISION 160 #define SRS_VERSION3_REVISION 161
#endif #endif