external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00
Code Issues Releases Wiki Activity

hotfix 1.0, author bug, use error macro. 1.0.9

Browse source
This commit is contained in:
winlin 2014-11-27 18:48:01 +08:00
parent 575e50b6e2
commit 9c033c7da6
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,8 @@ int main(int argc, char** argv)
// srs debug info.
char srs_server_ip[128];
char srs_server[128];
char srs_primary_authors[128];
char srs_primary[128];
char srs_authors[128];
char srs_version[32];
int srs_id = 0;
int srs_pid = 0;
@ -59,7 +60,8 @@ int main(int argc, char** argv)
// set to zero.
srs_server_ip[0] = 0;
srs_server[0] = 0;
srs_primary_authors[0] = 0;
srs_primary[0] = 0;
srs_authors[0] = 0;
srs_version[0] = 0;
if (argc <= 1) {
@ -90,7 +92,7 @@ int main(int argc, char** argv)
printf("simple handshake success\n");
if ((ret = srs_connect_app2(rtmp,
srs_server_ip, srs_server, srs_primary_authors, srs_version, &srs_id, &srs_pid)) != 0) {
srs_server_ip, srs_server, srs_primary, srs_authors, srs_version, &srs_id, &srs_pid)) != 0) {
printf("connect vhost/app failed.\n");
goto rtmp_destroy;
}
@ -105,12 +107,12 @@ int main(int argc, char** argv)
}
printf("bandwidth check/test success\n");
printf("\n%s, %s\n"
printf("\n%s, %s, %s\n"
"%s, %s, srs_pid=%d, srs_id=%d\n"
"duration: %dms(%d+%d)\n"
"play: %dkbps\n"
"publish: %dkbps\n\n",
(char*)srs_server, (char*)srs_primary_authors,
(char*)srs_server, (char*)srs_primary, (char*)srs_authors,
(char*)srs_server_ip, (char*)srs_version, srs_pid, srs_id,
(int)(end_time - start_time), play_duration, publish_duration,
play_kbps,
@ -123,7 +125,8 @@ rtmp_destroy:
fprintf(stderr, "{\"code\":%d,"
"\"srs_server\":\"%s\", "
"\"srs_primary_authors\":\"%s\", "
"\"srs_primary\":\"%s\", "
"\"srs_authors\":\"%s\", "
"\"srs_server_ip\":\"%s\", "
"\"srs_version\":\"%s\", "
"\"srs_pid\":%d, "
@ -134,7 +137,7 @@ rtmp_destroy:
"\"publish_kbps\":%d"
"}",
ret,
(char*)srs_server, (char*)srs_primary_authors,
(char*)srs_server, (char*)srs_primary, (char*)srs_authors,
(char*)srs_server_ip, (char*)srs_version, srs_pid, srs_id,
(int)(end_time - start_time), play_duration, publish_duration,
play_kbps, publish_kbps);

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
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 8
#define VERSION_REVISION 9
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"

4
trunk/src/main/srs_main_server.cpp
View file

@ -158,12 +158,12 @@ int main(int argc, char** argv)
ProfilerStart("gperf.srs.gcp");
#endif
// directly compile error when these two macro defines.
#if defined(SRS_AUTO_GPERF_MC) && defined(SRS_AUTO_GPERF_MP)
srs_error("option --with-gmc confict with --with-gmp, "
#error ("option --with-gmc confict with --with-gmp, "
"@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\n"
"Note that since the heap-checker uses the heap-profiling framework internally, "
"it is not possible to run both the heap-checker and heap profiler at the same time");
return -1;
#endif
// never use srs log(srs_trace, srs_error, etc) before config parse the option,

5
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -435,13 +435,14 @@ int SrsRtmpClient::connect_app(string app, string tc_url,
{
std::string srs_server_ip;
std::string srs_server;
std::string srs_primary_authors;
std::string srs_primary;
std::string srs_authors;
std::string srs_version;
int srs_id = 0;
int srs_pid = 0;
return connect_app2(app, tc_url, req, debug_srs_upnode,
srs_server_ip, srs_server, srs_primary_authors,
srs_server_ip, srs_server, srs_primary, srs_authors,
srs_version, srs_id, srs_pid);
}