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

Refine get_recv_timeout and is_never_timeout in time unit

Browse source
This commit is contained in:
winlin 2019-04-17 08:38:34 +08:00
parent d3dc45f357
commit 5a45fd98c3
9 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/libs/srs_lib_simple_socket.cpp
View file

@ -377,16 +377,16 @@ srs_error_t SimpleSocketStream::read(void* buf, size_t size, ssize_t* nread)
}
// ISrsProtocolReader
void SimpleSocketStream::set_recv_timeout(SrsQueueRecvThread tm)
void SimpleSocketStream::set_recv_timeout(srs_utime_t tm)
{
srs_assert(io);
srs_hijack_io_set_recv_timeout(io, srsu2ms(tm));
}
int64_t SimpleSocketStream::get_recv_timeout()
srs_utime_t SimpleSocketStream::get_recv_timeout()
{
srs_assert(io);
return srs_hijack_io_get_recv_timeout(io);
return srs_hijack_io_get_recv_timeout(io) * SRS_UTIME_MILLISECONDS;
}
int64_t SimpleSocketStream::get_recv_bytes()
@ -425,7 +425,7 @@ srs_error_t SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t*
}
// ISrsProtocolReadWriter
bool SimpleSocketStream::is_never_timeout(int64_t tm)
bool SimpleSocketStream::is_never_timeout(srs_utime_t tm)
{
srs_assert(io);
return srs_hijack_io_is_never_timeout(io, tm);

4
trunk/src/libs/srs_lib_simple_socket.hpp
View file

@ -55,7 +55,7 @@ public:
// ISrsProtocolReader
public:
virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout();
virtual srs_utime_t get_recv_timeout();
virtual int64_t get_recv_bytes();
// ISrsProtocolWriter
public:
@ -65,7 +65,7 @@ public:
virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite);
// ISrsProtocolReadWriter
public:
virtual bool is_never_timeout(int64_t tm);
virtual bool is_never_timeout(srs_utime_t tm);
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
virtual srs_error_t write(void* buf, size_t size, ssize_t* nwrite);
};