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

rename the confict macro to srs_lib_trace

Browse source
This commit is contained in:
winlin 2014-11-08 18:37:15 +08:00
parent 3405f35d06
commit 606fc13a03
11 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/research/librtmp/srs_bandwidth_check.c
View file

@ -80,31 +80,31 @@ int main(int argc, char** argv)
rtmp = srs_rtmp_create2(argv[1]);
srs_trace("bandwidth check/test url: %s", argv[1]);
srs_lib_trace("bandwidth check/test url: %s", argv[1]);
if ((ret = srs_simple_handshake(rtmp)) != 0) {
srs_trace("simple handshake failed.");
srs_lib_trace("simple handshake failed.");
goto rtmp_destroy;
}
srs_trace("simple handshake success");
srs_lib_trace("simple handshake success");
if ((ret = srs_connect_app2(rtmp,
srs_server_ip, srs_server, srs_primary_authors, srs_version, &srs_id, &srs_pid)) != 0) {
srs_trace("connect vhost/app failed.");
srs_lib_trace("connect vhost/app failed.");
goto rtmp_destroy;
}
srs_trace("connect vhost/app success");
srs_lib_trace("connect vhost/app success");
if ((ret = srs_bandwidth_check(rtmp,
&start_time, &end_time, &play_kbps, &publish_kbps,
&play_bytes, &publish_bytes, &play_duration, &publish_duration)) != 0
) {
srs_trace("bandwidth check/test failed.");
srs_lib_trace("bandwidth check/test failed.");
goto rtmp_destroy;
}
srs_trace("bandwidth check/test success");
srs_lib_trace("bandwidth check/test success");
srs_trace("\n%s, %s\n"
srs_lib_trace("\n%s, %s\n"
"%s, %s, srs_pid=%d, srs_id=%d\n"
"duration: %dms(%d+%d)\n"
"play: %dkbps\n"
@ -136,8 +136,8 @@ rtmp_destroy:
(int)(end_time - start_time), play_duration, publish_duration,
play_kbps, publish_kbps);
srs_trace("");
srs_trace("completed");
srs_lib_trace("");
srs_lib_trace("completed");
return ret;
}