mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
rename org simle-rtmp-server to ossrs
This commit is contained in:
commit
01c46bdbfd
252 changed files with 985 additions and 985 deletions
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
|
||||
Copyright (c) 2013-2015 SRS(ossrs)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
|
@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <srs_protocol_utility.hpp>
|
||||
#include <srs_rtmp_handshake.hpp>
|
||||
|
||||
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
|
||||
// for srs-librtmp, @see https://github.com/ossrs/srs/issues/213
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
@ -937,7 +937,7 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg)
|
|||
SrsChunkStream* chunk = NULL;
|
||||
|
||||
// use chunk stream cache to get the chunk info.
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/249
|
||||
// @see https://github.com/ossrs/srs/issues/249
|
||||
if (cid < SRS_PERF_CHUNK_STREAM_CACHE) {
|
||||
// chunk stream cache hit.
|
||||
srs_verbose("cs-cache hit, cid=%d", cid);
|
||||
|
@ -1148,7 +1148,7 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
|
|||
// 0x04 where: message_type=4(protocol control user-control message)
|
||||
// 0x00 0x06 where: event Ping(0x06)
|
||||
// 0x00 0x00 0x0d 0x0f where: event data 4bytes ping timestamp.
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/98
|
||||
// @see: https://github.com/ossrs/srs/issues/98
|
||||
if (chunk->cid == RTMP_CID_ProtocolControl && fmt == RTMP_FMT_TYPE1) {
|
||||
srs_warn("accept cid=2, fmt=1 to make librtmp happy.");
|
||||
} else {
|
||||
|
@ -1318,7 +1318,7 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
|
|||
pp[0] = *p++;
|
||||
|
||||
// always use 31bits timestamp, for some server may use 32bits extended timestamp.
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/111
|
||||
// @see https://github.com/ossrs/srs/issues/111
|
||||
timestamp &= 0x7fffffff;
|
||||
|
||||
/**
|
||||
|
@ -1508,12 +1508,12 @@ int SrsProtocol::on_recv_message(SrsCommonMessage* msg)
|
|||
|
||||
// for some server, the actual chunk size can greater than the max value(65536),
|
||||
// so we just warning the invalid chunk size, and actually use it is ok,
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/160
|
||||
// @see: https://github.com/ossrs/srs/issues/160
|
||||
if (pkt->chunk_size < SRS_CONSTS_RTMP_MIN_CHUNK_SIZE
|
||||
|| pkt->chunk_size > SRS_CONSTS_RTMP_MAX_CHUNK_SIZE)
|
||||
{
|
||||
srs_warn("accept chunk size %d, but should in [%d, %d], "
|
||||
"@see: https://github.com/simple-rtmp-server/srs/issues/160",
|
||||
"@see: https://github.com/ossrs/srs/issues/160",
|
||||
pkt->chunk_size, SRS_CONSTS_RTMP_MIN_CHUNK_SIZE,
|
||||
SRS_CONSTS_RTMP_MAX_CHUNK_SIZE);
|
||||
}
|
||||
|
@ -1888,7 +1888,7 @@ int SrsHandshakeBytes::create_s0s1s2(const char* c1)
|
|||
}
|
||||
|
||||
// if c1 specified, copy c1 to s2.
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/46
|
||||
// @see: https://github.com/ossrs/srs/issues/46
|
||||
if (c1) {
|
||||
memcpy(s0s1s2 + 1537, c1, 1536);
|
||||
}
|
||||
|
@ -2084,7 +2084,7 @@ int SrsRtmpClient::connect_app2(
|
|||
}
|
||||
pkt->command_object->set("objectEncoding", SrsAmf0Any::number(0));
|
||||
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/160
|
||||
// @see https://github.com/ossrs/srs/issues/160
|
||||
// the debug_srs_upnode is config in vhost and default to true.
|
||||
if (debug_srs_upnode && req && req->args) {
|
||||
srs_freep(pkt->args);
|
||||
|
@ -2641,7 +2641,7 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
|
|||
}
|
||||
// call msg,
|
||||
// support response null first,
|
||||
// @see https://github.com/simple-rtmp-server/srs/issues/106
|
||||
// @see https://github.com/ossrs/srs/issues/106
|
||||
// TODO: FIXME: response in right way, or forward in edge mode.
|
||||
SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
|
||||
if (call) {
|
||||
|
@ -2733,7 +2733,7 @@ int SrsRtmpServer::start_play(int stream_id)
|
|||
SrsSampleAccessPacket* pkt = new SrsSampleAccessPacket();
|
||||
|
||||
// allow audio/video sample.
|
||||
// @see: https://github.com/simple-rtmp-server/srs/issues/49
|
||||
// @see: https://github.com/ossrs/srs/issues/49
|
||||
pkt->audio_sample_access = true;
|
||||
pkt->video_sample_access = true;
|
||||
|
||||
|
@ -3164,7 +3164,7 @@ int SrsConnectAppPacket::decode(SrsBuffer* stream)
|
|||
if (!stream->empty()) {
|
||||
srs_freep(args);
|
||||
|
||||
// see: https://github.com/simple-rtmp-server/srs/issues/186
|
||||
// see: https://github.com/ossrs/srs/issues/186
|
||||
// the args maybe any amf0, for instance, a string. we should drop if not object.
|
||||
SrsAmf0Any* any = NULL;
|
||||
if ((ret = SrsAmf0Any::discovery(stream, &any)) != ERROR_SUCCESS) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue