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 bug #45, support duration for live. change to 0.9.62

Browse source
This commit is contained in:
winlin 2014-04-13 21:37:26 +08:00
parent 04a526b340
commit 9a036958d7
6 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,13 +254,13 @@ int SrsRtmpConn::stream_service_cycle()
int ret = ERROR_SUCCESS;
SrsRtmpConnType type;
if ((ret = rtmp->identify_client(res->stream_id, type, req->stream)) != ERROR_SUCCESS) {
if ((ret = rtmp->identify_client(res->stream_id, type, req->stream, req->duration)) != ERROR_SUCCESS) {
srs_error("identify client failed. ret=%d", ret);
return ret;
}
req->strip();
srs_trace("identify client success. type=%s, stream_name=%s",
srs_client_type_string(type).c_str(), req->stream.c_str());
srs_trace("identify client success. type=%s, stream_name=%s, duration=%.2f",
srs_client_type_string(type).c_str(), req->stream.c_str(), req->duration);
// client is identified, set the timeout to service timeout.
rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
@ -417,6 +417,15 @@ int SrsRtmpConn::playing(SrsSource* source)
while (true) {
pithy_print.elapse(SRS_PULSE_TIMEOUT_US / 1000);
// if duration specified, and exceed it, stop play live.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/45
// TODO: maybe the duration should use the stream duration.
if (req->duration > 0 && pithy_print.get_age() >= (int64_t)req->duration) {
ret = ERROR_RTMP_DURATION_EXCEED;
srs_trace("stop live for duration exceed. ret=%d", ret);
return ret;
}
// switch to other st-threads.
st_usleep(0);