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

fix bug #47: use stream time to stop for duration of rtmpdump

Browse source
This commit is contained in:
winlin 2014-04-14 10:51:31 +08:00
parent bcfe82f88f
commit 2c6b6c6846
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ SrsRtmpConn::SrsRtmpConn(SrsServer* srs_server, st_netfd_t client_stfd)
http_hooks = new SrsHttpHooks(); http_hooks = new SrsHttpHooks();
#endif #endif
bandwidth = new SrsBandwidth(); bandwidth = new SrsBandwidth();
duration = 0;
_srs_config->subscribe(this); _srs_config->subscribe(this);
} }
@ -414,18 +415,10 @@ int SrsRtmpConn::playing(SrsSource* source)
SrsPithyPrint pithy_print(SRS_STAGE_PLAY_USER); SrsPithyPrint pithy_print(SRS_STAGE_PLAY_USER);
int64_t starttime = -1;
while (true) { while (true) {
pithy_print.elapse(SRS_PULSE_TIMEOUT_US / 1000); 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. // switch to other st-threads.
st_usleep(0); st_usleep(0);
@ -460,8 +453,8 @@ int SrsRtmpConn::playing(SrsSource* source)
// reportable // reportable
if (pithy_print.can_print()) { if (pithy_print.can_print()) {
srs_trace("-> time=%"PRId64", cmr=%d, msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d", srs_trace("-> time=%"PRId64", duration=%"PRId64", cmr=%d, msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d",
pithy_print.get_age(), ctl_msg_ret, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(), rtmp->get_send_kbps(), rtmp->get_recv_kbps()); pithy_print.get_age(), duration, ctl_msg_ret, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(), rtmp->get_send_kbps(), rtmp->get_recv_kbps());
} }
if (count <= 0) { if (count <= 0) {
@ -482,6 +475,22 @@ int SrsRtmpConn::playing(SrsSource* source)
srs_error("send message to client failed. ret=%d", ret); srs_error("send message to client failed. ret=%d", ret);
return ret; return ret;
} }
// foreach msg, collect the duration.
if (starttime < 0 || starttime > msg->header.timestamp) {
starttime = msg->header.timestamp;
}
duration += msg->header.timestamp - starttime;
starttime = msg->header.timestamp;
}
// 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 && duration >= (int64_t)req->duration) {
ret = ERROR_RTMP_DURATION_EXCEED;
srs_trace("stop live for duration exceed. ret=%d", ret);
return ret;
} }
} }

4
trunk/src/app/srs_app_rtmp_conn.hpp
View file

@ -62,6 +62,10 @@ private:
SrsHttpHooks* http_hooks; SrsHttpHooks* http_hooks;
#endif #endif
SrsBandwidth* bandwidth; SrsBandwidth* bandwidth;
// elapse duration in ms
// for live play duration, for instance, rtmpdump to record.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/47
int64_t duration;
public: public:
SrsRtmpConn(SrsServer* srs_server, st_netfd_t client_stfd); SrsRtmpConn(SrsServer* srs_server, st_netfd_t client_stfd);
virtual ~SrsRtmpConn(); virtual ~SrsRtmpConn();

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "63" #define VERSION_REVISION "64"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"