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

Refactor code

Browse source
This commit is contained in:
winlin 2020-04-21 12:18:49 +08:00
parent 511cf65ec8
commit 74800d0137
5 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_config.cpp
View file

@ -4747,7 +4747,8 @@ int SrsConfig::get_rtc_server_sendmmsg()
return DEFAULT; return DEFAULT;
} }
return ::atoi(conf->arg0().c_str()); int v = ::atoi(conf->arg0().c_str());
return srs_max(1, v);
#endif #endif
} }

9
trunk/src/app/srs_app_config.hpp
View file

@ -528,17 +528,14 @@ public:
virtual int get_rtc_server_sendmmsg(); virtual int get_rtc_server_sendmmsg();
virtual bool get_rtc_server_encrypt(); virtual bool get_rtc_server_encrypt();
virtual int get_rtc_server_reuseport(); virtual int get_rtc_server_reuseport();
private:
virtual int get_rtc_server_reuseport2();
public:
virtual bool get_rtc_server_merge_nalus(); virtual bool get_rtc_server_merge_nalus();
virtual bool get_rtc_server_gso(); virtual bool get_rtc_server_gso();
private:
virtual bool get_rtc_server_gso2();
public:
virtual int get_rtc_server_padding(); virtual int get_rtc_server_padding();
virtual bool get_rtc_server_perf_stat(); virtual bool get_rtc_server_perf_stat();
virtual int get_rtc_server_queue_length(); virtual int get_rtc_server_queue_length();
private:
virtual int get_rtc_server_reuseport2();
virtual bool get_rtc_server_gso2();
public: public:
SrsConfDirective* get_rtc(std::string vhost); SrsConfDirective* get_rtc(std::string vhost);

4
trunk/src/app/srs_app_conn.cpp
View file

@ -103,7 +103,7 @@ srs_error_t SrsConnection::set_tcp_nodelay(bool v)
int iv = (v? 1:0); int iv = (v? 1:0);
if ((r0 = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &iv, nb_v)) != 0) { if ((r0 = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &iv, nb_v)) != 0) {
return srs_error_new(ERROR_SOCKET_NO_NODELAY, "setsockopt fd=%d, r0=%v", fd, r0); return srs_error_new(ERROR_SOCKET_NO_NODELAY, "setsockopt fd=%d, r0=%d", fd, r0);
} }
if ((r0 = getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &iv, &nb_v)) != 0) { if ((r0 = getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &iv, &nb_v)) != 0) {
return srs_error_new(ERROR_SOCKET_NO_NODELAY, "getsockopt fd=%d, r0=%d", fd, r0); return srs_error_new(ERROR_SOCKET_NO_NODELAY, "getsockopt fd=%d, r0=%d", fd, r0);
@ -155,7 +155,7 @@ srs_error_t SrsConnection::set_socket_buffer(srs_utime_t buffer_v)
// set the socket send buffer when required larger buffer // set the socket send buffer when required larger buffer
if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &iv, nb_v) < 0) { if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &iv, nb_v) < 0) {
return srs_error_new(ERROR_SOCKET_SNDBUF, "setsockopt fd=%d, r0=%v", fd, r0); return srs_error_new(ERROR_SOCKET_SNDBUF, "setsockopt fd=%d, r0=%d", fd, r0);
} }
if ((r0 = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &iv, &nb_v)) != 0) { if ((r0 = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &iv, &nb_v)) != 0) {
return srs_error_new(ERROR_SOCKET_SNDBUF, "getsockopt fd=%d, r0=%d", fd, r0); return srs_error_new(ERROR_SOCKET_SNDBUF, "getsockopt fd=%d, r0=%d", fd, r0);

2
trunk/src/kernel/srs_kernel_file.cpp
View file

@ -296,7 +296,7 @@ srs_error_t SrsFileReader::lseek(off_t offset, int whence, off_t* seeked)
{ {
off_t sk = _srs_lseek_fn(fd, offset, whence); off_t sk = _srs_lseek_fn(fd, offset, whence);
if (sk < 0) { if (sk < 0) {
return srs_error_new(ERROR_SYSTEM_FILE_SEEK, "seek %v failed", (int)sk); return srs_error_new(ERROR_SYSTEM_FILE_SEEK, "seek %d failed", (int)sk);
} }
if (seeked) { if (seeked) {

10
trunk/src/kernel/srs_kernel_mp4.cpp
View file

@ -510,7 +510,7 @@ srs_error_t SrsMp4Box::encode_header(SrsBuffer* buf)
int lrsz = nb_header() - SrsMp4Box::nb_header(); int lrsz = nb_header() - SrsMp4Box::nb_header();
if (!buf->require(lrsz)) { if (!buf->require(lrsz)) {
return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "box requires %v only %d bytes", lrsz, buf->left()); return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "box requires %d only %d bytes", lrsz, buf->left());
} }
return err; return err;
@ -3602,19 +3602,19 @@ srs_error_t SrsMp4ES_Descriptor::decode_payload(SrsBuffer* buf)
if (streamDependenceFlag) { if (streamDependenceFlag) {
if (!buf->require(2)) { if (!buf->require(2)) {
return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "ES requires 2 only %v bytes", buf->left()); return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "ES requires 2 only %d bytes", buf->left());
} }
dependsOn_ES_ID = buf->read_2bytes(); dependsOn_ES_ID = buf->read_2bytes();
} }
if (URL_Flag) { if (URL_Flag) {
if (!buf->require(1)) { if (!buf->require(1)) {
return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "URLlength requires 1 only %v bytes", buf->left()); return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "URLlength requires 1 only %d bytes", buf->left());
} }
uint8_t URLlength = buf->read_1bytes(); uint8_t URLlength = buf->read_1bytes();
if (!buf->require(URLlength)) { if (!buf->require(URLlength)) {
return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "URL requires %d only %v bytes", URLlength, buf->left()); return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "URL requires %d only %d bytes", URLlength, buf->left());
} }
URLstring.resize(URLlength); URLstring.resize(URLlength);
buf->read_bytes(&URLstring[0], URLlength); buf->read_bytes(&URLstring[0], URLlength);
@ -3622,7 +3622,7 @@ srs_error_t SrsMp4ES_Descriptor::decode_payload(SrsBuffer* buf)
if (OCRstreamFlag) { if (OCRstreamFlag) {
if (!buf->require(2)) { if (!buf->require(2)) {
return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "OCR requires 2 only %v bytes", buf->left()); return srs_error_new(ERROR_MP4_BOX_REQUIRE_SPACE, "OCR requires 2 only %d bytes", buf->left());
} }
OCR_ES_Id = buf->read_2bytes(); OCR_ES_Id = buf->read_2bytes();
} }