Merge pull request #23 from infrared5/develop

Develop
red5pro · Nov 2, 2016 · 8a72594 · 8a72594
2 parents 07e8c2f + e69d81d
commit 8a72594
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 19 deletions.
diff --git a/src/page/test/publish/index.html b/src/page/test/publish/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publish1080/index.html b/src/page/test/publish1080/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish 1080p Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publishCameraSource/index.html b/src/page/test/publishCameraSource/index.html
@@ -28,7 +28,7 @@
       </div>
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publishCameraSwap/index.html b/src/page/test/publishCameraSwap/index.html
@@ -14,7 +14,7 @@
       {{> status-field-publisher}}
       <div id="video-container" class="centered">
         <div class="centered">
-          <video id="red5pro-publisher-video" controls class="video-element"></video>
+          <video id="red5pro-publisher-video" controls class="video-element" muted></video>
         </div>
       </div>
     </div>

diff --git a/src/page/test/publishCustomSource/index.html b/src/page/test/publishCustomSource/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <canvas id="red5pro-publisher-video" controls class="video-element"></canvas>
+        <canvas id="red5pro-publisher-video" controls class="video-element" muted></canvas>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publishFailover/index.html b/src/page/test/publishFailover/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish Failover Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publishImageCapture/index.html b/src/page/test/publishImageCapture/index.html
@@ -23,7 +23,7 @@
       {{> status-field-publisher}}
       <div id="video-container" class="centered">
         <div class="centered">
-          <video id="red5pro-publisher-video" controls class="video-element"></video>
+          <video id="red5pro-publisher-video" controls class="video-element" muted></video>
         </div>
       </div>
       <div class="centered">

diff --git a/src/page/test/publishRecord/index.html b/src/page/test/publishRecord/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish Record Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/publishStreamManager/index.html b/src/page/test/publishStreamManager/index.html
@@ -12,7 +12,7 @@
       {{> test-info testTitle='Publish Stream Manager Test'}}
       {{> status-field-publisher}}
       <div class="centered">
-        <video id="red5pro-publisher-video" controls class="video-element"></video>
+        <video id="red5pro-publisher-video" controls class="video-element" muted></video>
       </div>
     </div>
     {{> body-scripts}}

diff --git a/src/page/test/twoWay/index.html b/src/page/test/twoWay/index.html
@@ -15,7 +15,7 @@
         <h2 class="centered"><em>Publisher Stream</em>: <span id="pub-stream-title"></span></h2>
         <p id="pub-status-field" class="centered status-field">On hold.</p>
         <div class="centered">
-          <video id="red5pro-publisher-video" controls class="video-element"></video>
+          <video id="red5pro-publisher-video" controls class="video-element" muted></video>
         </div>
       </div>
       <div class="float-right float-right-two-way">

diff --git a/static/lib/red5pro/README.md b/static/lib/red5pro/README.md
@@ -154,12 +154,14 @@ _It is recommended to include [adapter.js](https://github.com/webrtc/adapter) wh
 #### Configuration Properties
 | Property | Description | Notes |
 | --- | --- | --- |
-| protocol | The protocol for the WebSocket communication. | Required |
+| protocol | The protocol for the WebSocket communication; `ws` or `wss`. | Required. _If deployed remotely, browsers require communication over secure WebSockets._ |
 | host | The IP or address that the WebSocket server resides on. | Required |
-| port | The port on the host that the WebSocket server resides on. | Required |
+| port | The port on the host that the WebSocket server resides on; `8081` or `8083`. | Required |
 | app | The webapp name that the WebSocket is listening on. | Required |
 | streamName | The name of the stream to subscribe to. | Required |
 | iceServers | The list of ICE servers to use in requesting a Peer Connection. | Required |
+| streamMode | The mode to broadcast; `live`, `record` or `append`. | _Optional. Default: `live`_ |
+| bandwidth | An configuration object to setup bandwidth setting in publisher. | _Optional. Allow for provided SDP in offers._ |
 
 #### Example
 ```html
@@ -209,7 +211,7 @@ _It is recommended to include [adapter.js](https://github.com/webrtc/adapter) wh
       port: 8081,
       app: 'live',
       streamName: 'mystream',
-      streamType: 'webrtc',
+      streamMode: 'live',
       iceServers: iceServers
     })
     .then(function() {
@@ -236,11 +238,12 @@ The **Red5 Pro HTML SDK** supports the following SWF integration:
 #### Configuration Properties
 | Property | Description | Notes |
 | --- | --- | --- |
-| protocol | The protocol of the RTMP streaming endpoint. (e.g., `rtmp`, `rtmps`) | Required |
+| protocol | The protocol of the RTMP streaming endpoint; `rtmp` or `rtmps` | Required |
 | host | The IP or address that the stream resides on. | Required |
-| port | The port that the stream is accessible on. | Required |
+| port | The port that the stream is accessible on. (e.g., `1935`) | Required |
 | app | The application to locate the stream. | Required |
 | streamName | The stream name to subscribe to. | Required |
+| streamMode | The mode to broadcast; `live`, `record` or `append`. | _Optional. Default: `live`_ |
 | swf | The swf file location to use as the Flash client publisher. | _Optional. Default: `lib/red5pro/red5pro-publisher.swf`_ |
 | width | The width of the video element within the SWF movie. | _Optional. Default: `320`_ |
 | height | The height of the video element within the SWF movie. | _Optional. Default: `240`_ |
@@ -396,7 +399,7 @@ _It is recommended to include [adapter.js](https://github.com/webrtc/adapter) wh
 | subscriptionId | A unique string representing the requesting client. | _Optional. Default generated by library._ |
 | iceServers | The list of ICE servers to use in requesting a Peer Connection. | Required |
 | bandwidth | An configuration object to setup playback. | _Optional_ |
-| autoplay | Flag to autoplay the stream when received upon negotiation. | _Optional. Default: `true` |
+| autoplay | Flag to autoplay the stream when received upon negotiation. | _Optional. Default: `true`_ |
 
 #### Example
 ```html

diff --git a/static/lib/red5pro/SUBSCRIBER_EVENTS.md b/static/lib/red5pro/SUBSCRIBER_EVENTS.md
@@ -47,6 +47,7 @@ The following events are common across all Subscriber implementations from the R
 | SUBSCRIBE_FAIL | 'Subscribe.Fail' | When the subscriber has failed to start subscribing to a stream. |
 | SUBSCRIBE_INVALID_NAME | 'Subscribe.InvalidName' | When the subscriber is cannot start subscribing to stream because a stream associated with the `streamName` is not available. |
 | SUBSCRIBE_STOP | 'Subscribe.Stop' | When the subscriber has successfully closed an active subscription to a stream. |
+| SUBSCRIBE_METADATA | 'Subscribe.Metadata' | When metadata is received on the client from the server. |
 
 ## WebRTC Subscriber Events
 The following events are specific to the `RTCSubscriber` implementation and accessible on the global `red5prosdk` object from the `RTCSubscriberEventTypes` attribute. These events are dispatched during the lifecycle of thre trickle ICE functionality required to start subscribing to a stream:

diff --git a/static/lib/red5pro/red5pro-publisher.swf b/static/lib/red5pro/red5pro-publisher.swf
diff --git a/static/lib/red5pro/red5pro-sdk.min.js b/static/lib/red5pro/red5pro-sdk.min.js
diff --git a/static/lib/red5pro/red5pro-subscriber.swf b/static/lib/red5pro/red5pro-subscriber.swf