diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 3f3b1f6ca..6da6d4440 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -30,6 +30,7 @@ function update_nav() { $("#srs_index").attr("href", "index.html" + window.location.search); $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search); $("#nav_rtc_player").attr("href", "rtc_player.html" + window.location.search); + $("#nav_rtc_publisher").attr("href", "rtc_publisher.html" + window.location.search); $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search); $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search); $("#nav_srs_bwt").attr("href", "srs_bwt.html" + window.location.search); diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index e531aa434..c78fcdb5b 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -15,7 +15,7 @@ - +
@@ -24,6 +24,7 @@
  • SRS播放器
  • RTC播放器
    • +
  • RTC推流
    • @@ -67,6 +68,7 @@ pc = new RTCPeerConnection(null); pc.onaddstream = function (event) { + console.log('Start play, event: ', event); $('#rtc_media_player').prop('srcObject', event.stream); }; new Promise(function(resolve, reject) { @@ -103,13 +105,13 @@ var data = { api: url, streamurl: urlObject.url, clientip: null, sdp: offer.sdp }; - console.log("offer: " + JSON.stringify(data)); + console.log("Generated offer: ", data); $.ajax({ type: "POST", url: url, data: JSON.stringify(data), contentType:'application/json', dataType: 'json' }).done(function(data) { - console.log("answer: " + JSON.stringify(data)); + console.log("Got answer: ", data); resolve(data.sdp); }).fail(function(reason){ reject(reason); diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 155c9f7fe..75387ca78 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -1,23 +1,160 @@ - + - + SRS + + + + + + + - + +
    +
    +
    + SRS +
    + +
    +
    +
    +
    +
    +
    + URL: + + +
    -local_media_player:
    -
    -rtc_media_player:
    - + + + +
    + + diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index 408516d9c..07b1ca8b5 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -24,6 +24,7 @@
    • SRS播放器
    • RTC播放器
      • +
    • RTC推流
    • SRS编码器
    • SRS会议
    • SRS测网速
      • diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index 6591c1492..aedc4c71e 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -23,6 +23,7 @@
      • SRS播放器
      • RTC播放器
        • +
      • RTC推流
      • SRS编码器
      • SRS会议
      • SRS测网速
        • diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html index 702cf8473..10ca8d967 100644 --- a/trunk/research/players/srs_gb28181.html +++ b/trunk/research/players/srs_gb28181.html @@ -37,6 +37,7 @@
        • SRS播放器
        • RTC播放器
          • +
        • RTC推流
          • diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 84b78b5c8..53e454c72 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -34,6 +34,7 @@
          • SRS播放器
          • RTC播放器
            • +
          • RTC推流
            • diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index e07467b17..c3c33a1a0 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -23,6 +23,7 @@
            • SRS播放器
            • RTC播放器
              • +
            • RTC推流
            • SRS编码器
            • SRS会议
            • SRS测网速
              • diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index 8dbf5e47c..ebb49dd84 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -20,6 +20,7 @@
              • SRS播放器
              • RTC播放器
                • +
              • RTC推流
              • SRS编码器
              • SRS会议
              • SRS测网速
                • diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index a2cb67a52..318888c8c 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1213,6 +1213,13 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt request.app = app; request.stream = stream_name; + // TODO: FIXME: Parse vhost. + // discovery vhost, resolve the vhost from config + SrsConfDirective* parsed_vhost = _srs_config->get_vhost(""); + if (parsed_vhost) { + request.vhost = parsed_vhost->arg0(); + } + // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. SrsRtcSession* rtc_session = rtc_server->create_rtc_session(request, remote_sdp, local_sdp, "");