修改流名称

trunk/src/app/srs_app_gb28181.cpp

@@ -2497,6 +2497,13 @@ srs_error_t SrsGb28181Manger::create_stream_channel(SrsGb28181StreamChannel *cha
     std::string id = channel->get_channel_id();
     SrsGb28181RtmpMuxer *muxer = NULL;
 
+    std::string ntv_stream = id;
+    string::size_type pos = id.find("@");
+    if(pos!=string::npos){
+        ntv_stream = id.substr(0,pos);
+    }
+
+
     muxer = fetch_rtmpmuxer(id);
     if (muxer){
        SrsGb28181StreamChannel s = muxer->get_channel();
@@ -2580,7 +2587,10 @@ srs_error_t SrsGb28181Manger::create_stream_channel(SrsGb28181StreamChannel *cha
 
         url = srs_generate_rtmp_url(_host, rtmp_port, "", "", app, stream, "");
         url = srs_string_replace(url, "[app]", "live");
-        url = srs_string_replace(url, "[stream]", id);
+
+        //url = srs_string_replace(url, "[stream]", id);
+        url = srs_string_replace(url, "[stream]", ntv_stream);
+        
         std::stringstream ss;
         ss << ssrc;
         url = srs_string_replace(url, "[ssrc]", ss.str());
@@ -2601,6 +2611,8 @@ srs_error_t SrsGb28181Manger::create_stream_channel(SrsGb28181StreamChannel *cha
         std::string play_url = srs_generate_rtmp_url(config->host, rtmp_port, "", "", app, stream_name, "");
         channel->set_rtmp_url(play_url);
 
+        srs_trace("gb28181: play_url=%s", play_url.c_str());
+        
         request.app = app;
         request.stream = stream_name;
         //request.vhost = config->host;
@@ -2614,7 +2626,7 @@ srs_error_t SrsGb28181Manger::create_stream_channel(SrsGb28181StreamChannel *cha
 
     rtmpmuxer_map_by_ssrc(muxer, ssrc);
     muxer->set_rtmp_url(url);
-    srs_trace("gb28181: create new stream channel id:%s rtmp url=%s", id.c_str(), url.c_str());
+    srs_trace("gb28181: create new stream channel id:%s rtmp url=%sz", id.c_str(), url.c_str());
 
     muxer->copy_channel(channel);