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

fix the timeout for librtmp

Browse source
This commit is contained in:
winlin 2016-08-10 22:04:01 +08:00
parent 3fbe9d2442
commit e00928557e
4 changed files with 86 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
trunk/src/libs/srs_librtmp.cpp
View file

@ -484,14 +484,6 @@ int srs_librtmp_context_resolve_host(Context* context)
{
int ret = ERROR_SUCCESS;
// create socket
srs_freep(context->skt);
context->skt = new SimpleSocketStream();
if ((ret = context->skt->create_socket()) != ERROR_SUCCESS) {
return ret;
}
// connect to server:port
context->ip = srs_dns_resolve(context->host);
if (context->ip.empty()) {
@ -540,6 +532,17 @@ srs_rtmp_t srs_rtmp_create(const char* url)
{
Context* context = new Context();
context->url = url;
// create socket
srs_freep(context->skt);
context->skt = new SimpleSocketStream();
if (context->skt->create_socket() != ERROR_SUCCESS) {
// free the context and return NULL
srs_freep(context);
return NULL;
}
return context;
}
@ -552,8 +555,34 @@ srs_rtmp_t srs_rtmp_create2(const char* url)
// auto append stream.
context->url += "/livestream";
// create socket
srs_freep(context->skt);
context->skt = new SimpleSocketStream();
if (context->skt->create_socket() != ERROR_SUCCESS) {
// free the context and return NULL
srs_freep(context);
return NULL;
}
return context;
}
int srs_rtmp_set_timeout(srs_rtmp_t rtmp, int recv_timeout_ms, int send_timeout_ms)
{
int ret = ERROR_SUCCESS;
if (!rtmp) {
return ret;
}
Context* context = (Context*)rtmp;
context->skt->set_recv_timeout(recv_timeout_ms * 1000LL);
context->skt->set_send_timeout(send_timeout_ms * 1000LL);
return ret;
}
void srs_rtmp_destroy(srs_rtmp_t rtmp)
{