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 code, remove the rtmp recv/send macro, use one macro.

Browse source
This commit is contained in:
winlin 2015-10-14 15:16:59 +08:00
parent 12e013142d
commit 0f4cb8ee00
6 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -235,8 +235,8 @@ int SrsForwarder::cycle()
} }
srs_assert(client); srs_assert(client);
client->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
client->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
if ((ret = client->handshake()) != ERROR_SUCCESS) { if ((ret = client->handshake()) != ERROR_SUCCESS) {
srs_error("handshake with server failed. ret=%d", ret); srs_error("handshake with server failed. ret=%d", ret);

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

@ -624,8 +624,8 @@ int SrsMpegtsOverUdp::connect()
srs_freep(client); srs_freep(client);
client = new SrsRtmpClient(transport); client = new SrsRtmpClient(transport);
client->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
client->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
// connect to vhost/app // connect to vhost/app
if ((ret = client->handshake()) != ERROR_SUCCESS) { if ((ret = client->handshake()) != ERROR_SUCCESS) {

12
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -362,8 +362,8 @@ int SrsRtmpConn::do_cycle()
srs_trace("RTMP client ip=%s", ip.c_str()); srs_trace("RTMP client ip=%s", ip.c_str());
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); rtmp->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
if ((ret = rtmp->handshake()) != ERROR_SUCCESS) { if ((ret = rtmp->handshake()) != ERROR_SUCCESS) {
srs_error("rtmp handshake failed. ret=%d", ret); srs_error("rtmp handshake failed. ret=%d", ret);
@ -690,8 +690,8 @@ int SrsRtmpConn::stream_service_cycle()
srs_info("security check ok"); srs_info("security check ok");
// client is identified, set the timeout to service timeout. // client is identified, set the timeout to service timeout.
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); rtmp->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
// find a source to serve. // find a source to serve.
SrsSource* source = SrsSource::fetch(req); SrsSource* source = SrsSource::fetch(req);
@ -1510,8 +1510,8 @@ int SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client)
srs_assert(client); srs_assert(client);
client->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
client->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
if ((ret = client->handshake()) != ERROR_SUCCESS) { if ((ret = client->handshake()) != ERROR_SUCCESS) {
srs_error("handshake with server failed. ret=%d", ret); srs_error("handshake with server failed. ret=%d", ret);

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

@ -676,8 +676,8 @@ int SrsRtspConn::connect()
srs_freep(client); srs_freep(client);
client = new SrsRtmpClient(transport); client = new SrsRtmpClient(transport);
client->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
client->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
// connect to vhost/app // connect to vhost/app
if ((ret = client->handshake()) != ERROR_SUCCESS) { if ((ret = client->handshake()) != ERROR_SUCCESS) {

8
trunk/src/kernel/srs_kernel_consts.hpp
View file

@ -71,14 +71,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// the common io timeout, for both recv and send. // the common io timeout, for both recv and send.
#define SRS_CONSTS_RTMP_TIMEOUT_US (int64_t)(30*1000*1000LL) #define SRS_CONSTS_RTMP_TIMEOUT_US (int64_t)(30*1000*1000LL)
// TODO: FIXME: remove following two macros.
// the timeout to send data to client,
// if timeout, close the connection.
#define SRS_CONSTS_RTMP_SEND_TIMEOUT_US (int64_t)(30*1000*1000LL)
// the timeout to wait client data,
// if timeout, close the connection.
#define SRS_CONSTS_RTMP_RECV_TIMEOUT_US (int64_t)(30*1000*1000LL)
// the timeout to wait for client control message, // the timeout to wait for client control message,
// if timeout, we generally ignore and send the data to client, // if timeout, we generally ignore and send the data to client,
// generally, it's the pulse time for data seding. // generally, it's the pulse time for data seding.

4
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -1242,8 +1242,8 @@ int SrsIngestSrsOutput::connect()
srs_freep(client); srs_freep(client);
client = new SrsRtmpClient(transport); client = new SrsRtmpClient(transport);
client->set_recv_timeout(SRS_CONSTS_RTMP_RECV_TIMEOUT_US); client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
client->set_send_timeout(SRS_CONSTS_RTMP_SEND_TIMEOUT_US); client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
// connect to vhost/app // connect to vhost/app
if ((ret = client->handshake()) != ERROR_SUCCESS) { if ((ret = client->handshake()) != ERROR_SUCCESS) {