mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
migarate from winlinvip to srs org
This commit is contained in:
winlin
parent
b3bd007f0d
commit
115daa3cc1
117 changed files with 323 additions and 323 deletions
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_aac.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
@ -150,7 +150,7 @@ int SrsAacEncoder::write_audio(int64_t timestamp, char* data, int size)
|
|||
// write the ADTS header.
|
||||
// @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 75,
|
||||
// 1.A.2.2 Audio_Data_Transport_Stream frame, ADTS
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64145885
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-64145885
|
||||
// byte_alignment()
|
||||
|
||||
// adts_fixed_header:
|
||||
|
|
|
|||
|
|
@ -584,7 +584,7 @@ int SrsAvcAacCodec::audio_aac_sequence_header_demux(char* data, int size)
|
|||
// 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
|
||||
//
|
||||
// donot force to LC, @see: https://github.com/winlinvip/simple-rtmp-server/issues/81
|
||||
// donot force to LC, @see: https://github.com/simple-rtmp-server/srs/issues/81
|
||||
// the source will print the sequence header info.
|
||||
//if (aac_profile > 3) {
|
||||
// Mark all extended profiles as LC
|
||||
|
|
@ -626,7 +626,7 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
|
|||
sample->frame_type = (SrsCodecVideoAVCFrame)frame_type;
|
||||
|
||||
// ignore info frame without error,
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/288#issuecomment-69863909
|
||||
if (sample->frame_type == SrsCodecVideoAVCFrameVideoInfoFrame) {
|
||||
srs_warn("video codec igone the info frame, ret=%d", ret);
|
||||
return ret;
|
||||
|
|
@ -1152,7 +1152,7 @@ int SrsAvcAacCodec::avc_demux_ibmf_format(SrsStream* stream, SrsCodecSample* sam
|
|||
}
|
||||
|
||||
// maybe stream is invalid format.
|
||||
// see: https://github.com/winlinvip/simple-rtmp-server/issues/183
|
||||
// see: https://github.com/simple-rtmp-server/srs/issues/183
|
||||
if (NALUnitLength < 0) {
|
||||
ret = ERROR_HLS_DECODE_ERROR;
|
||||
srs_error("maybe stream is AnnexB format. ret=%d", ret);
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ enum SrsAvcPayloadFormat
|
|||
|
||||
/**
|
||||
* the aac profile, for ADTS(HLS/TS)
|
||||
* @see https://github.com/winlinvip/simple-rtmp-server/issues/310
|
||||
* @see https://github.com/simple-rtmp-server/srs/issues/310
|
||||
*/
|
||||
enum SrsAacProfile
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
/**
|
||||
* for performance issue,
|
||||
* the iovs cache, @see https://github.com/winlinvip/simple-rtmp-server/issues/194
|
||||
* the iovs cache, @see https://github.com/simple-rtmp-server/srs/issues/194
|
||||
* iovs cache for multiple messages for each connections.
|
||||
* suppose the chunk size is 64k, each message send in a chunk which needs only 2 iovec,
|
||||
* so the iovs max should be (SRS_PERF_MW_MSGS * 2)
|
||||
|
|
@ -110,7 +110,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define SRS_CONSTS_IOVS_MAX (SRS_PERF_MW_MSGS * 2)
|
||||
/**
|
||||
* for performance issue,
|
||||
* the c0c3 cache, @see https://github.com/winlinvip/simple-rtmp-server/issues/194
|
||||
* the c0c3 cache, @see https://github.com/simple-rtmp-server/srs/issues/194
|
||||
* c0c3 cache for multiple messages for each connections.
|
||||
* each c0 <= 16byes, suppose the chunk size is 64k,
|
||||
* each message send in a chunk which needs only a c0 header,
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_core.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#define ERROR_SUCCESS 0
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_file.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_flv.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_mp3.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_ts.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
@ -447,7 +447,7 @@ int SrsTsContext::encode_pes(SrsFileWriter* writer, SrsTsMessage* msg, int16_t p
|
|||
}
|
||||
|
||||
// it's ok to set pcr equals to dts,
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/311
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/311
|
||||
int64_t pcr = write_pcr? msg->dts : -1;
|
||||
|
||||
// TODO: FIXME: finger it why use discontinuity of msg.
|
||||
|
|
@ -956,7 +956,7 @@ int SrsTsAdaptationField::decode(SrsStream* stream)
|
|||
pp[0] = *p++;
|
||||
|
||||
// @remark, use pcr base and ignore the extension
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/250#issuecomment-71349370
|
||||
program_clock_reference_extension = pcrv & 0x1ff;
|
||||
const1_value0 = (pcrv >> 9) & 0x3F;
|
||||
program_clock_reference_base = (pcrv >> 15) & 0x1ffffffffLL;
|
||||
|
|
@ -983,7 +983,7 @@ int SrsTsAdaptationField::decode(SrsStream* stream)
|
|||
pp[0] = *p++;
|
||||
|
||||
// @remark, use pcr base and ignore the extension
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/250#issuecomment-71349370
|
||||
original_program_clock_reference_extension = opcrv & 0x1ff;
|
||||
const1_value2 = (opcrv >> 9) & 0x3F;
|
||||
original_program_clock_reference_base = (opcrv >> 15) & 0x1ffffffffLL;
|
||||
|
|
@ -1163,7 +1163,7 @@ int SrsTsAdaptationField::encode(SrsStream* stream)
|
|||
stream->skip(6);
|
||||
|
||||
// @remark, use pcr base and ignore the extension
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/250#issuecomment-71349370
|
||||
int64_t pcrv = program_clock_reference_extension & 0x1ff;
|
||||
pcrv |= (const1_value0 << 9) & 0x7E00;
|
||||
pcrv |= (program_clock_reference_base << 15) & 0x1FFFFFFFF000000LL;
|
||||
|
|
@ -3136,7 +3136,7 @@ int SrsTsEncoder::write_video(int64_t timestamp, char* data, int size)
|
|||
}
|
||||
|
||||
// ignore info frame,
|
||||
// @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/288#issuecomment-69863909
|
||||
if (sample->frame_type == SrsCodecVideoAVCFrameVideoInfoFrame) {
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1568,7 +1568,7 @@ public:
|
|||
* for user may need to update the acodec to mp3 or others,
|
||||
* so we use delay write PSI, when write audio or video.
|
||||
* @remark for audio aac codec, for example, SRS1, it's ok to write PSI when open ts.
|
||||
* @see https://github.com/winlinvip/simple-rtmp-server/issues/301
|
||||
* @see https://github.com/simple-rtmp-server/srs/issues/301
|
||||
*/
|
||||
virtual int update_acodec(SrsCodecAudio ac);
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#include <netdb.h>
|
||||
|
|
@ -121,7 +121,7 @@ int64_t srs_update_system_time_ms()
|
|||
return -1;
|
||||
}
|
||||
|
||||
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/35
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/35
|
||||
// we must convert the tv_sec/tv_usec to int64_t.
|
||||
int64_t now_us = ((int64_t)now.tv_sec) * 1000 * 1000 + (int64_t)now.tv_usec;
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ int64_t srs_update_system_time_ms()
|
|||
if (diff < 0 || diff > 1000 * SYS_TIME_RESOLUTION_US) {
|
||||
srs_warn("system time jump, history=%"PRId64"us, now=%"PRId64"us, diff=%"PRId64"us",
|
||||
_srs_system_time_us_cache, now_us, diff);
|
||||
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/109
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/109
|
||||
_srs_system_time_startup_time += diff;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue