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

add bandwidth workflow

Browse source
This commit is contained in:
winlin 2013-12-22 17:41:28 +08:00
parent 084ad79534
commit 908f0d87e9
2 changed files with 121 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

29
README.md
View file

@ -131,6 +131,35 @@ Stream Architecture:
| ...) | +-> DVR --------------+-> FILE | | ...) | +-> DVR --------------+-> FILE |
+-----------+-------------------------+----------------+ +-----------+-------------------------+----------------+
</pre> </pre>
Bandwidth Test Workflow:
<pre>
+------------+ +----------+
| Client | | Server |
+-----+------+ +-----+----+
| |
| connect vhost------> | if vhost enable bandwidth,
| <-----result(success) | do bandwidth check.
| |
| <----call(start play) | onSrsBandCheckStartPlayBytes
| result(playing)-----> | onSrsBandCheckStartingPlayBytes
| <-------data(playing) | onSrsBandCheckStartingPlayBytes
| <-----call(stop play) | onSrsBandCheckStopPlayBytes
| result(stopped)-----> | onSrsBandCheckStoppedPlayBytes
| |
| <-call(start publish) | onSrsBandCheckStartPublishBytes
| result(publishing)--> | onSrsBandCheckStartingPublishBytes
| data(publishing)----> | onSrsBandCheckStartingPublishBytes
| <--call(stop publish) | onSrsBandCheckStopPublishBytes
| result(stopped)(1)--> | onSrsBandCheckStoppedPublishBytes
| |
| <--------------report |
| final(2)------------> | finalClientPacket
| <END> |
1. when flash client, server ignore the publish stopped result,
and directly send the report to flash client.
2. flash client only. when got report, flash client should send out
a final packet and close the connection immediately.
</pre>
### System Requirements ### System Requirements
Supported operating systems and hardware: Supported operating systems and hardware:

184
trunk/src/core/srs_core_bandwidth.hpp Normal file → Executable file
View file

@ -1,93 +1,93 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013 wenjiegit Copyright (c) 2013 wenjiegit
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so, the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions: subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SRS_CORE_BANDWIDTH_HPP #ifndef SRS_CORE_BANDWIDTH_HPP
#define SRS_CORE_BANDWIDTH_HPP #define SRS_CORE_BANDWIDTH_HPP
/* /*
#include <srs_core_bandwidth.hpp> #include <srs_core_bandwidth.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>
class SrsRequest; class SrsRequest;
class SrsRtmp; class SrsRtmp;
/** /**
* bandwidth test agent which provides the interfaces for bandwidth check. * bandwidth test agent which provides the interfaces for bandwidth check.
* 1. if vhost disabled bandwidth check, ignore. * 1. if vhost disabled bandwidth check, ignore.
* 2. otherwise, check the key, error if verify failed. * 2. otherwise, check the key, error if verify failed.
* 3. check the interval limit, error if bandwidth in the interval window. * 3. check the interval limit, error if bandwidth in the interval window.
* 4. check the bandwidth under the max kbps. * 4. check the bandwidth under the max kbps.
* 5. send the bandwidth data to client. * 5. send the bandwidth data to client.
* bandwidth workflow: * bandwidth workflow:
* +------------+ +----------+ * +------------+ +----------+
* | Client | | Server | * | Client | | Server |
* +-----+------+ +-----+----+ * +-----+------+ +-----+----+
* | | * | |
* | connect vhost------> | if vhost enable bandwidth, * | connect vhost------> | if vhost enable bandwidth,
* | <-----result(success) | do bandwidth check. * | <-----result(success) | do bandwidth check.
* | | * | |
* | <----call(start play) | onSrsBandCheckStartPlayBytes * | <----call(start play) | onSrsBandCheckStartPlayBytes
* | result(playing)-----> | onSrsBandCheckStartingPlayBytes * | result(playing)-----> | onSrsBandCheckStartingPlayBytes
* | <-------data(playing) | onSrsBandCheckStartingPlayBytes * | <-------data(playing) | onSrsBandCheckStartingPlayBytes
* | <-----call(stop play) | onSrsBandCheckStopPlayBytes * | <-----call(stop play) | onSrsBandCheckStopPlayBytes
* | result(stopped)-----> | onSrsBandCheckStoppedPlayBytes * | result(stopped)-----> | onSrsBandCheckStoppedPlayBytes
* | | * | |
* | <-call(start publish) | onSrsBandCheckStartPublishBytes * | <-call(start publish) | onSrsBandCheckStartPublishBytes
* | result(publishing)--> | onSrsBandCheckStartingPublishBytes * | result(publishing)--> | onSrsBandCheckStartingPublishBytes
* | data(publishing)----> | onSrsBandCheckStartingPublishBytes * | data(publishing)----> | onSrsBandCheckStartingPublishBytes
* | <--call(stop publish) | onSrsBandCheckStopPublishBytes * | <--call(stop publish) | onSrsBandCheckStopPublishBytes
* | result(stopped)-----> | onSrsBandCheckStoppedPublishBytes(1) * | result(stopped)(1)--> | onSrsBandCheckStoppedPublishBytes
* | | * | |
* | <--------------report | * | <--------------report |
* | final---------------> | finalClientPacket(2) * | final(2)------------> | finalClientPacket
* | <END> | * | <END> |
* 1. when flash client, server ignore the publish stopped result, * 1. when flash client, server ignore the publish stopped result,
* and directly send the report to flash client. * and directly send the report to flash client.
* 2. flash client only. when got report, flash client should send out * 2. flash client only. when got report, flash client should send out
* a final packet and close the connection immediately. * a final packet and close the connection immediately.
*/ */
class SrsBandwidth class SrsBandwidth
{ {
private: private:
SrsRequest* req; SrsRequest* req;
SrsRtmp* rtmp; SrsRtmp* rtmp;
public: public:
SrsBandwidth(); SrsBandwidth();
virtual ~SrsBandwidth(); virtual ~SrsBandwidth();
public: public:
/** /**
* do the bandwidth test. * do the bandwidth test.
*/ */
virtual int bandwidth_test(SrsRequest* _req, st_netfd_t stfd, SrsRtmp* _rtmp); virtual int bandwidth_test(SrsRequest* _req, st_netfd_t stfd, SrsRtmp* _rtmp);
private: private:
virtual int get_local_ip(st_netfd_t stfd, char *&local_ip); virtual int get_local_ip(st_netfd_t stfd, char *&local_ip);
/** /**
* used to process band width check from client. * used to process band width check from client.
*/ */
virtual int do_bandwidth_check(); virtual int do_bandwidth_check();
virtual int check_play(int duration_ms, int interval_ms, int& actual_duration_ms, int& play_bytes, int max_play_kbps); virtual int check_play(int duration_ms, int interval_ms, int& actual_duration_ms, int& play_bytes, int max_play_kbps);
virtual int check_publish(int duration_ms, int interval_ms, int& actual_duration_ms, int& publish_bytes, int max_pub_kbps); virtual int check_publish(int duration_ms, int interval_ms, int& actual_duration_ms, int& publish_bytes, int max_pub_kbps);
}; };
#endif #endif