Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-09-23 16:53:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
87aac3ddd45c805092ea02e2697d9e0a13095cc8
87aac3dd
1 parent
1d454cd5
refine log, add features for macro. 0.9.212
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
81 行增加
和
1 行删除
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/core/srs_core.hpp
查看文件 @
87aac3d
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "21
1
"
#define VERSION_REVISION "21
2
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
87aac3d
...
...
@@ -55,6 +55,81 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
SrsConfig
*
_srs_config
=
new
SrsConfig
();
SrsServer
*
_srs_server
=
new
SrsServer
();
void
show_features
()
{
#ifdef SRS_AUTO_SSL
srs_trace
(
"rtmp handshake: on"
);
#else
srs_warn
(
"rtmp handshake: off"
);
#endif
#ifdef SRS_AUTO_HLS
srs_trace
(
"hls: on"
);
#else
srs_warn
(
"hls: off"
);
#endif
#ifdef SRS_AUTO_HTTP_CALLBACK
srs_trace
(
"http callback: on"
);
#else
srs_warn
(
"http callback: off"
);
#endif
#ifdef SRS_AUTO_HTTP_API
srs_trace
(
"http api: on"
);
#else
srs_warn
(
"http api: off"
);
#endif
#ifdef SRS_AUTO_HTTP_SERVER
srs_trace
(
"http server: on"
);
#else
srs_warn
(
"http server: off"
);
#endif
#ifdef SRS_AUTO_HTTP_PARSER
srs_trace
(
"http parser: on"
);
#else
srs_warn
(
"http parser: off"
);
#endif
#ifdef SRS_AUTO_DVR
srs_trace
(
"dvr: on"
);
#else
srs_warn
(
"dvr: off"
);
#endif
#ifdef SRS_AUTO_TRANSCODE
srs_trace
(
"transcode: on"
);
#else
srs_warn
(
"transcode: off"
);
#endif
#ifdef SRS_AUTO_INGEST
srs_trace
(
"ingest: on"
);
#else
srs_warn
(
"ingest: off"
);
#endif
#ifdef SRS_AUTO_STAT
srs_trace
(
"system stat: on"
);
#else
srs_warn
(
"system stat: off"
);
#endif
#ifdef SRS_AUTO_NGINX
srs_trace
(
"compile nginx: on"
);
#else
srs_warn
(
"compile nginx: off"
);
#endif
#ifdef SRS_AUTO_FFMPEG
srs_trace
(
"compile ffmpeg: on"
);
#else
srs_warn
(
"compile ffmpeg: off"
);
#endif
}
// main entrance.
int
main
(
int
argc
,
char
**
argv
)
{
...
...
@@ -93,6 +168,8 @@ int main(int argc, char** argv)
srs_trace
(
"srs(simple-rtmp-server) "
RTMP_SIG_SRS_VERSION
);
srs_trace
(
"license: "
RTMP_SIG_SRS_LICENSE
);
srs_trace
(
"authors: "
RTMP_SIG_SRS_PRIMARY_AUTHROS
);
srs_trace
(
"contributors: "
SRS_AUTO_CONSTRIBUTORS
);
srs_trace
(
"uname: "
SRS_AUTO_UNAME
);
srs_trace
(
"build: %s, %s"
,
SRS_AUTO_BUILD_DATE
,
srs_is_little_endian
()
?
"little-endian"
:
"big-endian"
);
srs_trace
(
"configure: "
SRS_AUTO_USER_CONFIGURE
);
...
...
@@ -102,6 +179,9 @@ int main(int argc, char** argv)
#endif
srs_trace
(
"conf: %s, limit: %d"
,
_srs_config
->
config
().
c_str
(),
_srs_config
->
get_max_connections
());
// features
show_features
();
/**
* we do nothing in the constructor of server,
* and use initialize to create members, set hooks for instance the reload handler,
...
...
请
注册
或
登录
后发表评论