胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
381e88d6 2 parents e19ee0cb b982b27f

add release code. ZhouGuowen for SRS2.0

内嵌 并排对比
正在显示 5 个修改的文件 包含 7 行增加 和 5 行删除
@@ -219,7 +219,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port) @@ -219,7 +219,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
219 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 219 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147
220 SrsAmf0Object* data = req->args; 220 SrsAmf0Object* data = req->args;
221 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); 221 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
222 - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 222 + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
223 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); 223 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE));
224 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); 224 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE));
225 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); 225 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL));
@@ -640,7 +640,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port) @@ -640,7 +640,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
640 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 640 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147
641 SrsAmf0Object* data = req->args; 641 SrsAmf0Object* data = req->args;
642 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); 642 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
643 - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 643 + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
644 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); 644 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE));
645 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); 645 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE));
646 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); 646 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL));
@@ -342,7 +342,7 @@ int SrsForwarder::connect_app(string ep_server, string ep_port) @@ -342,7 +342,7 @@ int SrsForwarder::connect_app(string ep_server, string ep_port)
342 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 342 // @see https://github.com/winlinvip/simple-rtmp-server/issues/147
343 SrsAmf0Object* data = req->args; 343 SrsAmf0Object* data = req->args;
344 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); 344 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
345 - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 345 + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
346 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); 346 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE));
347 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); 347 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE));
348 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); 348 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL));
@@ -1186,7 +1186,7 @@ int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata @@ -1186,7 +1186,7 @@ int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata
1186 } 1186 }
1187 1187
1188 // add server info to metadata 1188 // add server info to metadata
1189 - metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 1189 + metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
1190 metadata->metadata->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); 1190 metadata->metadata->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
1191 metadata->metadata->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS)); 1191 metadata->metadata->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
1192 1192
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
  38 +#define RTMP_SIG_SRS_CODE "ZhouGuowen"
38 #define RTMP_SIG_SRS_ROLE "origin/edge server" 39 #define RTMP_SIG_SRS_ROLE "origin/edge server"
39 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" 40 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
40 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" 41 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
@@ -50,6 +51,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -50,6 +51,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
50 #define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/1.0release" 51 #define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/1.0release"
51 #define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id 52 #define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id
52 #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) 53 #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION)
  54 +#define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
53 55
54 // internal macros, covert macro values to str, 56 // internal macros, covert macro values to str,
55 // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification 57 // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification
@@ -941,7 +941,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) @@ -941,7 +941,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip)
941 941
942 data->set("version", SrsAmf0Any::str(RTMP_SIG_FMS_VER)); 942 data->set("version", SrsAmf0Any::str(RTMP_SIG_FMS_VER));
943 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); 943 data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
944 - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 944 + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
945 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); 945 data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE));
946 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); 946 data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE));
947 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); 947 data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL));