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 bandwidth test, use function ptr.

Browse source
This commit is contained in:
winlin 2014-07-13 11:17:03 +08:00
parent 539b595604
commit 0fb51413f4
2 changed files with 65 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

134
trunk/src/app/srs_app_bandwidth.cpp
View file

@ -63,6 +63,52 @@ void SrsBandwidthSample::calc_kbps(int _bytes, int _duration)
kbps = bytes * 8 / actual_duration_ms; kbps = bytes * 8 / actual_duration_ms;
} }
/**
* recv bandwidth helper.
*/
typedef bool (*_CheckPacketType)(SrsBandwidthPacket* pkt);
bool _bandwidth_is_flash_final(SrsBandwidthPacket* pkt)
{
return pkt->is_flash_final();
}
bool _bandwidth_is_starting_play(SrsBandwidthPacket* pkt)
{
return pkt->is_starting_play();
}
bool _bandwidth_is_stopped_play(SrsBandwidthPacket* pkt)
{
return pkt->is_stopped_play();
}
bool _bandwidth_is_starting_publish(SrsBandwidthPacket* pkt)
{
return pkt->is_starting_publish();
}
bool _bandwidth_is_stopped_publish(SrsBandwidthPacket* pkt)
{
return pkt->is_stopped_publish();
}
int _srs_expect_bandwidth_packet(SrsRtmpServer* rtmp, _CheckPacketType pfn)
{
int ret = ERROR_SUCCESS;
while (true) {
SrsMessage* msg = NULL;
SrsBandwidthPacket* pkt = NULL;
if ((ret = rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) {
return ret;
}
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get final message success.");
if (pfn(pkt)) {
return ret;
}
}
return ret;
}
SrsBandwidth::SrsBandwidth() SrsBandwidth::SrsBandwidth()
{ {
_req = NULL; _req = NULL;
@ -190,22 +236,10 @@ int SrsBandwidth::do_bandwidth_check(SrsKbpsLimit* limit)
// we notice the result, and expect a final packet if not flash. // we notice the result, and expect a final packet if not flash.
// if flash client, client will disconnect when got finish packet. // if flash client, client will disconnect when got finish packet.
bool is_flash = (_req->swfUrl != ""); bool is_flash = (_req->swfUrl != "");
while (!is_flash) { if (!is_flash) {
SrsMessage* msg = NULL; // ignore any error.
SrsBandwidthPacket* pkt = NULL; _srs_expect_bandwidth_packet(_rtmp, _bandwidth_is_flash_final);
if ((ret = _rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) { srs_info("BW check recv flash final response.");
// info level to ignore and return success.
srs_info("expect final message failed. ret=%d", ret);
return ERROR_SUCCESS;
}
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get final message success.");
if (pkt->is_flash_final()) {
srs_info("BW check recv flash final response.");
break;
}
} }
srs_info("BW check finished."); srs_info("BW check finished.");
@ -231,21 +265,8 @@ int SrsBandwidth::check_play(SrsBandwidthSample* sample, SrsKbpsLimit* limit)
} }
srs_info("BW check begin."); srs_info("BW check begin.");
while (true) { if ((ret = _srs_expect_bandwidth_packet(_rtmp, _bandwidth_is_starting_play)) != ERROR_SUCCESS) {
// recv client's starting play response return ret;
SrsMessage* msg = NULL;
SrsBandwidthPacket* pkt = NULL;
if ((ret = _rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) {
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_starting_play()) {
break;
}
} }
srs_info("BW check recv play begin response."); srs_info("BW check recv play begin response.");
@ -297,21 +318,8 @@ int SrsBandwidth::check_play(SrsBandwidthSample* sample, SrsKbpsLimit* limit)
} }
srs_info("BW check stop play bytes."); srs_info("BW check stop play bytes.");
while (true) { if ((ret = _srs_expect_bandwidth_packet(_rtmp, _bandwidth_is_stopped_play)) != ERROR_SUCCESS) {
// recv client's stop play response. return ret;
SrsMessage* msg = NULL;
SrsBandwidthPacket* pkt = NULL;
if ((ret = _rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) {
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_stopped_play()) {
break;
}
} }
srs_info("BW check recv stop play response."); srs_info("BW check recv stop play response.");
@ -336,21 +344,8 @@ int SrsBandwidth::check_publish(SrsBandwidthSample* sample, SrsKbpsLimit* limit)
} }
srs_info("BW check publish begin."); srs_info("BW check publish begin.");
while (true) { if ((ret = _srs_expect_bandwidth_packet(_rtmp, _bandwidth_is_starting_publish)) != ERROR_SUCCESS) {
// read client's notification of starting publish return ret;
SrsMessage* msg = NULL;
SrsBandwidthPacket* pkt = NULL;
if ((ret = _rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) {
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_starting_publish()) {
break;
}
} }
srs_info("BW check recv publish begin response."); srs_info("BW check recv publish begin response.");
@ -392,23 +387,12 @@ int SrsBandwidth::check_publish(SrsBandwidthSample* sample, SrsKbpsLimit* limit)
// there are many many packets in the queue. // there are many many packets in the queue.
// we just ignore the packet and send the bandwidth test data. // we just ignore the packet and send the bandwidth test data.
bool is_flash = (_req->swfUrl != ""); bool is_flash = (_req->swfUrl != "");
while (!is_flash) { if (!is_flash) {
// recv client's stop publish response. if ((ret = _srs_expect_bandwidth_packet(_rtmp, _bandwidth_is_stopped_publish)) != ERROR_SUCCESS) {
SrsMessage* msg = NULL;
SrsBandwidthPacket* pkt = NULL;
if ((ret = _rtmp->expect_message<SrsBandwidthPacket>(&msg, &pkt)) != ERROR_SUCCESS) {
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg); srs_info("BW check recv stop publish response.");
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_stopped_publish()) {
break;
}
} }
srs_info("BW check recv stop publish response.");
return ret; return ret;
} }

6
trunk/src/app/srs_app_kbps.cpp
View file

@ -259,16 +259,22 @@ SrsKbpsLimit::~SrsKbpsLimit()
void SrsKbpsLimit::recv_limit() void SrsKbpsLimit::recv_limit()
{ {
_kbps->sample();
while (_kbps->get_recv_kbps() > _limit_kbps) { while (_kbps->get_recv_kbps() > _limit_kbps) {
_kbps->sample(); _kbps->sample();
st_usleep(_SRS_BANDWIDTH_LIMIT_INTERVAL_MS * 1000); st_usleep(_SRS_BANDWIDTH_LIMIT_INTERVAL_MS * 1000);
} }
} }
void SrsKbpsLimit::send_limit() void SrsKbpsLimit::send_limit()
{ {
_kbps->sample();
while (_kbps->get_send_kbps() > _limit_kbps) { while (_kbps->get_send_kbps() > _limit_kbps) {
_kbps->sample(); _kbps->sample();
st_usleep(_SRS_BANDWIDTH_LIMIT_INTERVAL_MS * 1000); st_usleep(_SRS_BANDWIDTH_LIMIT_INTERVAL_MS * 1000);
} }
} }