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

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-06-06 21:42:12 +08:00
commit 17d6016bf6
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -869,7 +869,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
pprint->elapse(); pprint->elapse();
// cond wait for error. // cond wait for error.
trd->wait(SRS_CONSTS_RTMP_RECV_TIMEOUT_US / 1000); trd->wait(SRS_CONSTS_RTMP_PUBLISHER_RECV_TIMEOUT_US / 1000);
// check the thread error code. // check the thread error code.
if ((ret = trd->error_code()) != ERROR_SUCCESS) { if ((ret = trd->error_code()) != ERROR_SUCCESS) {

8
trunk/src/app/srs_app_source.cpp
View file

@ -1479,7 +1479,11 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio)
} }
// consume the monotonically increase message. // consume the monotonically increase message.
if (m->is_audio()) {
ret = on_audio_imp(m); ret = on_audio_imp(m);
} else {
ret = on_video_imp(m);
}
srs_freep(m); srs_freep(m);
return ret; return ret;
@ -1670,7 +1674,11 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
SrsAutoFree(SrsSharedPtrMessage, m); SrsAutoFree(SrsSharedPtrMessage, m);
// consume the monotonically increase message. // consume the monotonically increase message.
if (m->is_audio()) {
ret = on_audio_imp(m);
} else {
ret = on_video_imp(m); ret = on_video_imp(m);
}
srs_freep(m); srs_freep(m);
return ret; return ret;

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

@ -74,6 +74,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// the timeout to wait client data, // the timeout to wait client data,
// if timeout, close the connection. // if timeout, close the connection.
#define SRS_CONSTS_RTMP_RECV_TIMEOUT_US (int64_t)(30*1000*1000LL) #define SRS_CONSTS_RTMP_RECV_TIMEOUT_US (int64_t)(30*1000*1000LL)
// the timeout for publish recv.
// we must use more smaller timeout, for the recv never know the status
// of underlayer socket.
#define SRS_CONSTS_RTMP_PUBLISHER_RECV_TIMEOUT_US (int64_t)(3*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,