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

Change the bool to int for C

Browse source
This commit is contained in:
winlin 2017-02-27 17:39:29 +08:00
parent 747d6f2f52
commit 4e96c443d8
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
return ret; return ret;
} }
bool srs_hijack_io_is_never_timeout(srs_hijack_io_t ctx, int64_t tm) int srs_hijack_io_is_never_timeout(srs_hijack_io_t ctx, int64_t tm)
{ {
return tm == SRS_CONSTS_NO_TMMS; return tm == SRS_CONSTS_NO_TMMS;
} }

15
trunk/src/libs/srs_librtmp.hpp
View file

@ -73,16 +73,24 @@ extern "C"{
#endif #endif
/** /**
* the schema of url, now bravo support 4 kinds of url: * The schema of RTMP url, the following are legal urls:
* srs_url_schema_normal: rtmp://vhost:port/app/stream * srs_url_schema_normal: rtmp://vhost:port/app/stream
* srs_url_schema_via : rtmp://ip:port/vhost/app/stream * srs_url_schema_via : rtmp://ip:port/vhost/app/stream
* srs_url_schema_vis : rtmp://ip:port/app/stream?vhost=xxx * srs_url_schema_vis : rtmp://ip:port/app/stream?vhost=xxx
* srs_url_schema_vis2 : rtmp://ip:port/app/stream?domain=xxx * srs_url_schema_vis2 : rtmp://ip:port/app/stream?domain=xxx
*/ */
enum srs_url_schema{ enum srs_url_schema{
// Normal RTMP URL, the vhost put in host field, using DNS to resolve the server ip.
// For example, rtmp://vhost:port/app/stream
srs_url_schema_normal = 0, srs_url_schema_normal = 0,
// VIA(vhost in app), the vhost put in app field.
// For example, rtmp://ip:port/vhost/app/stream
srs_url_schema_via, srs_url_schema_via,
// VIS(vhost in stream), the vhost put in query string, keyword use vhost=xxx.
// For example, rtmp://ip:port/app/stream?vhost=xxx
srs_url_schema_vis, srs_url_schema_vis,
// VIS, keyword use domain=xxx.
// For example, rtmp://ip:port/app/stream?domain=xxx
srs_url_schema_vis2 srs_url_schema_vis2
}; };
@ -1139,10 +1147,9 @@ typedef void* srs_hijack_io_t;
extern int srs_hijack_io_writev(srs_hijack_io_t ctx, const iovec *iov, int iov_size, ssize_t* nwrite); extern int srs_hijack_io_writev(srs_hijack_io_t ctx, const iovec *iov, int iov_size, ssize_t* nwrite);
/** /**
* whether the timeout is never timeout in ms. * whether the timeout is never timeout in ms.
* @return 0, success; otherswise, failed. * @return 0, with timeout specified; otherwise, never timeout.
*/ */
// TODO: FIXME: Upgrade srs-bench and change the us to ms for timeout. extern int srs_hijack_io_is_never_timeout(srs_hijack_io_t ctx, int64_t tm);
extern bool srs_hijack_io_is_never_timeout(srs_hijack_io_t ctx, int64_t tm);
/** /**
* read fully, fill the buf exactly size bytes. * read fully, fill the buf exactly size bytes.
* @return 0, success; otherswise, failed. * @return 0, success; otherswise, failed.