Fix #2606: Memory leak for RTMP client, pick from 4.0. v3.0.170

.github/workflows/release.yml

@@ -0,0 +1,75 @@
+name: "Release"
+
+on:
+  push:
+    tags:
+      - v3*
+
+jobs:
+  k8s:
+    name: actions-release-k8s
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # The github.ref is, for example, refs/tags/v3.0.145 or refs/tags/v3.0-r8
+      # Generate variables like:
+      #   SRS_TAG=v3.0.145
+      #   SRS_TAG=v3.0-r8
+      #   SRS_MAJOR=3
+      # @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+      - name: Generate varaiables
+        shell: bash
+        run: |
+          SRS_TAG=$(echo ${{ github.ref }}| awk -F '/' '{print $3}')
+          echo "SRS_TAG=$SRS_TAG" >> $GITHUB_ENV
+          SRS_MAJOR=$(echo $SRS_TAG| cut -c 2)
+          echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV
+
+      - name: Build SRS
+        shell: bash
+        run: |
+          echo "Release ossrs/srs:$SRS_TAG"
+          docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
+
+      - name: Login docker hub
+        uses: docker/login-action@v1
+        with:
+          username: "${{ secrets.DOCKER_USERNAME }}"
+          password: "${{ secrets.DOCKER_PASSWORD }}"
+      - name: Push to docker hub
+        shell: bash
+        run: |
+          docker push ossrs/srs:$SRS_TAG
+          docker tag ossrs/srs:$SRS_TAG ossrs/srs:$SRS_MAJOR
+          docker push ossrs/srs:$SRS_MAJOR
+
+      - name: Login Aliyun docker hub
+        uses: aliyun/acr-login@v1
+        with:
+          login-server: https://registry.cn-hangzhou.aliyuncs.com
+          username: "${{ secrets.ACR_USERNAME }}"
+          password: "${{ secrets.ACR_PASSWORD }}"
+      - name: Push to Aliyun docker hub
+        shell: bash
+        run: |
+          docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
+          docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
+
+      - name: Setup KUBCONFIG for Aliyun ACK
+        shell: bash
+        run: |-
+          KUBECONFIG=$RUNNER_TEMP/kubeconfig_$(date +%s)
+          echo "${{ secrets.KUBCONFIG }}" > $KUBECONFIG
+          echo "KUBECONFIG=$KUBECONFIG" >> $GITHUB_ENV
+
+      - name: Release SRS 3.0 to Aliyun ACK
+        shell: bash
+        if: ${{ startsWith(github.ref, 'refs/tags/v3') }}
+        run: |-
+          kubectl set image deploy/srs3-deploy srs=registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          kubectl describe deploy/srs3-deploy

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: "Test"
+
+on: [push, pull_request]
+
+jobs:
+  utest:
+    name: actions-test-utest
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build test image
+        run: docker build --tag srs:test -f trunk/Dockerfile.test .
+      # For utest
+      - name: Run SRS utest
+        run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
+  coverage:
+    name: actions-test-coverage
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build coverage image
+        run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
+      # For coverage
+      - name: Run SRS covergae
+        if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/pull/') }}
+        run: |
+          # The hash of commit.
+          SRS_SHA=${{ github.sha }}
+          # Note that the root of SRS, must contains .git, for report fixing.
+          SRS_PROJECT=/srs
+          # The github.ref is, for example, refs/heads/3.0release
+          SRS_BRANCH=$(echo ${{ github.ref }}| awk -F 'refs/heads/' '{print $2}'| awk -F '/' '{print $1}')
+          # The github.ref is, for example, refs/pull/2536/merge
+          SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/pull/' '{print $2}'| awk -F '/' '{print $1}')
+          echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
+          docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
+            srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'

.gitignore

@@ -22,7 +22,6 @@
 /trunk/research/librtmp/objs
 /trunk/3rdparty/ccache/ccache-3.1.9
 /trunk/3rdparty/gprof/graphviz-2.36.0
-/trunk/research/api-server/static-dir/crossdomain.xml
 /trunk/research/api-server/static-dir/forward
 /trunk/research/api-server/static-dir/live
 /trunk/research/api-server/static-dir/players

README.md

@@ -1,58 +1,51 @@
 # SRS(Simple Realtime Server)
 
 ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/srs3)
-[![](https://circleci.com/gh/ossrs/srs/tree/3.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/test.yml/badge.svg?branch=3.0release)](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/release.yml/badge.svg)](https://github.com/ossrs/srs/actions?query=workflow%3ARelease)
 [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 
-SRS/3.0，[OuXuli][release3]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181/RTSP。
+SRS/3.0，[OuXuli][release3]，是一个简单高效的实时视频服务器，支持RTMP/HLS/HTTP-FLV。
 
-SRS is a simple, high efficiency and realtime video server, supports RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181/RTSP.
+SRS is a simple, high efficiency and realtime video server, supports RTMP/HLS/HTTP-FLV.
 
 > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].
 
 <a name="product"></a>
 ## Usage
 
-Recommend to run SRS by [docker][docker-srs3]:
+Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) )**:
 
-```bash
+```
-docker run --rm -p 1935:1935 -p 1985:1985 -p 8080:8080 \
+git clone -b 3.0release https://gitee.com/ossrs/srs.git &&
-    ossrs/srs:3
+cd srs/trunk && ./configure && make && ./objs/srs -c conf/srs.conf
-
-# Or, for developers in China to speedup.
-docker run --rm -p 1935:1935 -p 1985:1985 -p 8080:8080 \
-    registry.cn-hangzhou.aliyuncs.com/ossrs/srs:3
 ```
 
-> Note: All [tags](https://github.com/ossrs/srs/tags) are available, such as 
+Open [http://localhost:8080/](http://localhost:8080/) to check it, then publish 
-> `ossrs/srs:v3.0-r3` for tag [v3.0-r3](https://github.com/ossrs/srs/releases/tag/v3.0-r3), 
+by [FFmpeg](https://ffmpeg.org/download.html) or [OBS](https://obsproject.com/download) as:
-> please check at [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/srs/images) 
-> or [there](https://hub.docker.com/r/ossrs/srs/tags).
-
-If it works, open [http://localhost:8080/](http://localhost:8080/) to check it, then publish 
-[stream](https://github.com/ossrs/srs/blob/3.0release/trunk/doc/source.200kbps.768x320.flv) by:
 
 ```bash
-ffmpeg -re -i doc/source.200kbps.768x320.flv -c copy \
+ffmpeg -re -i ./doc/source.flv -c copy -f flv -y rtmp://localhost/live/livestream
-    -f flv rtmp://localhost/live/livestream
-
-# Or by FFmpeg docker
-docker run --rm --network=host registry.cn-hangzhou.aliyuncs.com/ossrs/srs:encoder \
-  ffmpeg -re -i ./doc/source.200kbps.768x320.flv -c copy \
-      -f flv -y rtmp://localhost/live/livestream
 ```
 
-Play the following streams by players:
+Play the following streams by [players](https://ossrs.net):
 
 * VLC(RTMP): rtmp://localhost/live/livestream
 * H5(HTTP-FLV): [http://localhost:8080/live/livestream.flv](http://localhost:8080/players/srs_player.html?autostart=true&stream=livestream.flv&port=8080&schema=http)
 * H5(HLS): [http://localhost:8080/live/livestream.m3u8](http://localhost:8080/players/srs_player.html?autostart=true&stream=livestream.m3u8&port=8080&schema=http)
 
-> The online demos and players are available on [ossrs.net](https://ossrs.net).
+<a name="srs-30-wiki"></a>
+<a name="wiki"></a>
 
-Strongly recommend reading bellow wikis:
+From here, please read wikis:
 
+* [Getting Started](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started), please read Wiki first.
+* [中文文档：起步](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started)，不读Wiki一定扑街，不读文档请不要提Issue，不读文档请不要提问题，任何文档中明确说过的疑问都不会解答。
+
+Fast index for Wikis:
+
+* Overview? ([CN][v3_CN_Home], [EN][v3_EN_Home])
 * How to deliver RTMP streaming?([CN][v1_CN_SampleRTMP], [EN][v1_EN_SampleRTMP])
 * How to build RTMP Edge-Cluster?([CN][v3_CN_SampleRTMPCluster], [EN][v3_EN_SampleRTMPCluster])
 * How to build RTMP Origin-Cluster?([CN][v3_CN_SampleOriginCluster], [EN][v3_EN_SampleOriginCluster])
@@ -60,37 +53,7 @@ Strongly recommend reading bellow wikis:
 * How to deliver HLS streaming?([CN][v3_CN_SampleHLS], [EN][v3_EN_SampleHLS])
 * How to deliver low-latency streaming?([CN][v3_CN_SampleRealtime], [EN][v3_EN_SampleRealtime])
 
-It's also very easy to build from source:
+Other important wiki:
-
-**>>> Step 1:** Get SRS.
-
-```
-git clone https://gitee.com/winlinvip/srs.oschina.git srs &&
-cd srs/trunk && git remote set-url origin https://github.com/ossrs/srs.git && 
-git checkout 3.0release && git pull
-```
-
-> Note: We use [mirrors(gitee)](#mirrors) here, but it's also ok to directly clone by `git clone https://github.com/ossrs/srs.git && cd srs/trunk`
-
-**>>> Step 2:** Build SRS.
-
-```
-./configure && make
-```
-
-> Remark: Recommend to use Centos7 64bits, please read wiki([CN][v3_CN_Build],[EN][v3_EN_Build]).
-
-> Note: You can also build SRS in docker, please read [docker][docker-dev].
-
-**>>> Step 3:** Run SRS 
-
-```
-./objs/srs -c conf/srs.conf
-```
-
-<a name="srs-30-wiki"></a>
-<a name="wiki"></a>
-Other documents:
 
 * Usage: How to transode RTMP stream by FFMPEG?([CN][v2_CN_SampleFFMPEG], [EN][v2_EN_SampleFFMPEG])
 * Usage: How to delivery HTTP FLV Live Streaming Cluster?([CN][v3_CN_SampleHttpFlvCluster], [EN][v3_EN_SampleHttpFlvCluster])
@@ -98,8 +61,6 @@ Other documents:
 * Usage: How to forward stream to other servers?([CN][v3_CN_SampleForward], [EN][v3_EN_SampleForward])
 * Usage: How to improve edge performance for multiple CPUs? ([CN][v3_CN_REUSEPORT], [EN][v3_EN_REUSEPORT])
 * Usage: How to file a bug or contact us? ([CN][v1_CN_Contact], [EN][v1_EN_Contact])
-* [SRS 3.0 English Wiki][v3_EN_Home]
-* [SRS 3.0 Chinese Wiki][v3_CN_Home]
 
 ## Features
 
@@ -169,6 +130,15 @@ Other documents:
 
 ## V3 changes
 
+* v3.0, 2021-10-08, Fix [#2606](https://github.com/ossrs/srs/issues/2606): Memory leak for RTMP client, pick from 4.0. v3.0.170
+* <strong>v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.</strong>
+* <strong>v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.</strong>
+* v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164
+* <strong>v3.0, 2021-06-26, [3.0 release6(3.0.163)](https://github.com/ossrs/srs/releases/tag/v3.0-r6) released. 123011 lines.</strong>
+* v3.0, 2021-06-26, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 3.0.163
+* v3.0, 2021-05-12, Fix [#2311][bug #2311], Copy the request for stat client. 3.0.162
+* <strong>v3.0, 2021-04-28, [3.0 release5(3.0.161)][r3.0r5] released. 122750 lines.</strong>
+* v3.0, 2021-04-28, Upgrade players. 3.0.161
 * <strong>v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines.</strong>
 * v3.0, 2021-04-24, Package players and console to zip and docker. 3.0.160
 * v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159
@@ -369,6 +339,11 @@ Other documents:
 
 ## V2 changes
 
+* <strong>v2.0, 2021-08-14, [2.0 release11(2.0.276)](https://github.com/ossrs/srs/releases/tag/v2.0-r11) released. 89013 lines.</strong>
+* <strong>v2.0, 2021-07-04, [2.0 release10(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
+* v2.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 2.0.274
+* <strong>v2.0, 2021-06-26, [2.0 release9(2.0.273)](https://github.com/ossrs/srs/releases/tag/v2.0-r9) released. 87552 lines.</strong>
+* v2.0, 2021-06-25, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 2.0.273
 * <strong>v2.0, 2020-01-25, [2.0 release8(2.0.272)][r2.0r8] released. 87292 lines.</strong>
 * v2.0, 2020-01-08, Merge [#1554][bug #1554], support logrotate copytruncate. 2.0.272
 * v2.0, 2020-01-05, Merge [#1551][bug #1551], fix memory leak in RTSP stack. 2.0.270
@@ -807,6 +782,10 @@ Other documents:
 
 ## Releases
 
+* 2021-08-14, [Release v3.0-r8](https://github.com/ossrs/srs/releases/tag/v3.0-r8), 3.0 release8, 3.0.168, 124469 lines.
+* 2021-07-04, [Release v3.0-r7](https://github.com/ossrs/srs/releases/tag/v3.0-r7), 3.0 release7, 3.0.167, 123463 lines.
+* 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines.
+* 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
 * 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines.
 * 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines.
 * 2020-10-31, [Release v3.0-r2][r3.0r2], 3.0 release2, 3.0.153, 122663 lines.
@@ -1178,10 +1157,10 @@ A big THANK YOU goes to:
 
 ## Mirrors
 
-OSChina: [https://gitee.com/winlinvip/srs.oschina][oschina], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
+Gitee: [https://gitee.com/ossrs/srs][gitee], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
 
 ```
-git clone https://gitee.com/winlinvip/srs.oschina.git srs &&
+git clone https://gitee.com/ossrs/srs.git &&
 cd srs && git remote set-url origin https://github.com/ossrs/srs.git && git pull
 ```
 
@@ -1202,12 +1181,12 @@ git clone https://github.com/ossrs/srs.git
 
 | Branch | Cost | Size | CMD |
 | --- | --- | --- | --- |
-| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/winlinvip/srs.oschina.git |
+| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/ossrs/srs.git |
-| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
+| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/ossrs/srs.git |
-| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/winlinvip/srs.oschina.git |
+| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/ossrs/srs.git |
-| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
+| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/ossrs/srs.git |
-| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/winlinvip/srs.oschina.git |
+| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/ossrs/srs.git |
-| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
+| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/ossrs/srs.git |
 
 ## System Requirements
 
@@ -1258,7 +1237,7 @@ Winlin
 [libx264]: http://www.videolan.org/
 [srs]: https://github.com/ossrs/srs
 [csdn]: https://code.csdn.net/winlinvip/srs-csdn
-[oschina]: https://gitee.com/winlinvip/srs.oschina
+[gitee]: https://gitee.com/ossrs/srs
 [srs-dolphin]: https://github.com/ossrs/srs-dolphin
 [oryx]: https://github.com/ossrs/go-oryx
 [srs-bench]: https://github.com/ossrs/srs-bench
@@ -1744,10 +1723,12 @@ Winlin
 [bug #1987]: https://github.com/ossrs/srs/issues/1987
 [bug #1548]: https://github.com/ossrs/srs/issues/1548
 [bug #1694]: https://github.com/ossrs/srs/issues/1694
+[bug #2311]: https://github.com/ossrs/srs/issues/2311
 [bug #yyyyyyyyyyyyy]: https://github.com/ossrs/srs/issues/yyyyyyyyyyyyy
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828
 
+[r3.0r5]: https://github.com/ossrs/srs/releases/tag/v3.0-r5
 [r3.0r4]: https://github.com/ossrs/srs/releases/tag/v3.0-r4
 [r3.0r3]: https://github.com/ossrs/srs/releases/tag/v3.0-r3
 [r3.0r2]: https://github.com/ossrs/srs/releases/tag/v3.0-r2
@@ -1816,7 +1797,7 @@ Winlin
 [more0]: http://winlinvip.github.io/srs.release/releases/
 [more1]: http://ossrs.net/srs.release/releases/
 
-[LICENSE]: https://github.com/ossrs/srs/blob/develop/LICENSE
+[LICENSE]: https://github.com/ossrs/srs/blob/3.0release/LICENSE
 [LicenseMixing]: https://github.com/ossrs/srs/wiki/LicenseMixing
 
 [srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home

trunk/.gitignore

@@ -13,6 +13,7 @@
 /ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/
 /research/aac/
 /research/api-server/static-dir/mse
+/research/api-server/static-dir/crossdomain.xml
 /research/bat/
 /research/big/
 /research/bitch/

trunk/Dockerfile

@@ -0,0 +1,36 @@
+FROM ossrs/srs:dev AS build
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --jobs=2 && make -j2 && make install
+
+# All config files for SRS.
+RUN cp -R conf /usr/local/srs/conf
+# The default index.html and srs-console.
+RUN cp research/api-server/static-dir/index.html /usr/local/srs/objs/nginx/html/
+RUN cp research/api-server/static-dir/favicon.ico /usr/local/srs/objs/nginx/html/
+RUN cp research/players/crossdomain.xml /usr/local/srs/objs/nginx/html/
+RUN cp -R research/console /usr/local/srs/objs/nginx/html/
+RUN cp -R research/players /usr/local/srs/objs/nginx/html/
+#RUN cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
+
+############################################################
+# dist
+############################################################
+FROM centos:7 AS dist
+
+# Expose ports for live streaming
+EXPOSE 1935 1985 8080
+
+# FFMPEG 4.1
+COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
+# SRS binary, config files and srs-console.
+COPY --from=build /usr/local/srs /usr/local/srs
+
+# Default workdir and command.
+WORKDIR /usr/local/srs
+CMD ["./objs/srs", "-c", "conf/srs.conf"]

trunk/Dockerfile.cov

@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --gcov --jobs=2 && make -j2

trunk/Dockerfile.test

@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --jobs=2 && make -j2

trunk/auto/auto_headers.sh

@@ -11,6 +11,7 @@ echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
 echo "" >> $SRS_AUTO_HEADERS_H
 
+echo "#define SRS_AUTO_PACKAGER \"${SRS_AUTO_PACKAGER}\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H

trunk/auto/coverage.sh

@@ -1,36 +1,35 @@
 #!/bin/bash
 
 # In .circleci/config.yml, generate *.gcno with
-#       ./configure --gcov --without-research --without-librtmp && make
+#       ./configure --gcov --with-utest --without-research --without-librtmp && make
 # and generate *.gcda by
 #       ./objs/srs_utest
 
 # Workdir is objs/cover.
 workdir=`pwd`/objs/cover
 
-# Tool git is required to map the right path.
-git --version >/dev/null 2>&1
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Tool git is required, ret=$ret"; exit $ret; fi
-
 # Create trunk under workdir.
 mkdir -p $workdir && cd $workdir
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
 
-# Collect all *.gcno and *.gcda to objs/cover.
+CODECOV_ARGS=""
-cd $workdir && (rm -rf src && cp -R ../../src . && cp -R ../src/* src/)
+if [[ $SRS_PROJECT != '' ]]; then
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect *.gcno and *.gcda failed, ret=$ret"; exit $ret; fi
+  # -R root dir  Used when not in git/hg project to identify project root directory
-
+  # -p dir       Project root directory. Also used when preparing gcov
-# Generate *.gcov for coverage.
+  CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
-cd $workdir &&
+fi
-for file in `find src -name "*.cpp"|grep -v utest`; do
+if [[ $SRS_BRANCH != '' ]]; then
-    gcov $file -o `dirname $file`
+  # -B branch    Specify the branch name
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect $file failed, ret=$ret"; exit $ret; fi
+  CODECOV_ARGS="$CODECOV_ARGS -B $SRS_BRANCH"
-done
+fi
-
+if [[ $SRS_SHA != '' ]]; then
-# Cook the gcov files.
+  # -C sha       Specify the commit sha
-cd $workdir &&
+  CODECOV_ARGS="$CODECOV_ARGS -C $SRS_SHA"
-find . -name "*.gcov"|grep -v srs|xargs rm -f
+fi
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit $ret; fi
+if [[ $SRS_PR != '' ]]; then
+  # -P pr        Specify the pull request number
+  CODECOV_ARGS="$CODECOV_ARGS -P $SRS_PR"
+fi
 
 # Upload report with *.gcov
 # Remark: The file codecov.yml is not neccessary. It literally depends on git.
@@ -41,5 +40,6 @@ ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit
 #       https://circleci.com/gh/ossrs/srs/tree/3.0release
 cd $workdir &&
 export CODECOV_TOKEN="493bba46-c468-4e73-8b45-8cdd8ff62d96" &&
-bash <(curl -s https://codecov.io/bash) &&
+bash <(curl -s https://codecov.io/bash) $CODECOV_ARGS &&
 echo "Done" && exit 0
+

trunk/auto/depends.sh

@@ -388,9 +388,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
 
     # copy players to nginx html dir.
     rm -rf ${SRS_OBJS}/nginx/html/players &&
-    ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&
+    ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players
-    rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
-    ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
 
     # For srs-console.
     rm -rf ${SRS_OBJS}/nginx/html/console &&

trunk/conf/full.conf

@@ -105,6 +105,11 @@ inotify_auto_reload off;
 # default: on
 auto_reload_for_docker on;
 
+# Query the latest available version of SRS, write a log to notice user to upgrade.
+# @see https://github.com/ossrs/srs/issues/2424
+# Default: on
+query_latest_version on;
+
 #############################################################################################
 # heartbeat/stats sections
 #############################################################################################

trunk/configure

@@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
             "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
             "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
             "srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
-            "srs_app_caster_flv" "srs_app_process" "srs_app_ng_exec"
+            "srs_app_caster_flv" "srs_app_latest_version" "srs_app_uuid" "srs_app_process" "srs_app_ng_exec"
             "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
             "srs_app_coworkers")
     DEFINES=""

trunk/doc/source.flv

@@ -0,0 +1 @@
+source.200kbps.768x320.flv

trunk/research/players/index.html

@@ -20,16 +20,19 @@
             update_nav();
 
             var query = parse_query_string();
-            var url = "srs_player.html?vhost=" + srs_get_player_vhost();
+            var params = [];
-
             for (var key in query.user_query) {
-                if (key == "vhost") {
+                params.push(key + "=" + query[key]);
-                    continue;
-                }
-                url += "&" + key + "=" + query[key];
             }
 
+            var url = "srs_player.html";
+            if (params.length) {
+                url += '?' + params.join('&');
+            }
+
+            setTimeout(function () {
                 window.location.href = url;
+            }, 0);
         });
     </script>
 </head>

trunk/research/players/js/jwplayer.js

@@ -1,76 +0,0 @@
-"undefined"==typeof jwplayer&&(jwplayer=function(f){if(jwplayer.api)return jwplayer.api.selectPlayer(f)},jwplayer.version="6.4.3359",jwplayer.vid=document.createElement("video"),jwplayer.audio=document.createElement("audio"),jwplayer.source=document.createElement("source"),function(f){function a(g){return function(){return c(g)}}var l=document,e=window,j=navigator,b=f.utils=function(){};b.exists=function(g){switch(typeof g){case "string":return 0<g.length;case "object":return null!==g;case "undefined":return!1}return!0};
-b.styleDimension=function(g){return g+(0<g.toString().indexOf("%")?"":"px")};b.getAbsolutePath=function(g,a){b.exists(a)||(a=l.location.href);if(b.exists(g)){var c;if(b.exists(g)){c=g.indexOf("://");var j=g.indexOf("?");c=0<c&&(0>j||j>c)}else c=void 0;if(c)return g;c=a.substring(0,a.indexOf("://")+3);var j=a.substring(c.length,a.indexOf("/",c.length+1)),d;0===g.indexOf("/")?d=g.split("/"):(d=a.split("?")[0],d=d.substring(c.length+j.length+1,d.lastIndexOf("/")),d=d.split("/").concat(g.split("/")));
-for(var h=[],e=0;e<d.length;e++)d[e]&&(b.exists(d[e])&&"."!=d[e])&&(".."==d[e]?h.pop():h.push(d[e]));return c+j+"/"+h.join("/")}};b.extend=function(){var a=b.extend.arguments;if(1<a.length){for(var c=1;c<a.length;c++)b.foreach(a[c],function(c,d){try{b.exists(d)&&(a[0][c]=d)}catch(j){}});return a[0]}return null};b.log=function(a,b){"undefined"!=typeof console&&"undefined"!=typeof console.log&&(b?console.log(a,b):console.log(a))};var c=b.userAgentMatch=function(a){return null!==j.userAgent.toLowerCase().match(a)};
-b.isIE=a(/msie/i);b.isFF=a(/firefox/i);b.isChrome=a(/chrome/i);b.isIOS=a(/iP(hone|ad|od)/i);b.isIPod=a(/iP(hone|od)/i);b.isIPad=a(/iPad/i);b.isSafari602=a(/Macintosh.*Mac OS X 10_8.*6\.0\.\d* Safari/i);b.isAndroid=function(a){return a?c(RegExp("android.*"+a,"i")):c(/android/i)};b.isMobile=function(){return b.isIOS()||b.isAndroid()};b.saveCookie=function(a,b){l.cookie="jwplayer."+a+"\x3d"+b+"; path\x3d/"};b.getCookies=function(){for(var a={},b=l.cookie.split("; "),c=0;c<b.length;c++){var d=b[c].split("\x3d");
-0==d[0].indexOf("jwplayer.")&&(a[d[0].substring(9,d[0].length)]=d[1])}return a};b.typeOf=function(a){var b=typeof a;return"object"===b?!a?"null":a instanceof Array?"array":b:b};b.translateEventResponse=function(a,c){var d=b.extend({},c);a==f.events.JWPLAYER_FULLSCREEN&&!d.fullscreen?(d.fullscreen="true"==d.message?!0:!1,delete d.message):"object"==typeof d.data?(d=b.extend(d,d.data),delete d.data):"object"==typeof d.metadata&&b.deepReplaceKeyName(d.metadata,["__dot__","__spc__","__dsh__","__default__"],
-["."," ","-","default"]);b.foreach(["position","duration","offset"],function(a,b){d[b]&&(d[b]=Math.round(1E3*d[b])/1E3)});return d};b.flashVersion=function(){if(b.isAndroid())return 0;var a=j.plugins,d;try{if("undefined"!==a&&(d=a["Shockwave Flash"]))return parseInt(d.description.replace(/\D+(\d+)\..*/,"$1"))}catch(c){}if("undefined"!=typeof e.ActiveXObject)try{if(d=new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))return parseInt(d.GetVariable("$version").split(" ")[1].split(",")[0])}catch(f){}return 0};
-b.getScriptPath=function(a){for(var b=l.getElementsByTagName("script"),d=0;d<b.length;d++){var c=b[d].src;if(c&&0<=c.indexOf(a))return c.substr(0,c.indexOf(a))}return""};b.deepReplaceKeyName=function(a,d,c){switch(f.utils.typeOf(a)){case "array":for(var j=0;j<a.length;j++)a[j]=f.utils.deepReplaceKeyName(a[j],d,c);break;case "object":b.foreach(a,function(b,h){var j;if(d instanceof Array&&c instanceof Array){if(d.length!=c.length)return;j=d}else j=[d];for(var e=b,l=0;l<j.length;l++)e=e.replace(RegExp(d[l],
-"g"),c[l]);a[e]=f.utils.deepReplaceKeyName(h,d,c);b!=e&&delete a[b]})}return a};var d=b.pluginPathType={ABSOLUTE:0,RELATIVE:1,CDN:2};b.getPluginPathType=function(a){if("string"==typeof a){a=a.split("?")[0];var c=a.indexOf("://");if(0<c)return d.ABSOLUTE;var j=a.indexOf("/");a=b.extension(a);return 0>c&&0>j&&(!a||!isNaN(a))?d.CDN:d.RELATIVE}};b.getPluginName=function(a){return a.replace(/^(.*\/)?([^-]*)-?.*\.(swf|js)$/,"$2")};b.getPluginVersion=function(a){return a.replace(/[^-]*-?([^\.]*).*$/,"$1")};
-b.isYouTube=function(a){return-1<a.indexOf("youtube.com")||-1<a.indexOf("youtu.be")};b.isRtmp=function(a,b){return 0==a.indexOf("rtmp")||"rtmp"==b};b.foreach=function(a,b){var d,c;for(d in a)a.hasOwnProperty(d)&&(c=a[d],b(d,c))};b.isHTTPS=function(){return 0==e.location.href.indexOf("https")};b.repo=function(){var a=""+f.version.split(/\W/).splice(0,2).join("/")+"/";try{b.isHTTPS()&&(a=a.replace("http://","https://ssl."))}catch(d){}return a}}(jwplayer),function(f){var a="video/",
-l=f.foreach,e={mp4:a+"mp4",vorbis:"audio/ogg",ogg:a+"ogg",webm:a+"webm",aac:"audio/mp4",mp3:"audio/mpeg",hls:"application/vnd.apple.mpegurl"},j={mp4:e.mp4,f4v:e.mp4,m4v:e.mp4,mov:e.mp4,m4a:e.aac,f4a:e.aac,aac:e.aac,mp3:e.mp3,ogv:e.ogg,ogg:e.vorbis,oga:e.vorbis,webm:e.webm,m3u8:e.hls,hls:e.hls},a="video",a={flv:a,f4v:a,mov:a,m4a:a,m4v:a,mp4:a,aac:a,f4a:a,mp3:"sound",smil:"rtmp",m3u8:"hls",hls:"hls"},b=f.extensionmap={};l(j,function(a,d){b[a]={html5:d}});l(a,function(a,d){b[a]||(b[a]={});b[a].flash=
-d});b.types=e;b.mimeType=function(a){var b;l(e,function(j,e){!b&&e==a&&(b=j)});return b};b.extType=function(a){return b.mimeType(j[a])}}(jwplayer.utils),function(f){var a=f.loaderstatus={NEW:0,LOADING:1,ERROR:2,COMPLETE:3},l=document;f.scriptloader=function(e){function j(){c=a.ERROR;g.sendEvent(d.ERROR)}function b(){c=a.COMPLETE;g.sendEvent(d.COMPLETE)}var c=a.NEW,d=jwplayer.events,g=new d.eventdispatcher;f.extend(this,g);this.load=function(){var g=f.scriptloader.loaders[e];if(g&&(g.getStatus()==
-a.NEW||g.getStatus()==a.LOADING))g.addEventListener(d.ERROR,j),g.addEventListener(d.COMPLETE,b);else if(f.scriptloader.loaders[e]=this,c==a.NEW){c=a.LOADING;var m=l.createElement("script");m.addEventListener?(m.onload=b,m.onerror=j):m.readyState&&(m.onreadystatechange=function(){("loaded"==m.readyState||"complete"==m.readyState)&&b()});l.getElementsByTagName("head")[0].appendChild(m);m.src=e}};this.getStatus=function(){return c}};f.scriptloader.loaders={}}(jwplayer.utils),function(f){f.trim=function(a){return a.replace(/^\s*/,
-"").replace(/\s*$/,"")};f.pad=function(a,f,e){for(e||(e="0");a.length<f;)a=e+a;return a};f.xmlAttribute=function(a,f){for(var e=0;e<a.attributes.length;e++)if(a.attributes[e].name&&a.attributes[e].name.toLowerCase()==f.toLowerCase())return a.attributes[e].value.toString();return""};f.extension=function(a){if(!a||"rtmp"==a.substr(0,4))return"";a=a.substring(a.lastIndexOf("/")+1,a.length).split("?")[0].split("#")[0];if(-1<a.lastIndexOf("."))return a.substr(a.lastIndexOf(".")+1,a.length).toLowerCase()};
-f.stringToColor=function(a){a=a.replace(/(#|0x)?([0-9A-F]{3,6})$/gi,"$2");3==a.length&&(a=a.charAt(0)+a.charAt(0)+a.charAt(1)+a.charAt(1)+a.charAt(2)+a.charAt(2));return parseInt(a,16)}}(jwplayer.utils),function(f){f.key=function(a){var l,e,j;this.edition=function(){return j&&j.getTime()<(new Date).getTime()?"invalid":l};this.token=function(){return e};f.exists(a)||(a="");try{a=f.tea.decrypt(a,"36QXq4W@GSBV^teR");var b=a.split("/");(l=b[0])||(l="free");e=b[1];b[2]&&0<parseInt(b[2])&&(j=new Date,j.setTime(String(b[2])))}catch(c){l=
-"invalid"}}}(jwplayer.utils),function(f){var a=f.tea={};a.encrypt=function(j,b){if(0==j.length)return"";var c=a.strToLongs(e.encode(j));1>=c.length&&(c[1]=0);for(var d=a.strToLongs(e.encode(b).slice(0,16)),g=c.length,f=c[g-1],m=c[0],n,k=Math.floor(6+52/g),h=0;0<k--;){h+=2654435769;n=h>>>2&3;for(var r=0;r<g;r++)m=c[(r+1)%g],f=(f>>>5^m<<2)+(m>>>3^f<<4)^(h^m)+(d[r&3^n]^f),f=c[r]+=f}c=a.longsToStr(c);return l.encode(c)};a.decrypt=function(j,b){if(0==j.length)return"";for(var c=a.strToLongs(l.decode(j)),
-d=a.strToLongs(e.encode(b).slice(0,16)),g=c.length,f=c[g-1],m=c[0],n,k=2654435769*Math.floor(6+52/g);0!=k;){n=k>>>2&3;for(var h=g-1;0<=h;h--)f=c[0<h?h-1:g-1],f=(f>>>5^m<<2)+(m>>>3^f<<4)^(k^m)+(d[h&3^n]^f),m=c[h]-=f;k-=2654435769}c=a.longsToStr(c);c=c.replace(/\0+$/,"");return e.decode(c)};a.strToLongs=function(a){for(var b=Array(Math.ceil(a.length/4)),c=0;c<b.length;c++)b[c]=a.charCodeAt(4*c)+(a.charCodeAt(4*c+1)<<8)+(a.charCodeAt(4*c+2)<<16)+(a.charCodeAt(4*c+3)<<24);return b};a.longsToStr=function(a){for(var b=
-Array(a.length),c=0;c<a.length;c++)b[c]=String.fromCharCode(a[c]&255,a[c]>>>8&255,a[c]>>>16&255,a[c]>>>24&255);return b.join("")};var l={code:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\x3d",encode:function(a,b){var c,d,g,f,m=[],n="",k,h,r=l.code;h=("undefined"==typeof b?0:b)?e.encode(a):a;k=h.length%3;if(0<k)for(;3>k++;)n+="\x3d",h+="\x00";for(k=0;k<h.length;k+=3)c=h.charCodeAt(k),d=h.charCodeAt(k+1),g=h.charCodeAt(k+2),f=c<<16|d<<8|g,c=f>>18&63,d=f>>12&63,g=f>>6&63,f&=63,m[k/
-3]=r.charAt(c)+r.charAt(d)+r.charAt(g)+r.charAt(f);m=m.join("");return m=m.slice(0,m.length-n.length)+n},decode:function(a,b){b="undefined"==typeof b?!1:b;var c,d,g,f,m,n=[],k,h=l.code;k=b?e.decode(a):a;for(var r=0;r<k.length;r+=4)c=h.indexOf(k.charAt(r)),d=h.indexOf(k.charAt(r+1)),f=h.indexOf(k.charAt(r+2)),m=h.indexOf(k.charAt(r+3)),g=c<<18|d<<12|f<<6|m,c=g>>>16&255,d=g>>>8&255,g&=255,n[r/4]=String.fromCharCode(c,d,g),64==m&&(n[r/4]=String.fromCharCode(c,d)),64==f&&(n[r/4]=String.fromCharCode(c));
-f=n.join("");return b?e.decode(f):f}},e={encode:function(a){a=a.replace(/[\u0080-\u07ff]/g,function(a){a=a.charCodeAt(0);return String.fromCharCode(192|a>>6,128|a&63)});return a=a.replace(/[\u0800-\uffff]/g,function(a){a=a.charCodeAt(0);return String.fromCharCode(224|a>>12,128|a>>6&63,128|a&63)})},decode:function(a){a=a.replace(/[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,function(a){a=(a.charCodeAt(0)&15)<<12|(a.charCodeAt(1)&63)<<6|a.charCodeAt(2)&63;return String.fromCharCode(a)});return a=
-a.replace(/[\u00c0-\u00df][\u0080-\u00bf]/g,function(a){a=(a.charCodeAt(0)&31)<<6|a.charCodeAt(1)&63;return String.fromCharCode(a)})}}}(jwplayer.utils),function(f){f.events={COMPLETE:"COMPLETE",ERROR:"ERROR",API_READY:"jwplayerAPIReady",JWPLAYER_READY:"jwplayerReady",JWPLAYER_FULLSCREEN:"jwplayerFullscreen",JWPLAYER_RESIZE:"jwplayerResize",JWPLAYER_ERROR:"jwplayerError",JWPLAYER_MEDIA_BEFOREPLAY:"jwplayerMediaBeforePlay",JWPLAYER_MEDIA_BEFORECOMPLETE:"jwplayerMediaBeforeComplete",JWPLAYER_COMPONENT_SHOW:"jwplayerComponentShow",
-JWPLAYER_COMPONENT_HIDE:"jwplayerComponentHide",JWPLAYER_MEDIA_BUFFER:"jwplayerMediaBuffer",JWPLAYER_MEDIA_BUFFER_FULL:"jwplayerMediaBufferFull",JWPLAYER_MEDIA_ERROR:"jwplayerMediaError",JWPLAYER_MEDIA_LOADED:"jwplayerMediaLoaded",JWPLAYER_MEDIA_COMPLETE:"jwplayerMediaComplete",JWPLAYER_MEDIA_SEEK:"jwplayerMediaSeek",JWPLAYER_MEDIA_TIME:"jwplayerMediaTime",JWPLAYER_MEDIA_VOLUME:"jwplayerMediaVolume",JWPLAYER_MEDIA_META:"jwplayerMediaMeta",JWPLAYER_MEDIA_MUTE:"jwplayerMediaMute",JWPLAYER_MEDIA_LEVELS:"jwplayerMediaLevels",
-JWPLAYER_MEDIA_LEVEL_CHANGED:"jwplayerMediaLevelChanged",JWPLAYER_CAPTIONS_CHANGED:"jwplayerCaptionsChanged",JWPLAYER_CAPTIONS_LIST:"jwplayerCaptionsList",JWPLAYER_PLAYER_STATE:"jwplayerPlayerState",state:{BUFFERING:"BUFFERING",IDLE:"IDLE",PAUSED:"PAUSED",PLAYING:"PLAYING"},JWPLAYER_PLAYLIST_LOADED:"jwplayerPlaylistLoaded",JWPLAYER_PLAYLIST_ITEM:"jwplayerPlaylistItem",JWPLAYER_PLAYLIST_COMPLETE:"jwplayerPlaylistComplete",JWPLAYER_DISPLAY_CLICK:"jwplayerViewClick",JWPLAYER_CONTROLS:"jwplayerViewControls",
-JWPLAYER_INSTREAM_CLICK:"jwplayerInstreamClicked",JWPLAYER_INSTREAM_DESTROYED:"jwplayerInstreamDestroyed"}}(jwplayer),function(f){var a=jwplayer.utils;f.eventdispatcher=function(f,e){var j,b;this.resetEventListeners=function(){j={};b=[]};this.resetEventListeners();this.addEventListener=function(b,d,g){try{a.exists(j[b])||(j[b]=[]),"string"==a.typeOf(d)&&(d=(new Function("return "+d))()),j[b].push({listener:d,count:g})}catch(e){a.log("error",e)}return!1};this.removeEventListener=function(b,d){if(j[b]){try{for(var g=
-0;g<j[b].length;g++)if(j[b][g].listener.toString()==d.toString()){j[b].splice(g,1);break}}catch(e){a.log("error",e)}return!1}};this.addGlobalListener=function(c,d){try{"string"==a.typeOf(c)&&(c=(new Function("return "+c))()),b.push({listener:c,count:d})}catch(g){a.log("error",g)}return!1};this.removeGlobalListener=function(c){if(c){try{for(var d=0;d<b.length;d++)if(b[d].listener.toString()==c.toString()){b.splice(d,1);break}}catch(g){a.log("error",g)}return!1}};this.sendEvent=function(c,d){a.exists(d)||
-(d={});a.extend(d,{id:f,version:jwplayer.version,type:c});e&&a.log(c,d);if("undefined"!=a.typeOf(j[c]))for(var g=0;g<j[c].length;g++){try{j[c][g].listener(d)}catch(q){a.log("There was an error while handling a listener: "+q.toString(),j[c][g].listener)}j[c][g]&&(1===j[c][g].count?delete j[c][g]:0<j[c][g].count&&(j[c][g].count-=1))}for(g=0;g<b.length;g++){try{b[g].listener(d)}catch(m){a.log("There was an error while handling a listener: "+m.toString(),b[g].listener)}b[g]&&(1===b[g].count?delete b[g]:
-0<b[g].count&&(b[g].count-=1))}}}}(jwplayer.events),function(f){var a={},l={};f.plugins=function(){};f.plugins.loadPlugins=function(e,j){l[e]=new f.plugins.pluginloader(new f.plugins.model(a),j);return l[e]};f.plugins.registerPlugin=function(e,j,b,c){var d=f.utils.getPluginName(e);a[d]||(a[d]=new f.plugins.plugin(e));a[d].registerPlugin(e,j,b,c)}}(jwplayer),function(f){f.plugins.model=function(a){this.addPlugin=function(l){var e=f.utils.getPluginName(l);a[e]||(a[e]=new f.plugins.plugin(l));return a[e]};
-this.getPlugins=function(){return a}}}(jwplayer),function(f){var a=jwplayer.utils,l=jwplayer.events;f.pluginmodes={FLASH:0,JAVASCRIPT:1,HYBRID:2};f.plugin=function(e){function j(){switch(a.getPluginPathType(e)){case a.pluginPathType.ABSOLUTE:return e;case a.pluginPathType.RELATIVE:return a.getAbsolutePath(e,window.location.href)}}function b(){n=setTimeout(function(){d=a.loaderstatus.COMPLETE;k.sendEvent(l.COMPLETE)},1E3)}function c(){d=a.loaderstatus.ERROR;k.sendEvent(l.ERROR)}var d=a.loaderstatus.NEW,
-g,q,m,n,k=new l.eventdispatcher;a.extend(this,k);this.load=function(){if(d==a.loaderstatus.NEW)if(0<e.lastIndexOf(".swf"))g=e,d=a.loaderstatus.COMPLETE,k.sendEvent(l.COMPLETE);else if(a.getPluginPathType(e)==a.pluginPathType.CDN)d=a.loaderstatus.COMPLETE,k.sendEvent(l.COMPLETE);else{d=a.loaderstatus.LOADING;var h=new a.scriptloader(j());h.addEventListener(l.COMPLETE,b);h.addEventListener(l.ERROR,c);h.load()}};this.registerPlugin=function(b,c,e,j){n&&(clearTimeout(n),n=void 0);m=c;e&&j?(g=j,q=e):"string"==
-typeof e?g=e:"function"==typeof e?q=e:!e&&!j&&(g=b);d=a.loaderstatus.COMPLETE;k.sendEvent(l.COMPLETE)};this.getStatus=function(){return d};this.getPluginName=function(){return a.getPluginName(e)};this.getFlashPath=function(){if(g)switch(a.getPluginPathType(g)){case a.pluginPathType.ABSOLUTE:return g;case a.pluginPathType.RELATIVE:return 0<e.lastIndexOf(".swf")?a.getAbsolutePath(g,window.location.href):a.getAbsolutePath(g,j())}return null};this.getJS=function(){return q};this.getTarget=function(){return m};
-this.getPluginmode=function(){if("undefined"!=typeof g&&"undefined"!=typeof q)return f.pluginmodes.HYBRID;if("undefined"!=typeof g)return f.pluginmodes.FLASH;if("undefined"!=typeof q)return f.pluginmodes.JAVASCRIPT};this.getNewInstance=function(a,b,d){return new q(a,b,d)};this.getURL=function(){return e}}}(jwplayer.plugins),function(f){var a=f.utils,l=f.events,e=a.foreach;f.plugins.pluginloader=function(j,b){function c(){m?h.sendEvent(l.ERROR,{message:n}):q||(q=!0,g=a.loaderstatus.COMPLETE,h.sendEvent(l.COMPLETE))}
-function d(){k||c();if(!q&&!m){var b=0,d=j.getPlugins();a.foreach(k,function(g){g=a.getPluginName(g);var e=d[g];g=e.getJS();var h=e.getTarget(),e=e.getStatus();if(e==a.loaderstatus.LOADING||e==a.loaderstatus.NEW)b++;else if(g&&(!h||parseFloat(h)>parseFloat(f.version)))m=!0,n="Incompatible player version",c()});0==b&&c()}}var g=a.loaderstatus.NEW,q=!1,m=!1,n,k=b,h=new l.eventdispatcher;a.extend(this,h);this.setupPlugins=function(b,d,c){var g={length:0,plugins:{}},h=0,f={},r=j.getPlugins();e(d.plugins,
-function(e,j){var k=a.getPluginName(e),l=r[k],m=l.getFlashPath(),n=l.getJS(),q=l.getURL();m&&(g.plugins[m]=a.extend({},j),g.plugins[m].pluginmode=l.getPluginmode(),g.length++);try{if(n&&d.plugins&&d.plugins[q]){var v=document.createElement("div");v.id=b.id+"_"+k;v.style.position="absolute";v.style.top=0;v.style.zIndex=h+10;f[k]=l.getNewInstance(b,a.extend({},d.plugins[q]),v);h++;b.onReady(c(f[k],v,!0));b.onResize(c(f[k],v))}}catch(B){a.log("ERROR: Failed to load "+k+".")}});b.plugins=f;return g};
-this.load=function(){if(!(a.exists(b)&&"object"!=a.typeOf(b))){g=a.loaderstatus.LOADING;e(b,function(b){a.exists(b)&&(b=j.addPlugin(b),b.addEventListener(l.COMPLETE,d),b.addEventListener(l.ERROR,r))});var c=j.getPlugins();e(c,function(a,b){b.load()})}d()};var r=this.pluginFailed=function(){m||(m=!0,n="File not found",c())};this.getStatus=function(){return g}}}(jwplayer),function(f){f.playlist=function(a){var l=[];if("array"==f.utils.typeOf(a))for(var e=0;e<a.length;e++)l.push(new f.playlist.item(a[e]));
-else l.push(new f.playlist.item(a));return l}}(jwplayer),function(f){var a=f.item=function(l){var e=jwplayer.utils,j=e.extend({},a.defaults,l);j.tracks=e.exists(l.tracks)?l.tracks:[];0==j.sources.length&&(j.sources=[new f.source(j)]);for(var b=0;b<j.sources.length;b++){var c=j.sources[b]["default"];j.sources[b]["default"]=c?"true"==c.toString():!1;j.sources[b]=new f.source(j.sources[b])}if(j.captions&&!e.exists(l.tracks)){for(l=0;l<j.captions.length;l++)j.tracks.push(j.captions[l]);delete j.captions}for(b=
-0;b<j.tracks.length;b++)j.tracks[b]=new f.track(j.tracks[b]);return j};a.defaults={description:"",image:"",mediaid:"",title:"",sources:[],tracks:[]}}(jwplayer.playlist),function(f){var a=jwplayer.utils,l={file:void 0,label:void 0,type:void 0,"default":void 0};f.source=function(e){var j=a.extend({},l);a.foreach(l,function(b){a.exists(e[b])&&(j[b]=e[b],delete e[b])});j.type&&0<j.type.indexOf("/")&&(j.type=a.extensionmap.mimeType(j.type));"m3u8"==j.type&&(j.type="hls");"smil"==j.type&&(j.type="rtmp");
-return j}}(jwplayer.playlist),function(f){var a=jwplayer.utils,l={file:void 0,label:void 0,kind:"captions","default":!1};f.track=function(e){var j=a.extend({},l);e||(e={});a.foreach(l,function(b){a.exists(e[b])&&(j[b]=e[b],delete e[b])});return j}}(jwplayer.playlist),function(f){var a=f.utils,l=f.events,e=document,j=f.embed=function(b){function c(b,d){a.foreach(d,function(a,d){"function"==typeof b[a]&&b[a].call(b,d)})}function d(a){q(n,t+a.message)}function g(){q(n,t+"No playable sources found")}
-function q(b,d){if(m.fallback){var c=b.style;c.backgroundColor="#000";c.color="#FFF";c.width=a.styleDimension(m.width);c.height=a.styleDimension(m.height);c.display="table";c.opacity=1;var c=document.createElement("p"),g=c.style;g.verticalAlign="middle";g.textAlign="center";g.display="table-cell";g.font="15px/20px Arial, Helvetica, sans-serif";c.innerHTML=d.replace(":",":\x3cbr\x3e");b.innerHTML="";b.appendChild(c)}}var m=new j.config(b.config),n,k,h,r=m.width,p=m.height,t="Error loading player: ",
-s=f.plugins.loadPlugins(b.id,m.plugins);m.fallbackDiv&&(h=m.fallbackDiv,delete m.fallbackDiv);m.id=b.id;k=e.getElementById(b.id);m.aspectratio?b.config.aspectratio=m.aspectratio:delete b.config.aspectratio;n=e.createElement("div");n.id=k.id;n.style.width=0<r.toString().indexOf("%")?r:r+"px";n.style.height=0<p.toString().indexOf("%")?p:p+"px";k.parentNode.replaceChild(n,k);f.embed.errorScreen=q;s.addEventListener(l.COMPLETE,function(){if("array"==a.typeOf(m.playlist)&&2>m.playlist.length&&(0==m.playlist.length||
-!m.playlist[0].sources||0==m.playlist[0].sources.length))g();else if(s.getStatus()==a.loaderstatus.COMPLETE){for(var e=0;e<m.modes.length;e++)if(m.modes[e].type&&j[m.modes[e].type]){var f=a.extend({},m),r=new j[m.modes[e].type](n,m.modes[e],f,s,b);if(r.supportsConfig())return r.addEventListener(l.ERROR,d),r.embed(),c(b,f.events),b}m.fallback?(a.log("No suitable players found and fallback enabled"),new j.download(n,m,g)):(a.log("No suitable players found and fallback disabled"),n.parentNode.replaceChild(h,
-n))}});s.addEventListener(l.ERROR,function(a){q(n,"Could not load plugins: "+a.message)});s.load();return b}}(jwplayer),function(f){function a(a){if(a.playlist)for(var c=0;c<a.playlist.length;c++)a.playlist[c]=new j(a.playlist[c]);else{var d={};e.foreach(j.defaults,function(c){l(a,d,c)});d.sources||(a.levels?(d.sources=a.levels,delete a.levels):(c={},l(a,c,"file"),l(a,c,"type"),d.sources=c.file?[c]:[]));a.playlist=[new j(d)]}}function l(a,c,d){e.exists(a[d])&&(c[d]=a[d],delete a[d])}var e=f.utils,
-j=f.playlist.item;(f.embed.config=function(b){var c={fallback:!0,height:270,primary:"html5",width:480,base:b.base?b.base:e.getScriptPath("jwplayer.js"),aspectratio:""};b=e.extend(c,f.defaults,b);var c={type:"html5",src:b.base+"jwplayer.html5.js"},d={type:"flash",src:b.base+"jwplayer.flash.swf"};b.modes="flash"==b.primary?[d,c]:[c,d];b.listbar&&(b.playlistsize=b.listbar.size,b.playlistposition=b.listbar.position);b.flashplayer&&(d.src=b.flashplayer);b.html5player&&(c.src=b.html5player);a(b);d=b.aspectratio;
-if("string"!=typeof d||!e.exists(d))c=0;else{var g=d.indexOf(":");-1==g?c=0:(c=parseFloat(d.substr(0,g)),d=parseFloat(d.substr(g+1)),c=0>=c||0>=d?0:100*(d/c)+"%")}-1==b.width.toString().indexOf("%")?delete b.aspectratio:c?b.aspectratio=c:delete b.aspectratio;return b}).addConfig=function(b,c){a(c);return e.extend(b,c)}}(jwplayer),function(f){var a=f.utils,l=document;f.embed.download=function(e,f,b){function c(b,d){for(var c=l.querySelectorAll(b),g=0;g<c.length;g++)a.foreach(d,function(a,b){c[g].style[a]=
-b})}function d(a,b,d){a=l.createElement(a);b&&(a.className="jwdownload"+b);d&&d.appendChild(a);return a}var g=a.extend({},f),q=g.width?g.width:480,m=g.height?g.height:320,n;f=f.logo?f.logo:{prefix:a.repo(),file:"logo.png",margin:10};var k,h,r,g=g.playlist,p,t=["mp4","aac","mp3"];if(g&&g.length){p=g[0];n=p.sources;for(g=0;g<n.length;g++){var s=n[g],u=s.type?s.type:a.extensionmap.extType(a.extension(s.file));s.file&&a.foreach(t,function(b){u==t[b]?(k=s.file,h=p.image):a.isYouTube(s.file)&&(r=s.file)})}k?
-(n=k,b=h,e&&(g=d("a","display",e),d("div","icon",g),d("div","logo",g),n&&g.setAttribute("href",a.getAbsolutePath(n))),g="#"+e.id+" .jwdownload",e.style.width="",e.style.height="",c(g+"display",{width:a.styleDimension(Math.max(320,q)),height:a.styleDimension(Math.max(180,m)),background:"black center no-repeat "+(b?"url("+b+")":""),backgroundSize:"contain",position:"relative",border:"none",display:"block"}),c(g+"display div",{position:"absolute",width:"100%",height:"100%"}),c(g+"logo",{top:f.margin+
-"px",right:f.margin+"px",background:"top right no-repeat url("+f.prefix+f.file+")"}),c(g+"icon",{background:"center no-repeat url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAgNJREFUeNrs28lqwkAYB/CZqNVDDj2r6FN41QeIy8Fe+gj6BL275Q08u9FbT8ZdwVfotSBYEPUkxFOoks4EKiJdaDuTjMn3wWBO0V/+sySR8SNSqVRKIR8qaXHkzlqS9jCfzzWcTCYp9hF5o+59sVjsiRzcegSckFzcjT+ruN80TeSlAjCAAXzdJSGPFXRpAAMYwACGZQkSdhG4WCzehMNhqV6vG6vVSrirKVEw66YoSqDb7cqlUilE8JjHd/y1MQefVzqdDmiaJpfLZWHgXMHn8F6vJ1cqlVAkEsGuAn83J4gAd2RZymQygX6/L1erVQt+9ZPWb+CDwcCC2zXGJaewl/DhcHhK3DVj+KfKZrMWvFarcYNLomAv4aPRSFZVlTlcSPA5fDweW/BoNIqFnKV53JvncjkLns/n/cLdS+92O7RYLLgsKfv9/t8XlDn4eDyiw+HA9Jyz2eyt0+kY2+3WFC5hluej0Ha7zQQq9PPwdDq1Et1sNsx/nFBgCqWJ8oAK1aUptNVqcYWewE4nahfU0YQnk4ntUEfGMIU2m01HoLaCKbTRaDgKtaVLk9tBYaBcE/6Artdr4RZ5TB6/dC+9iIe/WgAMYADDpAUJAxjAAAYwgGFZgoS/AtNNTF7Z2bL0BYPBV3Jw5xFwwWcYxgtBP5OkE8i9G7aWGOOCruvauwADALMLMEbKf4SdAAAAAElFTkSuQmCC)"})):
-r?(f=r,e=d("embed","",e),e.src="http://www.youtube.com/v/"+/v[=\/](\w*)|\/(\w+)$|^(\w+)$/i.exec(f).slice(1).join(""),e.type="application/x-shockwave-flash",e.width=q,e.height=m):b()}}}(jwplayer),function(f){var a=f.utils,l=f.events,e={};(f.embed.flash=function(j,b,c,d,g){function q(a,b,d){var c=document.createElement("param");c.setAttribute("name",b);c.setAttribute("value",d);a.appendChild(c)}function m(a,b,d){return function(){try{d&&document.getElementById(g.id+"_wrapper").appendChild(b);var c=
-document.getElementById(g.id).getPluginConfig("display");"function"==typeof a.resize&&a.resize(c.width,c.height);b.style.left=c.x;b.style.top=c.h}catch(e){}}}function n(b){if(!b)return{};var d={},c=[];a.foreach(b,function(b,g){var e=a.getPluginName(b);c.push(b);a.foreach(g,function(a,b){d[e+"."+a]=b})});d.plugins=c.join(",");return d}var k=new f.events.eventdispatcher,h=a.flashVersion();a.extend(this,k);this.embed=function(){c.id=g.id;if(10>h)return k.sendEvent(l.ERROR,{message:"Flash version must be 10.0 or greater"}),
-!1;var f,p,t=g.config.listbar,s=a.extend({},c);if(j.id+"_wrapper"==j.parentNode.id)f=document.getElementById(j.id+"_wrapper");else{f=document.createElement("div");p=document.createElement("div");p.style.display="none";p.id=j.id+"_aspect";f.id=j.id+"_wrapper";f.style.position="relative";f.style.display="block";f.style.width=a.styleDimension(s.width);f.style.height=a.styleDimension(s.height);if(g.config.aspectratio){var u=parseFloat(g.config.aspectratio);p.style.display="block";p.style.marginTop=g.config.aspectratio;
-f.style.height="auto";f.style.display="inline-block";t&&("bottom"==t.position?p.style.paddingBottom=t.size+"px":"right"==t.position&&(p.style.marginBottom=-1*t.size*(u/100)+"px"))}j.parentNode.replaceChild(f,j);f.appendChild(j);f.appendChild(p)}f=d.setupPlugins(g,s,m);0<f.length?a.extend(s,n(f.plugins)):delete s.plugins;"undefined"!=typeof s["dock.position"]&&"false"==s["dock.position"].toString().toLowerCase()&&(s.dock=s["dock.position"],delete s["dock.position"]);f=s.wmode?s.wmode:s.height&&40>=
-s.height?"transparent":"opaque";p="height width modes events primary base fallback volume".split(" ");for(t=0;t<p.length;t++)delete s[p[t]];p=a.getCookies();a.foreach(p,function(a,b){"undefined"==typeof s[a]&&(s[a]=b)});p=window.location.href.split("/");p.splice(p.length-1,1);p=p.join("/");s.base=p+"/";e[j.id]=s;a.isIE()?(p='\x3cobject classid\x3d"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" " width\x3d"100%" height\x3d"100%"id\x3d"'+j.id+'" name\x3d"'+j.id+'" tabindex\x3d0""\x3e',p+='\x3cparam name\x3d"movie" value\x3d"'+
-b.src+'"\x3e',p+='\x3cparam name\x3d"allowfullscreen" value\x3d"true"\x3e\x3cparam name\x3d"allowscriptaccess" value\x3d"always"\x3e',p+='\x3cparam name\x3d"seamlesstabbing" value\x3d"true"\x3e',p+='\x3cparam name\x3d"wmode" value\x3d"'+f+'"\x3e',p+='\x3cparam name\x3d"bgcolor" value\x3d"#000000"\x3e',p+="\x3c/object\x3e",j.outerHTML=p,f=document.getElementById(j.id)):(p=document.createElement("object"),p.setAttribute("type","application/x-shockwave-flash"),p.setAttribute("data",b.src),p.setAttribute("width",
-"100%"),p.setAttribute("height","100%"),p.setAttribute("bgcolor","#000000"),p.setAttribute("id",j.id),p.setAttribute("name",j.id),p.setAttribute("tabindex",0),q(p,"allowfullscreen","true"),q(p,"allowscriptaccess","always"),q(p,"seamlesstabbing","true"),q(p,"wmode",f),j.parentNode.replaceChild(p,j),f=p);g.config.aspectratio&&(f.style.position="absolute");g.container=f;g.setPlayer(f,"flash")};this.supportsConfig=function(){if(h)if(c){if("string"==a.typeOf(c.playlist))return!0;try{var b=c.playlist[0].sources;
-if("undefined"==typeof b)return!0;for(var d=0;d<b.length;d++){var g;if(g=b[d].file){var e=b[d].file,f=b[d].type;if(a.isYouTube(e)||a.isRtmp(e,f)||"hls"==f)g=!0;else{var j=a.extensionmap[f?f:a.extension(e)];g=!j?!1:!!j.flash}}if(g)return!0}}catch(k){}}else return!0;return!1}}).getVars=function(a){return e[a]}}(jwplayer),function(f){var a=f.utils,l=a.extensionmap,e=f.events;f.embed.html5=function(j,b,c,d,g){function q(a,b,d){return function(){try{var c=document.querySelector("#"+j.id+" .jwmain");d&&
-c.appendChild(b);"function"==typeof a.resize&&(a.resize(c.clientWidth,c.clientHeight),setTimeout(function(){a.resize(c.clientWidth,c.clientHeight)},400));b.left=c.style.left;b.top=c.style.top}catch(g){}}}function m(a){n.sendEvent(a.type,{message:"HTML5 player not found"})}var n=this,k=new e.eventdispatcher;a.extend(n,k);n.embed=function(){if(f.html5){d.setupPlugins(g,c,q);j.innerHTML="";var h=f.utils.extend({},c);delete h.volume;h=new f.html5.player(h);g.container=document.getElementById(g.id);g.setPlayer(h,
-"html5")}else h=new a.scriptloader(b.src),h.addEventListener(e.ERROR,m),h.addEventListener(e.COMPLETE,n.embed),h.load()};n.supportsConfig=function(){if(f.vid.canPlayType)try{if("string"==a.typeOf(c.playlist))return!0;for(var b=c.playlist[0].sources,d=0;d<b.length;d++){var g;var e=b[d].file,j=b[d].type;if(null!==navigator.userAgent.match(/BlackBerry/i)||a.isAndroid()&&("m3u"==a.extension(e)||"m3u8"==a.extension(e))||a.isRtmp(e,j))g=!1;else{var k=l[j?j:a.extension(e)],m;if(!k||k.flash&&!k.html5)m=!1;
-else{var n=k.html5,q=f.vid;if(n)try{m=q.canPlayType(n)?!0:!1}catch(z){m=!1}else m=!0}g=m}if(g)return!0}}catch(A){}return!1}}}(jwplayer),function(f){var a=f.embed,l=f.utils,e=l.extend(function(e){var b=l.repo(),c=l.extend({},f.defaults),d=l.extend({},c,e.config),g=e.config,q=d.plugins,m=d.analytics,n=b+"jwpsrv.js",k=b+"sharing.js",h=b+"related.js",r=b+"gapro.js",c=f.key?f.key:c.key,p="premium"/*(new f.utils.key(c)).edition()*/,q=q?q:{}; /*alert(c);*/ "ads"==p&&d.advertising&&(d.advertising.client.match(".js$|.swf$")?q[d.advertising.client]=
-d.advertising:q[b+d.advertising.client+".js"]=d.advertising);delete g.advertising;g.key=c;d.analytics&&(d.analytics.client&&d.analytics.client.match(".js$|.swf$"))&&(n=d.analytics.client);delete g.analytics;if("free"==p||!m||!1!==m.enabled)q[n]=m?m:{};delete q.sharing;delete q.related;if("premium"==p||"ads"==p)d.sharing&&(d.sharing.client&&d.sharing.client.match(".js$|.swf$")&&(k=d.sharing.client),q[k]=d.sharing),d.related&&(d.related.client&&d.related.client.match(".js$|.swf$")&&(h=d.related.client),
-q[h]=d.related),d.ga&&(d.ga.client&&d.ga.client.match(".js$|.swf$")&&(r=d.ga.client),q[r]=d.ga),d.skin&&(g.skin=d.skin.replace(/^(beelden|bekle|five|glow|modieus|roundster|stormtrooper|vapor)$/i,l.repo()+"skins/$1.xml"));g.plugins=q;return new a(e)},a);f.embed=e}(jwplayer),function(f){var a=[],l=f.utils,e=f.events,j=e.state,b=document,c=f.api=function(a){function g(a,b){return function(d){return b(a,d)}}function q(a,b){p[a]||(p[a]=[],n(e.JWPLAYER_PLAYER_STATE,function(b){var d=b.newstate;b=b.oldstate;
-if(d==a){var c=p[d];if(c)for(var g=0;g<c.length;g++)"function"==typeof c[g]&&c[g].call(this,{oldstate:b,newstate:d})}}));p[a].push(b);return h}function m(a,b){try{a.jwAddEventListener(b,'function(dat) { jwplayer("'+h.id+'").dispatchEvent("'+b+'", dat); }')}catch(d){l.log("Could not add internal listener")}}function n(a,b){r[a]||(r[a]=[],t&&s&&m(t,a));r[a].push(b);return h}function k(){if(s){for(var a=arguments[0],b=[],d=1;d<arguments.length;d++)b.push(arguments[d]);if("undefined"!=typeof t&&"function"==
-typeof t[a])switch(b.length){case 4:return t[a](b[0],b[1],b[2],b[3]);case 3:return t[a](b[0],b[1],b[2]);case 2:return t[a](b[0],b[1]);case 1:return t[a](b[0]);default:return t[a]()}return null}u.push(arguments)}var h=this,r={},p={},t=void 0,s=!1,u=[],w=void 0,x={},y={};h.container=a;h.id=a.id;h.getBuffer=function(){return k("jwGetBuffer")};h.getContainer=function(){return h.container};h.addButton=function(a,b,d,c){try{y[c]=d,k("jwDockAddButton",a,b,"jwplayer('"+h.id+"').callback('"+c+"')",c)}catch(g){l.log("Could not add dock button"+
-g.message)}};h.removeButton=function(a){k("jwDockRemoveButton",a)};h.callback=function(a){if(y[a])y[a]()};h.forceState=function(a){k("jwForceState",a);return h};h.releaseState=function(){return k("jwReleaseState")};h.getDuration=function(){return k("jwGetDuration")};h.getFullscreen=function(){return k("jwGetFullscreen")};h.getStretching=function(){return k("jwGetStretching")};h.getHeight=function(){return k("jwGetHeight")};h.getLockState=function(){return k("jwGetLockState")};h.getMeta=function(){return h.getItemMeta()};
-h.getMute=function(){return k("jwGetMute")};h.getPlaylist=function(){var a=k("jwGetPlaylist");"flash"==h.renderingMode&&l.deepReplaceKeyName(a,["__dot__","__spc__","__dsh__","__default__"],["."," ","-","default"]);return a};h.getPlaylistItem=function(a){l.exists(a)||(a=h.getCurrentItem());return h.getPlaylist()[a]};h.getPosition=function(){return k("jwGetPosition")};h.getRenderingMode=function(){return h.renderingMode};h.getState=function(){return k("jwGetState")};h.getVolume=function(){return k("jwGetVolume")};
-h.getWidth=function(){return k("jwGetWidth")};h.setFullscreen=function(a){l.exists(a)?k("jwSetFullscreen",a):k("jwSetFullscreen",!k("jwGetFullscreen"));return h};h.setStretching=function(a){k("jwSetStretching",a);return h};h.setMute=function(a){l.exists(a)?k("jwSetMute",a):k("jwSetMute",!k("jwGetMute"));return h};h.lock=function(){return h};h.unlock=function(){return h};h.load=function(a){k("jwLoad",a);return h};h.playlistItem=function(a){k("jwPlaylistItem",parseInt(a));return h};h.playlistPrev=function(){k("jwPlaylistPrev");
-return h};h.playlistNext=function(){k("jwPlaylistNext");return h};h.resize=function(a,d){if("flash"!=h.renderingMode){var c=document.getElementById(h.id);c.className=c.className.replace(/\s+aspectMode/,"");c.style.display="block";k("jwResize",a,d)}else{var c=b.getElementById(h.id+"_wrapper"),g=b.getElementById(h.id+"_aspect");g&&(g.style.display="none");c&&(c.style.display="block",c.style.width=l.styleDimension(a),c.style.height=l.styleDimension(d))}return h};h.play=function(a){"undefined"==typeof a?
-(a=h.getState(),a==j.PLAYING||a==j.BUFFERING?k("jwPause"):k("jwPlay")):k("jwPlay",a);return h};h.pause=function(a){"undefined"==typeof a?(a=h.getState(),a==j.PLAYING||a==j.BUFFERING?k("jwPause"):k("jwPlay")):k("jwPause",a);return h};h.stop=function(){k("jwStop");return h};h.seek=function(a){k("jwSeek",a);return h};h.setVolume=function(a){k("jwSetVolume",a);return h};h.loadInstream=function(a,b){return w=new c.instream(this,t,a,b)};h.getQualityLevels=function(){return k("jwGetQualityLevels")};h.getCurrentQuality=
-function(){return k("jwGetCurrentQuality")};h.setCurrentQuality=function(a){k("jwSetCurrentQuality",a)};h.getCaptionsList=function(){return k("jwGetCaptionsList")};h.getCurrentCaptions=function(){return k("jwGetCurrentCaptions")};h.setCurrentCaptions=function(a){k("jwSetCurrentCaptions",a)};h.getControls=function(){return k("jwGetControls")};h.getSafeRegion=function(){return k("jwGetSafeRegion")};h.setControls=function(a){k("jwSetControls",a)};h.destroyPlayer=function(){k("jwPlayerDestroy")};var z=
-{onBufferChange:e.JWPLAYER_MEDIA_BUFFER,onBufferFull:e.JWPLAYER_MEDIA_BUFFER_FULL,onError:e.JWPLAYER_ERROR,onFullscreen:e.JWPLAYER_FULLSCREEN,onMeta:e.JWPLAYER_MEDIA_META,onMute:e.JWPLAYER_MEDIA_MUTE,onPlaylist:e.JWPLAYER_PLAYLIST_LOADED,onPlaylistItem:e.JWPLAYER_PLAYLIST_ITEM,onPlaylistComplete:e.JWPLAYER_PLAYLIST_COMPLETE,onReady:e.API_READY,onResize:e.JWPLAYER_RESIZE,onComplete:e.JWPLAYER_MEDIA_COMPLETE,onSeek:e.JWPLAYER_MEDIA_SEEK,onTime:e.JWPLAYER_MEDIA_TIME,onVolume:e.JWPLAYER_MEDIA_VOLUME,
-onBeforePlay:e.JWPLAYER_MEDIA_BEFOREPLAY,onBeforeComplete:e.JWPLAYER_MEDIA_BEFORECOMPLETE,onDisplayClick:e.JWPLAYER_DISPLAY_CLICK,onControls:e.JWPLAYER_CONTROLS,onQualityLevels:e.JWPLAYER_MEDIA_LEVELS,onQualityChange:e.JWPLAYER_MEDIA_LEVEL_CHANGED,onCaptionsList:e.JWPLAYER_CAPTIONS_LIST,onCaptionsChange:e.JWPLAYER_CAPTIONS_CHANGED};l.foreach(z,function(a){h[a]=g(z[a],n)});var A={onBuffer:j.BUFFERING,onPause:j.PAUSED,onPlay:j.PLAYING,onIdle:j.IDLE};l.foreach(A,function(a){h[a]=g(A[a],q)});h.remove=
-function(){if(!s)throw"Cannot call remove() before player is ready";u=[];c.destroyPlayer(this.id)};h.setup=function(a){if(f.embed){var d=b.getElementById(h.id);d&&(a.fallbackDiv=d);d=h;u=[];c.destroyPlayer(d.id);d=f(h.id);d.config=a;return new f.embed(d)}return h};h.registerPlugin=function(a,b,d,c){f.plugins.registerPlugin(a,b,d,c)};h.setPlayer=function(a,b){t=a;h.renderingMode=b};h.detachMedia=function(){if("html5"==h.renderingMode)return k("jwDetachMedia")};h.attachMedia=function(a){if("html5"==
-h.renderingMode)return k("jwAttachMedia",a)};h.dispatchEvent=function(a,b){if(r[a])for(var d=l.translateEventResponse(a,b),c=0;c<r[a].length;c++)if("function"==typeof r[a][c])try{a==e.JWPLAYER_PLAYLIST_LOADED&&l.deepReplaceKeyName(d.playlist,["__dot__","__spc__","__dsh__","__default__"],["."," ","-","default"]),r[a][c].call(this,d)}catch(g){l.log("There was an error calling back an event handler")}};h.dispatchInstreamEvent=function(a){w&&w.dispatchEvent(a,arguments)};h.callInternal=k;h.playerReady=
-function(a){s=!0;t||h.setPlayer(b.getElementById(a.id));h.container=b.getElementById(h.id);l.foreach(r,function(a){m(t,a)});n(e.JWPLAYER_PLAYLIST_ITEM,function(){x={}});n(e.JWPLAYER_MEDIA_META,function(a){l.extend(x,a.metadata)});for(h.dispatchEvent(e.API_READY);0<u.length;)k.apply(this,u.shift())};h.getItemMeta=function(){return x};h.getCurrentItem=function(){return k("jwGetPlaylistIndex")};return h};c.selectPlayer=function(d){var g;l.exists(d)||(d=0);d.nodeType?g=d:"string"==typeof d&&(g=b.getElementById(d));
-return g?(d=c.playerById(g.id))?d:c.addPlayer(new c(g)):"number"==typeof d?a[d]:null};c.playerById=function(b){for(var c=0;c<a.length;c++)if(a[c].id==b)return a[c];return null};c.addPlayer=function(b){for(var c=0;c<a.length;c++)if(a[c]==b)return b;a.push(b);return b};c.destroyPlayer=function(d){for(var c=-1,e,f=0;f<a.length;f++)a[f].id==d&&(c=f,e=a[f]);0<=c&&(d=e.id,f=b.getElementById(d+("flash"==e.renderingMode?"_wrapper":"")),l.clearCss&&l.clearCss("#"+d),f&&("html5"==e.renderingMode&&e.destroyPlayer(),
-e=b.createElement("div"),e.id=d,f.parentNode.replaceChild(e,f)),a.splice(c,1));return null};f.playerReady=function(a){var b=f.api.playerById(a.id);b?b.playerReady(a):f.api.selectPlayer(a.id).playerReady(a)}}(jwplayer),function(f){var a=f.events,l=f.utils,e=a.state;f.api.instream=function(f,b,c,d){function g(a,b){k[a]||(k[a]=[],n.jwInstreamAddEventListener(a,'function(dat) { jwplayer("'+m.id+'").dispatchInstreamEvent("'+a+'", dat); }'));k[a].push(b);return this}function q(b,c){h[b]||(h[b]=[],g(a.JWPLAYER_PLAYER_STATE,
-function(a){var c=a.newstate,d=a.oldstate;if(c==b){var e=h[c];if(e)for(var f=0;f<e.length;f++)"function"==typeof e[f]&&e[f].call(this,{oldstate:d,newstate:c,type:a.type})}}));h[b].push(c);return this}var m=f,n=b,k={},h={};this.dispatchEvent=function(a,b){if(k[a])for(var c=l.translateEventResponse(a,b[1]),d=0;d<k[a].length;d++)"function"==typeof k[a][d]&&k[a][d].call(this,c)};this.onError=function(b){return g(a.JWPLAYER_ERROR,b)};this.onFullscreen=function(b){return g(a.JWPLAYER_FULLSCREEN,b)};this.onMeta=
-function(b){return g(a.JWPLAYER_MEDIA_META,b)};this.onMute=function(b){return g(a.JWPLAYER_MEDIA_MUTE,b)};this.onComplete=function(b){return g(a.JWPLAYER_MEDIA_COMPLETE,b)};this.onTime=function(b){return g(a.JWPLAYER_MEDIA_TIME,b)};this.onBuffer=function(a){return q(e.BUFFERING,a)};this.onPause=function(a){return q(e.PAUSED,a)};this.onPlay=function(a){return q(e.PLAYING,a)};this.onIdle=function(a){return q(e.IDLE,a)};this.onClick=function(b){return g(a.JWPLAYER_INSTREAM_CLICK,b)};this.onInstreamDestroyed=
-function(b){return g(a.JWPLAYER_INSTREAM_DESTROYED,b)};this.play=function(a){n.jwInstreamPlay(a)};this.pause=function(a){n.jwInstreamPause(a)};this.destroy=function(){n.jwInstreamDestroy()};m.callInternal("jwLoadInstream",c,d?d:{})}}(jwplayer),function(f){var a=f.api,l=a.selectPlayer;a.selectPlayer=function(a){return(a=l(a))?a:{registerPlugin:function(a,b,c){f.plugins.registerPlugin(a,b,c)}}}}(jwplayer));

trunk/research/players/js/srs.page.js

@@ -12,13 +12,6 @@ function srs_get_player_modal() { return 740; }
 function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
-// get the default vhost for players.
-function srs_get_player_vhost() { return "players"; }
-// the api server port, for chat room.
-function srs_get_api_server_port() { return 8085; }
-// the srs http server port
-function srs_get_srs_http_server_port() { return 8080; }
-
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
@@ -29,35 +22,24 @@ function srs_get_srs_http_server_port() { return 8080; }
 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);
-    $("#nav_jwplayer6").attr("href", "jwplayer6.html" + window.location.search);
-    $("#nav_osmf").attr("href", "osmf.html" + window.location.search);
     $("#nav_vlc").attr("href", "vlc.html" + window.location.search);
 }
 
 // Special extra params, such as auth_key.
 function user_extra_params(query, params) {
     var queries = params || [];
-    var server = (query.server == undefined)? window.location.hostname:query.server;
-    var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
 
     for (var key in query.user_query) {
-        if (key == 'app' || key == 'autostart' || key == 'dir'
+        if (key === 'app' || key === 'autostart' || key === 'dir'
-            || key == 'filename' || key == 'host' || key == 'hostname'
+            || key === 'filename' || key === 'host' || key === 'hostname'
-            || key == 'http_port' || key == 'pathname' || key == 'port'
+            || key === 'http_port' || key === 'pathname' || key === 'port'
-            || key == 'server' || key == 'stream' || key == 'buffer'
+            || key === 'server' || key === 'stream' || key === 'buffer'
-            || key == 'schema' || key == 'vhost'
+            || key === 'schema' || key === 'vhost' || key === 'api'
         ) {
             continue;
         }
@@ -70,75 +52,42 @@ function user_extra_params(query, params) {
     return queries;
 }
 
+function is_default_port(schema, port) {
+    return (schema === 'http' && port === 80)
+        || (schema === 'https' && port === 443)
+        || (schema === 'webrtc' && port === 1985)
+        || (schema === 'rtmp' && port === 1935);
+}
+
 /**
 @param server the ip of server. default to window.location.hostname
-@param vhost the vhost of rtmp. default to window.location.hostname
+@param vhost the vhost of HTTP-FLV. default to window.location.hostname
-@param port the port of rtmp. default to 1935
+@param port the port of HTTP-FLV. default to 1935
-@param app the app of rtmp. default to live.
+@param app the app of HTTP-FLV. default to live.
-@param stream the stream of rtmp. default to livestream.
+@param stream the stream of HTTP-FLV. default to livestream.flv
 */
-function build_default_rtmp_url() {
+function build_default_flv_url() {
     var query = parse_query_string();
 
-    var schema = (!query.schema)? "rtmp":query.schema;
+    var schema = (!query.schema)? "http":query.schema;
     var server = (!query.server)? window.location.hostname:query.server;
-    var port = (!query.port)? schema=="http"?80:1935:query.port;
+    var port = (!query.port)? (schema==="http"? 8080:1935) : Number(query.port);
     var vhost = (!query.vhost)? window.location.hostname:query.vhost;
     var app = (!query.app)? "live":query.app;
-    var stream = (!query.stream)? "livestream":query.stream;
+    var stream = (!query.stream)? "livestream.flv":query.stream;
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
 
     var queries = [];
-    if (server != vhost && vhost != "__defaultVhost__") {
+    if (server !== vhost && vhost !== "__defaultVhost__") {
         queries.push("vhost=" + vhost);
     }
     queries = user_extra_params(query, queries);
 
-    var uri = schema + "://" + server + ":" + port + "/" + app + "/" + stream + "?" + queries.join('&');
+    var uri = schema + "://" + server;
-    while (uri.indexOf("?") == uri.length - 1) {
+    if (!is_default_port(schema, port)) {
-        uri = uri.substr(0, uri.length - 1);
+        uri += ":" + port;
     }
-
+    uri += "/" + app + "/" + stream + "?" + queries.join('&');
-    return uri;
+    while (uri.indexOf("?") === uri.length - 1) {
-}
-// for the chat to init the publish url.
-function build_default_publish_rtmp_url() {
-    var query = parse_query_string();
-
-    var schema = (!query.schema)? "rtmp":query.schema;
-    var server = (!query.server)? window.location.hostname:query.server;
-    var port = (!query.port)? schema=="http"?80:1935:query.port;
-    var vhost = (!query.vhost)? window.location.hostname:query.vhost;
-    var app = (!query.app)? "live":query.app;
-    var stream = (!query.stream)? "demo":query.stream;
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
-
-    var queries = [];
-    if (server != vhost && vhost != "__defaultVhost__") {
-        queries.push("vhost=" + vhost);
-    }
-    if (query.shp_identify) {
-        queries.push("shp_identify=" + query.shp_identify);
-    }
-
-    var uri = schema + "://" + server + ":" + port + "/" + app + "/" + stream + "?" + queries.join('&');
-    while (uri.indexOf("?") == uri.length - 1) {
         uri = uri.substr(0, uri.length - 1);
     }
 
@@ -148,96 +97,73 @@ function build_default_publish_rtmp_url() {
 function build_default_bandwidth_rtmp_url() {
     var query = parse_query_string();
 
+    var schema = 'rtmp';
     var server = (!query.server)? window.location.hostname:query.server;
     var port = (!query.port)? 1935:query.port;
     var vhost = "bandcheck.srs.com";
     var app = (!query.app)? "app":query.app;
     var key = (!query.key)? "35c9b402c12a7246868752e2878f7e0e":query.key;
 
-    // Note that ossrs.net provides only web service,
+    var uri = schema + "://" + server;
-    // that is migrating to r.ossrs.net
+    if (!is_default_port(schema, port)) {
-    if (vhost == "ossrs.net") {
+        uri += ":" + port;
-        vhost = "r.ossrs.net";
     }
-    if (server == "ossrs.net") {
+    uri += "/" + app + "?key=" + key + "&vhost=" + vhost;
-        server = "r.ossrs.net";
+
+    return uri;
 }
 
-    return "rtmp://" + server + ":" + port + "/" + app + "?key=" + key + "&vhost=" + vhost;
+function build_default_rtc_url(query) {
+    // Use target to overwrite server, vhost and eip.
+    console.log('?target=x.x.x.x to overwrite server, vhost and eip.');
+    if (query.target) {
+        query.server = query.vhost = query.eip = query.target;
+        query.user_query.eip = query.target;
+        delete query.target;
     }
 
-/**
+    var server = (!query.server)? window.location.hostname:query.server;
-@param server the ip of server. default to window.location.hostname
+    var vhost = (!query.vhost)? window.location.hostname:query.vhost;
-@param vhost the vhost of hls. default to window.location.hostname
-@param hls_vhost the vhost of hls. override the server if specified.
-@param hls_port the port of hls. default to window.location.port
-@param app the app of hls. default to live.
-@param stream the stream of hls. default to livestream.
-*/
-function build_default_hls_url() {
-    var query = parse_query_string();
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (query.hls_vhost == "ossrs.net") {
-        query.hls_vhost = "r.ossrs.net";
-    }
-
-    // for http, use hls_vhost to override server if specified.
-    var server = window.location.hostname;
-    if (query.server != undefined) {
-        server = query.server;
-    } else if (query.hls_vhost != undefined) {
-        server = query.hls_vhost;
-    }
-    
-    var port = (!query.hls_port)? window.location.port:query.hls_port;
     var app = (!query.app)? "live":query.app;
-    var stream = (!query.stream)? "demo":query.stream;
+    var stream = (!query.stream)? "livestream":query.stream;
+    var api = query.api? ':'+query.api : '';
 
-    if (!port) {
+    var queries = [];
-        port = 8080;
+    if (server !== vhost && vhost !== "__defaultVhost__") {
+        queries.push("vhost=" + vhost);
+    }
+    if (query.schema && window.location.protocol !== query.schema + ':') {
+        queries.push('schema=' + query.schema);
+    }
+    queries = user_extra_params(query, queries);
+
+    var uri = "webrtc://" + server + api + "/" + app + "/" + stream + "?" + queries.join('&');
+    while (uri.lastIndexOf("?") === uri.length - 1) {
+        uri = uri.substr(0, uri.length - 1);
     }
 
-    if (stream.indexOf(".flv") >= 0) {
+    return uri;
-        return "http://" + server + ":" + port + "/" + app + "/" + stream;
+};
-    }
-    return "http://" + server + ":" + port + "/" + app + "/" + stream + ".m3u8";
-}
 
 /**
 * initialize the page.
-* @param rtmp_url the div id contains the rtmp stream url to play
+* @param flv_url the div id contains the flv stream url to play
 * @param hls_url the div id contains the hls stream url to play
 * @param modal_player the div id contains the modal player
 */
-function srs_init_rtmp(rtmp_url, modal_player) {
+function srs_init_flv(flv_url, modal_player) {
-    srs_init(rtmp_url, null, modal_player);
-}
-function srs_init_hls(hls_url, modal_player) {
-    srs_init(null, hls_url, modal_player);
-}
-function srs_init(rtmp_url, hls_url, modal_player) {
     update_nav();
-
+    if (flv_url) {
-    if (rtmp_url) {
+        $(flv_url).val(build_default_flv_url());
-        $(rtmp_url).val(build_default_rtmp_url());
-    }
-    if (hls_url) {
-        $(hls_url).val(build_default_hls_url());
     }
     if (modal_player) {
         $(modal_player).width(srs_get_player_modal() + "px");
         $(modal_player).css("margin-left", "-" + srs_get_player_modal() / 2 +"px");
     }
 }
-// for the chat to init the publish url.
+function srs_init_rtc(id, query) {
-function srs_init_publish(rtmp_url) {
     update_nav();
-    
+    $(id).val(build_default_rtc_url(query));
-    if (rtmp_url) {
-        $(rtmp_url).val(build_default_publish_rtmp_url());
-    }
 }
 // for bw to init url
 // url: scheme://host:port/path?query#fragment

trunk/research/players/js/winlin.utility.js

@@ -3,9 +3,9 @@
 /**
  * common utilities
  * depends: jquery1.10
- * https://code.csdn.net/snippets/147103
+ * https://gitee.com/winlinvip/codes/rpn0c2ewbomj81augzk4y59
  * @see: http://blog.csdn.net/win_lin/article/details/17994347
- * v 1.0.17
+ * v 1.0.23
  */
 
 /**
@@ -236,9 +236,9 @@ function parse_query_string(){
 
     // parse the query string.
     var query_string = String(window.location.search).replace(" ", "").split("?")[1];
-    if(query_string == undefined){
+    if(query_string === undefined){
         query_string = String(window.location.hash).replace(" ", "").split("#")[1];
-        if(query_string == undefined){
+        if(query_string === undefined){
             return obj;
         }
     }
@@ -252,7 +252,7 @@ function __fill_query(query_string, obj) {
     // pure user query object.
     obj.user_query = {};
 
-    if (query_string.length == 0) {
+    if (query_string.length === 0) {
         return;
     }
 
@@ -293,7 +293,9 @@ function __fill_query(query_string, obj) {
 function parse_rtmp_url(rtmp_url) {
     // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri
     var a = document.createElement("a");
-    a.href = rtmp_url.replace("rtmp://", "http://");
+    a.href = rtmp_url.replace("rtmp://", "http://")
+        .replace("webrtc://", "http://")
+        .replace("rtc://", "http://");
 
     var vhost = a.hostname;
     var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
@@ -315,7 +317,7 @@ function parse_rtmp_url(rtmp_url) {
 
     // when vhost equals to server, and server is ip,
     // the vhost is __defaultVhost__
-    if (a.hostname == vhost) {
+    if (a.hostname === vhost) {
         var re = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
         if (re.test(a.hostname)) {
             vhost = "__defaultVhost__";
@@ -327,7 +329,17 @@ function parse_rtmp_url(rtmp_url) {
     if (rtmp_url.indexOf("://") > 0) {
         schema = rtmp_url.substr(0, rtmp_url.indexOf("://"));
     }
-    var port = (a.port == "")? (schema=="http"?"80":"1935"):a.port;
+
+    var port = a.port;
+    if (!port) {
+        if (schema === 'http') {
+            port = 80;
+        } else if (schema === 'https') {
+            port = 443;
+        } else if (schema === 'rtmp') {
+            port = 1935;
+        }
+    }
 
     var ret = {
         url: rtmp_url,
@@ -337,6 +349,20 @@ function parse_rtmp_url(rtmp_url) {
     };
     __fill_query(a.search, ret);
 
+    // For webrtc API, we use 443 if page is https, or schema specified it.
+    if (!ret.port) {
+        if (schema === 'webrtc' || schema === 'rtc') {
+            if (ret.user_query.schema === 'https') {
+                ret.port = 443;
+            } else if (window.location.href.indexOf('https://') === 0) {
+                ret.port = 443;
+            } else {
+                // For WebRTC, SRS use 1985 as default API port.
+                ret.port = 1985;
+            }
+        }
+    }
+
     return ret;
 }
 
@@ -658,10 +684,3 @@ AsyncRefresh2.prototype.request = function(timeout) {
     }, timeout);
 }
 
-// other components.
-/**
- * jquery/bootstrap pager.
- * depends: jquery1.10, boostrap2
- * https://code.csdn.net/snippets/146160
- * @see: http://blog.csdn.net/win_lin/article/details/17628631
- */

trunk/research/players/jwplayer6.html

@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>SRS</title>   
-    <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
-    <script type="text/javascript" src="js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="js/srs.page.js"></script>
-    <script type="text/javascript" src="js/srs.log.js"></script>
-    <script type="text/javascript" src="js/srs.player.js"></script>
-    <script type="text/javascript" src="js/srs.publisher.js"></script>
-    <script type="text/javascript" src="js/srs.utility.js"></script>
-    <script type="text/javascript" src="js/winlin.utility.js"></script>
-    <style>
-        body{
-            padding-top: 55px;
-        }
-        #main_modal {
-            width: 700px;
-            margin-left: -350px;
-        }
-    </style>
-    <script type="text/javascript" src="js/jwplayer.js" ></script>
-    <script type='text/javascript'>jwplayer.key = 'N8zhkmYvvRwOhz4aTGkySoEri4x+9pQwR7GHIQ=='; </script>
-    <script type="text/javascript">
-        /****
-        * The parameters for this page:
-        *       schema, the protocol schema, rtmp or http.
-        *       server, the ip of the url.
-        *       port, the rtmp port of url.
-        *       vhost, the vhost of url, can equals to server.
-        *       app, the app of url.
-        *       stream, the stream of url, can endwith .flv or .mp4 or nothing for RTMP.
-        *       autostart, whether auto play the stream.
-        * Additional params:
-        *       hls_vhost, the vhost for hls.
-        *       hls_port, the port for hls play.
-        *       hls_autostart, whether auto play the hls stream.
-        */
-        var _player = null;
-        var _url = null;
-        $(function(){
-            // get the vhost and port to set the default url.
-            // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
-            // url set to: rtmp://demo:1935/live/livestream
-            srs_init("#txt_rtmp_url", "#txt_hls_url", "#main_modal");
-            
-            $("#main_modal").on("hide", function(){
-                $("#div_container").remove();
-                _player.stop();
-            });
-            
-            $("#main_modal").on("show", function(){
-                $("#div_container").remove();
-                
-                var div_container = $("<div/>");
-                $(div_container).attr("id", "div_container");
-                $("#player").append(div_container);
-                
-                var player = $("<div/>");
-                $(player).attr("id", "player_id");
-                $(div_container).append(player);
-                
-                var conf = {
-                    file: _url,
-                    width: srs_get_player_width(),
-                    height: srs_get_player_height(),
-                    autostart: true,
-                    analytics: { enabled: false}
-                };
-                _player = jwplayer('player_id').setup(conf);
-            });
-            
-            $("#btn_play_rtmp").click(function(){
-                _url = $("#txt_rtmp_url").val();
-                $("#main_modal").modal({show:true, keyboard:false});
-            });
-            
-            $("#btn_play_hls").click(function(){
-                _url = $("#txt_hls_url").val();
-                $("#main_modal").modal({show:true, keyboard:false});
-            });
-            
-            var query = parse_query_string();
-            if (query.hls_autostart == "true") {
-                _url = $("#txt_hls_url").val();
-                $("#main_modal").modal({show:true, keyboard:false});
-            } else if (query.rtmp_autostart == "true") {
-                _url = $("#txt_rtmp_url").val();
-                $("#main_modal").modal({show:true, keyboard:false});
-            }
-        });
-    </script>
-</head>
-<body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/jwplayer'/>
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
-            <a id="srs_index" class="brand" href="#">SRS</a>
-            <div class="nav-collapse collapse">
-                <ul class="nav">
-                    <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
-                    <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
-                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
-                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li class="active"><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
-                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <div class="alert alert-info fade in">
-        <button type="button" class="close" data-dismiss="alert">×</button>
-        <strong><span>Usage:</span></strong> <span>输入地址后点击播放按钮</span>
-    </div>
-    <div class="form-inline">
-        URL:
-        <input type="text" id="txt_rtmp_url" class="input-xxlarge" value=""></input>
-        <button class="btn btn-primary" id="btn_play_rtmp">播放RTMP</button>
-    </div>
-    <hr/>
-    <div class="form-inline">
-        URL:
-        <input type="text" id="txt_hls_url" class="input-xxlarge" value=""></input>
-        <button class="btn btn-primary" id="btn_play_hls"> 播放HLS </button>
-    </div>
-    <div id="main_modal" class="modal hide fade">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3>JWPlayer6</h3>
-        </div>
-        <div class="modal-body" id="player">
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"> 关闭 </button>
-        </div>
-    </div>
-    <hr>
-    <footer>
-        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
-    </footer>
-</div>
-</body>
-

trunk/research/players/osmf.html

@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>SRS</title>   
-    <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <style>
-        body{
-            padding-top: 55px;
-        }
-        #main_modal {
-            width: 700px;
-            margin-left: -350px;
-        }
-    </style>
-</head>
-<body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/osmf'/>
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
-            <a id="srs_index" class="brand" href="#">SRS</a>
-            <div class="nav-collapse collapse">
-                <ul class="nav">
-                    <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
-                    <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
-                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
-                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li class="active"><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
-                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <div class="alert alert-info fade in">
-        <button type="button" class="close" data-dismiss="alert">×</button>
-        <strong><span>Usage:</span></strong> <span>输入地址后点击播放按钮</span>
-    </div>
-    <div class="form-inline">
-        URL:
-        <input type="text" id="txt_url" class="input-xxlarge" value=""></input>
-        <button class="btn btn-primary" id="btn_play">播放视频</button>
-    </div>
-    <div id="main_modal" class="modal hide fade">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3>AdobeOSMF</h3>
-        </div>
-        <div class="modal-body" id="player">
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"> 关闭 </button>
-        </div>
-    </div>
-    <hr>
-    <footer>
-        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
-    </footer>
-</div>
-</body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
-<script type="text/javascript" src="js/bootstrap.min.js"></script>
-<script type="text/javascript" src="js/swfobject.js"></script>
-<script type="text/javascript" src="js/srs.page.js"></script>
-<script type="text/javascript" src="js/srs.log.js"></script>
-<script type="text/javascript" src="js/srs.player.js"></script>
-<script type="text/javascript" src="js/srs.publisher.js"></script>
-<script type="text/javascript" src="js/srs.utility.js"></script>
-<script type="text/javascript" src="js/winlin.utility.js"></script>
-<script type="text/javascript">
-    function osmf_play(url) {
-        $("#div_container").remove();
-
-        var div_container = $("<div/>");
-        $(div_container).attr("id", "div_container");
-        $("#player").append(div_container);
-
-        var player = $("<div/>");
-        $(player).attr("id", "player_id");
-        $(div_container).append(player);
-
-        var flashvars = {};
-        flashvars.src = url;
-        flashvars.streamType = "live"; // live or recorded
-        flashvars.autoPlay = true;
-        flashvars.controlBarAutoHide = false;
-        flashvars.scaleMode = "stretch";
-        flashvars.bufferTime = 0.8;
-
-        var params = {};
-        params.allowFullScreen = true;
-
-        var attributes = {};
-
-        swfobject.embedSWF(
-                "js/StrobeMediaPlayback.swf", "player_id",
-                srs_get_player_width(), srs_get_player_height(),
-                "11.1", "js/AdobeFlashPlayerInstall.swf",
-                flashvars, params, attributes
-        );
-    }
-    $(function(){
-        // get the vhost and port to set the default url.
-        // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
-        // url set to: rtmp://demo:1935/live/livestream
-        srs_init_rtmp("#txt_url", "#main_modal");
-
-        $("#main_modal").on("hide", function(){
-            osmf_play("http://localhost");
-            $("#div_container").remove();
-        });
-        $("#main_modal").on("show", function(){
-            var url = $("#txt_url").val();
-            osmf_play(url);
-        });
-
-        $("#btn_play").click(function(){
-            $("#main_modal").modal({show:true, keyboard:false});
-        });
-    });
-</script>
-</html>

trunk/research/players/rtc_player.html

@@ -0,0 +1,330 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SRS</title>
+    <meta charset="utf-8">
+    <style>
+        body{
+            padding-top: 55px;
+        }
+    </style>
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
+    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
+    <script type="text/javascript" src="js/winlin.utility.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
+</head>
+<body>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/rtcplayer'/>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a id="srs_index" class="brand" href="https://github.com/ossrs/srs">SRS</a>
+            <div class="nav-collapse collapse">
+                <ul class="nav">
+                    <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li class="active"><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
+                    <li><a  href="http://ossrs.net/srs.release/releases/app.html">iOS/Andriod</a></li>
+                    <!--<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>-->
+                    <!--<li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>-->
+                    <!--<li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>-->
+                    <!--<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>-->
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">GB28181</a></li>
+                    <li>
+                        <a href="https://github.com/ossrs/srs">
+                            <img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ossrs/srs?style=social">
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container">
+    <div class="form-inline">
+        URL:
+        <input type="text" id="txt_url" class="input-xxlarge" value="">
+        <button class="btn btn-primary" id="btn_play">播放视频</button>
+    </div>
+
+    <label></label>
+    <video id="rtc_media_player" controls autoplay></video>
+
+    <label></label>
+    SessionID: <span id='sessionid'></span>
+
+    <label></label>
+    Simulator: <a href='#' id='simulator-drop'>Drop</a>
+
+    <footer>
+        <p></p>
+        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2020</a></p>
+    </footer>
+</div>
+<script type="text/javascript">
+    $(function(){
+        // Async-await-promise based SRS RTC Player.
+        function SrsRtcPlayerAsync() {
+            var self = {};
+
+            // @see https://github.com/rtcdn/rtcdn-draft
+            // @url The WebRTC url to play with, for example:
+            //      webrtc://r.ossrs.net/live/livestream
+            // or specifies the API port:
+            //      webrtc://r.ossrs.net:11985/live/livestream
+            // or autostart the play:
+            //      webrtc://r.ossrs.net/live/livestream?autostart=true
+            // or change the app from live to myapp:
+            //      webrtc://r.ossrs.net:11985/myapp/livestream
+            // or change the stream from livestream to mystream:
+            //      webrtc://r.ossrs.net:11985/live/mystream
+            // or set the api server to myapi.domain.com:
+            //      webrtc://myapi.domain.com/live/livestream
+            // or set the candidate(ip) of answer:
+            //      webrtc://r.ossrs.net/live/livestream?eip=39.107.238.185
+            // or force to access https API:
+            //      webrtc://r.ossrs.net/live/livestream?schema=https
+            // or use plaintext, without SRTP:
+            //      webrtc://r.ossrs.net/live/livestream?encrypt=false
+            // or any other information, will pass-by in the query:
+            //      webrtc://r.ossrs.net/live/livestream?vhost=xxx
+            //      webrtc://r.ossrs.net/live/livestream?token=xxx
+            self.play = async function(url) {
+                var conf = self.__internal.prepareUrl(url);
+                self.pc.addTransceiver("audio", {direction: "recvonly"});
+                self.pc.addTransceiver("video", {direction: "recvonly"});
+
+                var offer = await self.pc.createOffer();
+                await self.pc.setLocalDescription(offer);
+                var session = await new Promise(function(resolve, reject) {
+                    // @see https://github.com/rtcdn/rtcdn-draft
+                    var data = {
+                        api: conf.apiUrl, streamurl: conf.streamUrl, clientip: null, sdp: offer.sdp
+                    };
+                    console.log("Generated offer: ", data);
+
+                    $.ajax({
+                        type: "POST", url: conf.apiUrl, data: JSON.stringify(data),
+                        contentType:'application/json', dataType: 'json'
+                    }).done(function(data) {
+                        console.log("Got answer: ", data);
+                        if (data.code) {
+                            reject(data); return;
+                        }
+
+                        resolve(data);
+                    }).fail(function(reason){
+                        reject(reason);
+                    });
+                });
+                await self.pc.setRemoteDescription(
+                    new RTCSessionDescription({type: 'answer', sdp: session.sdp})
+                );
+                return session;
+            };
+
+            // Close the publisher.
+            self.close = function() {
+                self.pc.close();
+            };
+
+            // The callback when got remote stream.
+            self.onaddstream = function (event) {};
+
+            // Internal APIs.
+            self.__internal = {
+                defaultPath: '/rtc/v1/play/',
+                prepareUrl: function (webrtcUrl) {
+                    var urlObject = self.__internal.parse(webrtcUrl);
+
+                    // If user specifies the schema, use it as API schema.
+                    var schema = urlObject.user_query.schema;
+                    schema = schema ? schema + ':' : window.location.protocol;
+
+                    var port = urlObject.port || 1985;
+                    if (schema === 'https:') {
+                        port = urlObject.port || 443;
+                    }
+
+                    // @see https://github.com/rtcdn/rtcdn-draft
+                    var api = urlObject.user_query.play || self.__internal.defaultPath;
+                    if (api.lastIndexOf('/') !== api.length - 1) {
+                        api += '/';
+                    }
+
+                    apiUrl = schema + '//' + urlObject.server + ':' + port + api;
+                    for (var key in urlObject.user_query) {
+                        if (key !== 'api' && key !== 'play') {
+                            apiUrl += '&' + key + '=' + urlObject.user_query[key];
+                        }
+                    }
+                    // Replace /rtc/v1/play/&k=v to /rtc/v1/play/?k=v
+                    var apiUrl = apiUrl.replace(api + '&', api + '?');
+
+                    var streamUrl = urlObject.url;
+
+                    return {apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port};
+                },
+                parse: function (url) {
+                    // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri
+                    var a = document.createElement("a");
+                    a.href = url.replace("rtmp://", "http://")
+                        .replace("webrtc://", "http://")
+                        .replace("rtc://", "http://");
+
+                    var vhost = a.hostname;
+                    var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
+                    var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
+
+                    // parse the vhost in the params of app, that srs supports.
+                    app = app.replace("...vhost...", "?vhost=");
+                    if (app.indexOf("?") >= 0) {
+                        var params = app.substr(app.indexOf("?"));
+                        app = app.substr(0, app.indexOf("?"));
+
+                        if (params.indexOf("vhost=") > 0) {
+                            vhost = params.substr(params.indexOf("vhost=") + "vhost=".length);
+                            if (vhost.indexOf("&") > 0) {
+                                vhost = vhost.substr(0, vhost.indexOf("&"));
+                            }
+                        }
+                    }
+
+                    // when vhost equals to server, and server is ip,
+                    // the vhost is __defaultVhost__
+                    if (a.hostname === vhost) {
+                        var re = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+                        if (re.test(a.hostname)) {
+                            vhost = "__defaultVhost__";
+                        }
+                    }
+
+                    // parse the schema
+                    var schema = "rtmp";
+                    if (url.indexOf("://") > 0) {
+                        schema = url.substr(0, url.indexOf("://"));
+                    }
+
+                    var port = a.port;
+                    if (!port) {
+                        if (schema === 'http') {
+                            port = 80;
+                        } else if (schema === 'https') {
+                            port = 443;
+                        } else if (schema === 'rtmp') {
+                            port = 1935;
+                        }
+                    }
+
+                    var ret = {
+                        url: url,
+                        schema: schema,
+                        server: a.hostname, port: port,
+                        vhost: vhost, app: app, stream: stream
+                    };
+                    self.__internal.fill_query(a.search, ret);
+
+                    // For webrtc API, we use 443 if page is https, or schema specified it.
+                    if (!ret.port) {
+                        if (schema === 'webrtc' || schema === 'rtc') {
+                            if (ret.user_query.schema === 'https') {
+                                ret.port = 443;
+                            } else if (window.location.href.indexOf('https://') === 0) {
+                                ret.port = 443;
+                            } else {
+                                // For WebRTC, SRS use 1985 as default API port.
+                                ret.port = 1985;
+                            }
+                        }
+                    }
+
+                    return ret;
+                },
+                fill_query: function (query_string, obj) {
+                    // pure user query object.
+                    obj.user_query = {};
+
+                    if (query_string.length === 0) {
+                        return;
+                    }
+
+                    // split again for angularjs.
+                    if (query_string.indexOf("?") >= 0) {
+                        query_string = query_string.split("?")[1];
+                    }
+
+                    var queries = query_string.split("&");
+                    for (var i = 0; i < queries.length; i++) {
+                        var elem = queries[i];
+
+                        var query = elem.split("=");
+                        obj[query[0]] = query[1];
+                        obj.user_query[query[0]] = query[1];
+                    }
+
+                    // alias domain for vhost.
+                    if (obj.domain) {
+                        obj.vhost = obj.domain;
+                    }
+                }
+            };
+
+            self.pc = new RTCPeerConnection(null);
+            self.pc.onaddstream = function (event) {
+                if (self.onaddstream) {
+                    self.onaddstream(event);
+                }
+            };
+
+            return self;
+        }
+
+        var sdk = null; // Global handler to do cleanup when replaying.
+        var startPlay = function() {
+            $('#rtc_media_player').show();
+
+            // Close PC when user replay.
+            if (sdk) {
+                sdk.close();
+            }
+
+            sdk = new SrsRtcPlayerAsync();
+            sdk.onaddstream = function (event) {
+                console.log('Start play, event: ', event);
+                $('#rtc_media_player').prop('srcObject', event.stream);
+            };
+
+            // For example:
+            //      webrtc://r.ossrs.net/live/livestream
+            var url = $("#txt_url").val();
+            sdk.play(url).then(function(session){
+                $('#sessionid').html(session.sessionid);
+                $('#simulator-drop').attr('href', session.simulator + '?drop=1&username=' + session.sessionid);
+            }).catch(function (reason) {
+                sdk.close();
+                $('#rtc_media_player').hide();
+                console.error(reason);
+            });
+        };
+
+        $('#rtc_media_player').hide();
+        var query = parse_query_string();
+        srs_init_rtc("#txt_url", query);
+
+        $("#btn_play").click(function() {
+            $('#rtc_media_player').prop('muted', false);
+            startPlay();
+        });
+
+        if (query.autostart === 'true') {
+            $('#rtc_media_player').prop('muted', true);
+            console.warn('For autostart, we should mute it, see https://www.jianshu.com/p/c3c6944eed5a ' +
+                'or https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#audiovideo_elements');
+
+            startPlay();
+        }
+    });
+</script>
+</body>
+</html>

trunk/research/players/rtc_publisher.html

@@ -0,0 +1,335 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SRS</title>
+    <meta charset="utf-8">
+    <style>
+        body{
+            padding-top: 55px;
+        }
+    </style>
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
+    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
+    <script type="text/javascript" src="js/winlin.utility.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
+</head>
+<body>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/rtcpublisher'/>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a id="srs_index" class="brand" href="https://github.com/ossrs/srs">SRS</a>
+            <div class="nav-collapse collapse">
+                <ul class="nav">
+                    <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li class="active"><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
+                    <li><a  href="http://ossrs.net/srs.release/releases/app.html">iOS/Andriod</a></li>
+                    <!--<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>-->
+                    <!--<li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>-->
+                    <!--<li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>-->
+                    <!--<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>-->
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">GB28181</a></li>
+                    <li>
+                        <a href="https://github.com/ossrs/srs">
+                            <img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ossrs/srs?style=social">
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container">
+    <div class="form-inline">
+        URL:
+        <input type="text" id="txt_url" class="input-xxlarge" value="">
+        <button class="btn btn-primary" id="btn_publish">开始推流</button>
+    </div>
+
+    <label></label>
+    <video id="rtc_media_player" width="320" autoplay muted></video>
+
+    <label></label>
+    SessionID: <span id='sessionid'></span>
+
+    <label></label>
+    Simulator: <a href='#' id='simulator-drop'>Drop</a>
+
+    <footer>
+        <p></p>
+        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2020</a></p>
+    </footer>
+</div>
+<script type="text/javascript">
+    var pc = null; // Global handler to do cleanup when replaying.
+    $(function(){
+        // Async-awat-prmise based SRS RTC Publisher.
+        function SrsRtcPublisherAsync() {
+            var self = {};
+
+            // @see https://github.com/rtcdn/rtcdn-draft
+            // @url The WebRTC url to play with, for example:
+            //      webrtc://r.ossrs.net/live/livestream
+            // or specifies the API port:
+            //      webrtc://r.ossrs.net:11985/live/livestream
+            // or autostart the publish:
+            //      webrtc://r.ossrs.net/live/livestream?autostart=true
+            // or change the app from live to myapp:
+            //      webrtc://r.ossrs.net:11985/myapp/livestream
+            // or change the stream from livestream to mystream:
+            //      webrtc://r.ossrs.net:11985/live/mystream
+            // or set the api server to myapi.domain.com:
+            //      webrtc://myapi.domain.com/live/livestream
+            // or set the candidate(ip) of answer:
+            //      webrtc://r.ossrs.net/live/livestream?eip=39.107.238.185
+            // or force to access https API:
+            //      webrtc://r.ossrs.net/live/livestream?schema=https
+            // or use plaintext, without SRTP:
+            //      webrtc://r.ossrs.net/live/livestream?encrypt=false
+            // or any other information, will pass-by in the query:
+            //      webrtc://r.ossrs.net/live/livestream?vhost=xxx
+            //      webrtc://r.ossrs.net/live/livestream?token=xxx
+            self.publish = async function (url) {
+                var conf = self.__internal.prepareUrl(url);
+                self.pc.addTransceiver("audio", {direction: "sendonly"});
+                self.pc.addTransceiver("video", {direction: "sendonly"});
+
+                var stream = await navigator.mediaDevices.getUserMedia(
+                    {audio: true, video: {height: {max: 320}}}
+                );
+                // @see https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addStream#Migrating_to_addTrack
+                stream.getTracks().forEach(function (track) {
+                    self.pc.addTrack(track);
+                });
+
+                var offer = await self.pc.createOffer();
+                await self.pc.setLocalDescription(offer);
+                var session = await new Promise(function (resolve, reject) {
+                    // @see https://github.com/rtcdn/rtcdn-draft
+                    var data = {
+                        api: conf.apiUrl, streamurl: conf.streamUrl, clientip: null, sdp: offer.sdp
+                    };
+                    console.log("Generated offer: ", data);
+
+                    $.ajax({
+                        type: "POST", url: conf.apiUrl, data: JSON.stringify(data),
+                        contentType: 'application/json', dataType: 'json'
+                    }).done(function (data) {
+                        console.log("Got answer: ", data);
+                        if (data.code) {
+                            reject(data);
+                            return;
+                        }
+
+                        resolve(data);
+                    }).fail(function (reason) {
+                        reject(reason);
+                    });
+                });
+                await self.pc.setRemoteDescription(
+                    new RTCSessionDescription({type: 'answer', sdp: session.sdp})
+                );
+                session.simulator = conf.schema + '//' + conf.urlObject.server + ':' + conf.port + '/rtc/v1/nack/';
+
+                // Notify about local stream when success.
+                self.onaddstream && self.onaddstream({stream: stream});
+
+                return session;
+            };
+
+            // Close the publisher.
+            self.close = function () {
+                self.pc.close();
+            };
+
+            // The callback when got local stream.
+            self.onaddstream = function (event) {
+            };
+
+            // Internal APIs.
+            self.__internal = {
+                defaultPath: '/rtc/v1/publish/',
+                prepareUrl: function (webrtcUrl) {
+                    var urlObject = self.__internal.parse(webrtcUrl);
+
+                    // If user specifies the schema, use it as API schema.
+                    var schema = urlObject.user_query.schema;
+                    schema = schema ? schema + ':' : window.location.protocol;
+
+                    var port = urlObject.port || 1985;
+                    if (schema === 'https:') {
+                        port = urlObject.port || 443;
+                    }
+
+                    // @see https://github.com/rtcdn/rtcdn-draft
+                    var api = urlObject.user_query.play || self.__internal.defaultPath;
+                    if (api.lastIndexOf('/') !== api.length - 1) {
+                        api += '/';
+                    }
+
+                    apiUrl = schema + '//' + urlObject.server + ':' + port + api;
+                    for (var key in urlObject.user_query) {
+                        if (key !== 'api' && key !== 'play') {
+                            apiUrl += '&' + key + '=' + urlObject.user_query[key];
+                        }
+                    }
+                    // Replace /rtc/v1/play/&k=v to /rtc/v1/play/?k=v
+                    var apiUrl = apiUrl.replace(api + '&', api + '?');
+
+                    var streamUrl = urlObject.url;
+
+                    return {apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port};
+                },
+                parse: function (url) {
+                    // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri
+                    var a = document.createElement("a");
+                    a.href = url.replace("rtmp://", "http://")
+                        .replace("webrtc://", "http://")
+                        .replace("rtc://", "http://");
+
+                    var vhost = a.hostname;
+                    var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
+                    var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
+
+                    // parse the vhost in the params of app, that srs supports.
+                    app = app.replace("...vhost...", "?vhost=");
+                    if (app.indexOf("?") >= 0) {
+                        var params = app.substr(app.indexOf("?"));
+                        app = app.substr(0, app.indexOf("?"));
+
+                        if (params.indexOf("vhost=") > 0) {
+                            vhost = params.substr(params.indexOf("vhost=") + "vhost=".length);
+                            if (vhost.indexOf("&") > 0) {
+                                vhost = vhost.substr(0, vhost.indexOf("&"));
+                            }
+                        }
+                    }
+
+                    // when vhost equals to server, and server is ip,
+                    // the vhost is __defaultVhost__
+                    if (a.hostname === vhost) {
+                        var re = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+                        if (re.test(a.hostname)) {
+                            vhost = "__defaultVhost__";
+                        }
+                    }
+
+                    // parse the schema
+                    var schema = "rtmp";
+                    if (url.indexOf("://") > 0) {
+                        schema = url.substr(0, url.indexOf("://"));
+                    }
+
+                    var port = a.port;
+                    if (!port) {
+                        if (schema === 'http') {
+                            port = 80;
+                        } else if (schema === 'https') {
+                            port = 443;
+                        } else if (schema === 'rtmp') {
+                            port = 1935;
+                        }
+                    }
+
+                    var ret = {
+                        url: url,
+                        schema: schema,
+                        server: a.hostname, port: port,
+                        vhost: vhost, app: app, stream: stream
+                    };
+                    self.__internal.fill_query(a.search, ret);
+
+                    // For webrtc API, we use 443 if page is https, or schema specified it.
+                    if (!ret.port) {
+                        if (schema === 'webrtc' || schema === 'rtc') {
+                            if (ret.user_query.schema === 'https') {
+                                ret.port = 443;
+                            } else if (window.location.href.indexOf('https://') === 0) {
+                                ret.port = 443;
+                            } else {
+                                // For WebRTC, SRS use 1985 as default API port.
+                                ret.port = 1985;
+                            }
+                        }
+                    }
+
+                    return ret;
+                },
+                fill_query: function (query_string, obj) {
+                    // pure user query object.
+                    obj.user_query = {};
+
+                    if (query_string.length === 0) {
+                        return;
+                    }
+
+                    // split again for angularjs.
+                    if (query_string.indexOf("?") >= 0) {
+                        query_string = query_string.split("?")[1];
+                    }
+
+                    var queries = query_string.split("&");
+                    for (var i = 0; i < queries.length; i++) {
+                        var elem = queries[i];
+
+                        var query = elem.split("=");
+                        obj[query[0]] = query[1];
+                        obj.user_query[query[0]] = query[1];
+                    }
+
+                    // alias domain for vhost.
+                    if (obj.domain) {
+                        obj.vhost = obj.domain;
+                    }
+                }
+            };
+
+            self.pc = new RTCPeerConnection(null);
+
+            return self;
+        }
+
+        var sdk = null; // Global handler to do cleanup when republishing.
+        var startPublish = function() {
+            $('#rtc_media_player').show();
+
+            // Close PC when user replay.
+            if (sdk) {
+                sdk.close();
+            }
+
+            sdk = new SrsRtcPublisherAsync();
+            sdk.onaddstream = function (event) {
+                console.log('Start publish, event: ', event);
+                $('#rtc_media_player').prop('srcObject', event.stream);
+            };
+
+            // For example:
+            //      webrtc://r.ossrs.net/live/livestream
+            var url = $("#txt_url").val();
+            sdk.publish(url).then(function(session){
+                $('#sessionid').html(session.sessionid);
+                $('#simulator-drop').attr('href', session.simulator + '?drop=1&username=' + session.sessionid);
+            }).catch(function (reason) {
+                sdk.close();
+                $('#rtc_media_player').hide();
+                console.error(reason);
+            });
+        };
+
+        $('#rtc_media_player').hide();
+        var query = parse_query_string();
+        srs_init_rtc("#txt_url", query);
+
+        $("#btn_publish").click(startPublish);
+        if (query.autostart === 'true') {
+            startPublish();
+        }
+    });
+</script>
+</body>
+</html>
+
+</html>

trunk/research/players/srs_bwt.html

@@ -15,7 +15,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/bwt'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/bwt'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -23,12 +23,13 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li class="active"><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">SRS-GB28181</a></li>
                 </ul>
             </div>
         </div>

trunk/research/players/srs_chat.html

@@ -14,7 +14,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/chat'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/chat'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -22,12 +22,13 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li class="active"><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">SRS-GB28181</a></li>
                 </ul>
             </div>
         </div>

trunk/research/players/srs_player.html

@@ -25,7 +25,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/srsplayer'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/srsplayer'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -33,44 +33,45 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
-                    <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
-                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
-                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
+                    <li><a  href="http://ossrs.net/srs.release/releases/app.html">iOS/Andriod</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
+                    <!--<li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>-->
-                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
+                    <!--<li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>-->
+                    <!--li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>-->
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">GB28181</a></li>
+                    <li>
+                        <a href="https://github.com/ossrs/srs">
+                            <img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ossrs/srs?style=social">
+                        </a>
+                    </li>
                 </ul>
             </div>
         </div>
     </div>
 </div>
 <div class="container">
-    <div name="detect_flash">
-        <div id="main_flash_alert" class="alert alert-danger fade in hide">
-            <button type="button" class="close" data-dismiss="alert">×</button>
-            <strong><p>Usage:</p></strong>
-            <p>
-                请点击下面的图标，启用Flash
-            </p>
-            <p>
-                若没有见到这个图标，Chrome浏览器请打开
-                <span class="text-info">chrome://settings/content/flash</span> 并修改为"Ask first"。
-            </p>
-        </div>
-        <div id="main_flash_hdr" class="hide">
-        </div>
-    </div>
 
-    <div id="main_content" class="hide">
+    <div id="main_content">
-        <div class="alert alert-info fade in">
+        <div id="main_info" class="alert alert-info fade in">
             <button type="button" class="close" data-dismiss="alert">×</button>
-            <strong><span>Usage:</span></strong> <span>输入RTMP/HTTP-FLV/HLS地址后点击“播放视频”即可播放视频</span>
+            <strong><span>Usage:</span></strong> <span>输入HTTP-FLV/HLS地址后点击“播放视频”即可播放视频</span>
         </div>
         <div class="form-inline">
+            <div>
                 URL:
                 <input type="text" id="txt_url" class="input-xxlarge" value="">
                 <button class="btn btn-primary" id="btn_play">播放视频</button>
-            <button class="btn" id="btn_generate_link">生成链接</button>
+            </div>
+            <p></p>
+            <div>
+                <video id="video_player" width="100%" autoplay controls></video>
+            </div>
+            <p>
+                分享：<a href="#" id="link_url" target="_blank">请右键拷贝此链接</a>
+            </p>
+            <div id="main_tips">
                 <p></p>
                 <p>
                     推荐的其他播放器：
@@ -81,193 +82,24 @@
                     </ul>
                 </p>
             </div>
-        <div id="link_modal" class="modal hide fade">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3><a href="https://github.com/ossrs/srs">SRS Link Generator</a></h3>
-            </div>
-            <div class="modal-body">
-                <div class="form-horizontal">
-                    <div class="control-group">
-                        <label class="control-label" for="link_server">服务器地址</label>
-                        <div class="controls">
-                            <span id="link_server" class="span4 uneditable-input"></span>
         </div>
     </div>
-                    <div class="control-group">
+
-                        <label class="control-label" for="link_port">服务器端口</label>
+    <div name="detect_flash">
-                        <div class="controls">
+        <div id="main_flash_alert" class="alert alert-danger fade in hide">
-                            <span id="link_port" class="span2 uneditable-input"></span>
+            <button type="button" class="close" data-dismiss="alert">×</button>
-                        </div>
+            <p>
-                    </div>
+                <a href="https://www.adobe.com/products/flashplayer/end-of-life.html" target="_blank">Flash已死</a>，
-                    <div class="control-group">
+                无法播放RTMP流，可用VLC播放器播放。
-                        <label class="control-label" for="link_vhost">RTMP Vhost</label>
+            </p>
-                        <div class="controls">
+            <ul>
-                            <span id="link_vhost" class="span4 uneditable-input"></span>
+                <li>若希望做低延迟直播（3-5秒），可用HTTP-FLV，播放器用<a href="http://bilibili.github.io/flv.js/demo">flv.js</a>，H5/MSE播放HTTP-FLV</li>
-                        </div>
+                <li>若对延迟不敏感（5-10秒），跨平台比较好，可用HLS，播放器用<a href="https://hls-js.netlify.com/demo">hls.js</a>，H5/MSE播放HLS</li>
-                    </div>
+                <li>若希望超低延迟（1秒内），只需要支持主流的浏览器，可用WebRTC，播放器用<a href="rtc_player.html">RTC播放器</a></li>
-                    <div class="control-group">
-                        <label class="control-label" for="link_app">RTMP App</label>
-                        <div class="controls">
-                            <span id="link_app" class="span4 uneditable-input"></span>
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="link_stream">RTMP Stream</label>
-                        <div class="controls">
-                            <span id="link_stream" class="span4 uneditable-input"></span>
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="link_rtmp">RTMP地址</label>
-                        <div class="controls">
-                            <span id="link_rtmp" class="span4 uneditable-input"></span>
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="link_url">播放链接地址</label>
-                        <div class="controls">
-                            <div style="margin-top:5px;"><a href="#" id="link_url" target="_blank">请右键拷贝此链接地址.</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer"></div>
-        </div>
-        <div id="main_modal" class="modal hide fade">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3><a href="https://github.com/ossrs/srs">SrsPlayer</a></h3>
-            </div>
-            <div class="modal-body">
-                <div id="player"></div>
-                <div class="progress progress-striped active" id="pb_buffer_bg">
-                    <div class="bar" style="width: 0%;" id="pb_buffer"></div>
-                </div>
-            </div>
-            <div class="modal-footer" id="my_modal_footer">
-                <div>
-                    <div class="btn-group dropup">
-                        <button class="btn dropdown-toggle" data-toggle="dropdown">
-                            全屏比例大小<span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li><a id="btn_fs_size_screen_100" href="#">屏幕大小(100%)</a></li>
-                            <li><a id="btn_fs_size_screen_75" href="#">屏幕大小(75%)</a></li>
-                            <li><a id="btn_fs_size_screen_50" href="#">屏幕大小(50%)</a></li>
-                            <li><a id="btn_fs_size_video_100" href="#">视频大小(100%)</a></li>
-                            <li><a id="btn_fs_size_video_75" href="#">视频大小(75%)</a></li>
-                            <li><a id="btn_fs_size_video_50" href="#">视频大小(50%)</a></li>
             </ul>
-                    </div>
+            <p>
-                    <div class="btn-group dropup">
+                更多信息，参考<a href="https://mp.weixin.qq.com/s/oYn5q4fF9afaged23Ueudg" target="_blank">没有Flash如何做直播？</a>
-                        <button class="btn dropdown-toggle" data-toggle="dropdown">显示比例<span class="caret"></span></button>
+            </p>
-                        <ul class="dropdown-menu">
-                            <li><a id="btn_dar_original" href="#">视频原始比例</a></li>
-                            <li><a id="btn_dar_21_9" href="#">宽屏影院(21:9)</a></li>
-                            <li><a id="btn_dar_16_9" href="#">宽屏电视(16:9)</a></li>
-                            <li><a id="btn_dar_4_3" href="#">窄屏(4:3)</a></li>
-                            <li><a id="btn_dar_fill" href="#">填充(容器比例)</a></li>
-                        </ul>
-                    </div>
-                    <div class="btn-group dropup">
-                        <button class="btn dropdown-toggle" data-toggle="dropdown">缓冲区大小<span class="caret"></span></button>
-                        <ul class="dropdown-menu">
-                            <li><a id="btn_bt_0_1" href="#">0.1秒(实时)</a></li>
-                            <li><a id="btn_bt_0_2" href="#">0.2秒(实时)</a></li>
-                            <li><a id="btn_bt_0_3" href="#">0.3秒(实时)</a></li>
-                            <li><a id="btn_bt_0_5" href="#">0.5秒(实时)</a></li>
-                            <li><a id="btn_bt_0_8" href="#">0.8秒(会议)</a></li>
-                            <li><a id="btn_bt_1_0" href="#">1秒(低延迟)</a></li>
-                            <li><a id="btn_bt_2_0" href="#">2秒(较低延时)</a></li>
-                            <li><a id="btn_bt_3_0" href="#">3秒(流畅播放)</a></li>
-                            <li><a id="btn_bt_4_0" href="#">4秒(流畅播放)</a></li>
-                            <li><a id="btn_bt_5_0" href="#">5秒(网速较低)</a></li>
-                            <li><a id="btn_bt_6_0" href="#">6秒(网速较低)</a></li>
-                            <li><a id="btn_bt_8_0" href="#">8秒(网速较低)</a></li>
-                            <li><a id="btn_bt_10_0" href="#">10秒(无所谓延迟)</a></li>
-                            <li><a id="btn_bt_15_0" href="#">15秒(无所谓延迟)</a></li>
-                            <li><a id="btn_bt_20_0" href="#">20秒(无所谓延迟)</a></li>
-                            <li><a id="btn_bt_30_0" href="#">30秒(流畅第一)</a></li>
-                        </ul>
-                    </div>
-                    <div class="btn-group dropup">
-                        <button class="btn dropdown-toggle" data-toggle="dropdown">最大缓冲区<span class="caret"></span></button>
-                        <ul class="dropdown-menu">
-                            <li><a id="btn_mbt_0_6" href="#">0.6秒(实时)</a></li>
-                            <li><a id="btn_mbt_0_9" href="#">0.9秒(实时)</a></li>
-                            <li><a id="btn_mbt_1_2" href="#">1.2秒(实时)</a></li>
-                            <li><a id="btn_mbt_1_5" href="#">1.5秒(实时)</a></li>
-                            <li><a id="btn_mbt_2_4" href="#">2.4秒(会议)</a></li>
-                            <li><a id="btn_mbt_3_0" href="#">3秒(低延迟)</a></li>
-                            <li><a id="btn_mbt_6_0" href="#">6秒(较低延时)</a></li>
-                            <li><a id="btn_mbt_9_0" href="#">9秒(流畅播放)</a></li>
-                            <li><a id="btn_mbt_12_0" href="#">12秒(流畅播放)</a></li>
-                            <li><a id="btn_mbt_15_0" href="#">15秒(网速较低)</a></li>
-                            <li><a id="btn_mbt_18_0" href="#">18秒(网速较低)</a></li>
-                            <li><a id="btn_mbt_24_0" href="#">24秒(网速较低)</a></li>
-                            <li><a id="btn_mbt_30_0" href="#">30秒(无所谓延迟)</a></li>
-                            <li><a id="btn_mbt_45_0" href="#">45秒(无所谓延迟)</a></li>
-                            <li><a id="btn_mbt_60_0" href="#">60秒(无所谓延迟)</a></li>
-                            <li><a id="btn_mbt_90_0" href="#">90秒(流畅第一)</a></li>
-                        </ul>
-                    </div>
-                    <div class="btn-group dropup">
-                        <a id="btn_fullscreen" class="btn">全屏</a>
-                    </div>
-                    <div class="btn-group dropup">
-                        <button id="btn_pause" class="btn">暂停播放</button>
-                        <button id="btn_resume" class="btn hide">继续播放</button>
-                    </div>
-                    <div class="btn-group dropup">
-                        <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">关闭播放器</button>
-                    </div>
-                </div>
-                <div class="hide" id="fullscreen_tips">
-                    请<font color="red">点击视频</font>进入全屏模式~<br/>
-                    由于安全原因，Flash全屏无法使用JS触发
-                </div>
-                <div>
-                    <div class="input-prepend div_play_time" title="BufferLength/BufferTime/MaxBufferTime">
-                        <span class="add-on">@B</span>
-                        <input class="span2" style="width:80px" id="txt_buffer" type="text" placeholder="0/0/0s">
-                    </div>
-                    <div class="input-prepend div_play_time" title="视频的播放流畅度">
-                        <span class="add-on">@F</span>
-                        <input class="span2" style="width:57px" id="txt_fluency" type="text" placeholder="100%">
-                    </div>
-                    <div class="input-prepend div_play_time" title="视频总共卡顿次数">
-                        <span class="add-on">@E</span>
-                        <input class="span2" style="width:45px" id="txt_empty_count" type="text" placeholder="0">
-                    </div>
-                    <div class="input-prepend div_play_time" title="视频当前的帧率FPS">
-                        <span class="add-on">@F</span>
-                        <input class="span2" style="width:55px" id="txt_fps" type="text" placeholder="fps">
-                    </div>
-                    <div class="input-prepend div_play_time" title="视频当前的码率(视频+音频)，单位：Kbps">
-                        <span class="add-on">@B</span>
-                        <input class="span2" style="width:55px" id="txt_bitrate" type="text" placeholder="kbps">
-                    </div>
-                    <div class="input-prepend div_play_time" title="播放时长，格式：天 时:分:秒">
-                        <span class="add-on">@T</span>
-                        <input class="span2" style="width:85px" id="txt_time" type="text" placeholder="天 时:分:秒">
-                    </div>
-                </div>
-                <div style="margin-top:-12px;">
-                    <span id="debug_info"></span>
-                    URL: <a href="#" id="player_url"></a>
-                    <div class="input-prepend div_play_time" title="当前时间：年-月-日 时:分:秒">
-                        <span class="add-on">@N</span>
-                        <input class="span2" style="width:135px" id="player_clock" type="text" placeholder="年-月-日 时:分:秒">
-                    </div>
-                </div>
-                <div>
-                    <div class="input-prepend" title="首播时间，点播放到开始播放的时间，秒">
-                        <span class="add-on">@PST</span>
-                        <input class="span1" style="width:60px" id="txt_pst" type="text" placeholder="N秒">
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 
@@ -279,120 +111,122 @@
 </body>
 <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
-<script type="text/javascript" src="js/swfobject.js"></script>
+<script type="text/javascript" src="js/flv-1.5.0.min.js"></script>
+<script type="text/javascript" src="js/hls-0.14.17.min.js"></script>
 <script type="text/javascript" src="js/json2.js"></script>
 <script type="text/javascript" src="js/srs.page.js"></script>
 <script type="text/javascript" src="js/srs.log.js"></script>
-<script type="text/javascript" src="js/srs.player.js"></script>
-<script type="text/javascript" src="js/srs.publisher.js"></script>
 <script type="text/javascript" src="js/srs.utility.js"></script>
 <script type="text/javascript" src="js/winlin.utility.js"></script>
 <script type="text/javascript">
-    var __on_flash_ready = null;
+    var flvPlayer = null;
+    var hlsPlayer = null;
 
-    $(function(){
+    var stopPlayers = function () {
-        // 探测Flash是否正常启用。
+        if (flvPlayer) {
-        $('#main_flash_hdr').html(
+            flvPlayer.destroy();
-            '\
+            flvPlayer = null;
-            <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="100%" height="100%"> \
+        }
-                <param name="movie" value="srs_player/release/srs_player.swf"> \
+        if (hlsPlayer) {
-                <param name="quality" value="autohigh"> \
+            hlsPlayer.destroy();
-                <param name="swliveconnect" value="true"> \
+            hlsPlayer = null;
-                <param name="allowScriptAccess" value="always"> \
+        }
-                <param name="bgcolor" value="#0"> \
-                <param name="allowFullScreen" value="true"> \
-                <param name="wmode" value="opaque"> \
-                <param name="FlashVars" value="log=1"> \
-                <param name="flashvars" value="id=1&on_player_ready=__on_flash_ready"> \
-                <embed src="srs_player/release/srs_player.swf" width="100%" height="100%" \
-                    quality="autohigh" bgcolor="#0" align="middle" allowfullscreen="true" allowscriptaccess="always" \
-                    type="application/x-shockwave-flash" swliveconnect="true" wmode="opaque" \
-                    flashvars="id=1&on_player_ready=__on_flash_ready" \
-                    pluginspage="http://www.macromedia.com/go/getflashplayer"> \
-            </object> \
-            '
-        );
-        $('#main_flash_hdr').show();
-
-        var showFlashHdr = setTimeout(function(){
-            $('#main_flash_alert').show();
-        }, 300);
-
-        __on_flash_ready = function (id) {
-            clearTimeout(showFlashHdr);
-
-            $('#main_flash_alert').hide();
-            $('#main_flash_hdr').hide();
-            $('#main_content').show();
-
-            autoLoadPage();
     };
+
+    var hide_for_error = function () {
+        $('#main_flash_alert').show();
+        $('#main_info').hide();
+        $('#main_tips').hide();
+        $('#video_player').hide();
+        //$('#btn_play').hide();
+
+        stopPlayers();
+    };
+
+    var show_for_ok = function () {
+        $('#main_flash_alert').hide();
+        $('#main_info').show();
+        $('#main_tips').show();
+        $('#video_player').show();
+        //$('#btn_play').show();
+    };
+
+    var apply_url_change = function() {
+        var r = parse_rtmp_url($("#txt_url").val());
+        var url = window.location.protocol + "//" + query.host + query.pathname + "?autostart=true"
+            + "&app=" + r.app + "&stream=" + r.stream + "&server=" + r.server + "&port=" + r.port;
+        url += (query.shp_identify) ? "&shp_identify=" + query.shp_identify : '';
+        url += (r.vhost === "__defaultVhost__") ? "&vhost=" + r.server : "&vhost=" + r.vhost;
+        url += (r.schema !== "rtmp") ? "&schema=" + r.schema : '';
+        url += (query.buffer) ? "&buffer=" + query.buffer : '';
+        url += (query.api_port) ? "&api_port=" + query.api_port : '';
+
+        var queries = user_extra_params(query);
+        queries = user_extra_params(r, queries);
+
+        if (queries && queries.length) {
+            url += '&' + queries.join('&');
+        }
+        $("#player_url").text($("#txt_url").val()).attr("href", url);
+        $("#link_url").attr("href", url);
+
+        // For RTMP, not support.
+        if (r.schema === 'rtmp') {
+            hide_for_error();
+            return;
+        }
+
+        return r;
+    };
+
+    var start_play = function (r) {
+        stopPlayers();
+        if (!r) return;
+
+        // Start play HTTP-FLV.
+        if (r.stream.indexOf('.flv') > 0) {
+            if (!flvjs.isSupported()) {
+                hide_for_error();
+                return;
+            }
+
+            show_for_ok();
+
+            flvPlayer = flvjs.createPlayer({type: 'flv', url: r.url});
+            flvPlayer.attachMediaElement(document.getElementById('video_player'));
+            flvPlayer.load();
+            flvPlayer.play();
+            return;
+        }
+
+        // Start play HLS.
+        if (r.stream.indexOf('.m3u8') > 0) {
+            if (!Hls.isSupported()) {
+                hide_for_error();
+                return;
+            }
+
+            show_for_ok();
+
+            hlsPlayer = new Hls();
+            hlsPlayer.loadSource(r.url);
+            hlsPlayer.attachMedia(document.getElementById('video_player'));
+            return;
+        }
+
+        console.error('不支持的URL', r.url, r);
+        $('#video_player').hide();
+    };
+
+    $("#txt_url").change(function(){
+        apply_url_change();
     });
-</script>
-<script type="text/javascript">
-    var srs_player = null;
-    var url = null;
 
-    var __active_dar = null;
+    $("#btn_play").click(function(){
-    function select_dar(dar_id, num, den) {
+        $('#video_player').prop('muted', false);
-        srs_player.set_dar(num, den);
+        var r = apply_url_change();
-
+        start_play(r);
-        if (__active_dar) {
+    });
-            __active_dar.removeClass("active");
-        }
-
-        __active_dar = $(dar_id).parent();
-        __active_dar.addClass("active");
-    }
-
-    var __active_size = null;
-    function select_fs_size(size_id, refer, percent) {
-        srs_player.set_fs(refer, percent);
-
-        if (__active_size) {
-            __active_size.removeClass("active");
-        }
-
-        __active_size = $(size_id).parent();
-        __active_size.addClass("active");
-    }
-
-    function select_buffer(buffer_time) {
-        var bt = buffer_time;
-        var bt_id = "#btn_bt_" + bt.toFixed(1).replace(".", "_");
-        select_buffer_time(bt_id, bt);
-    }
-    function select_max_buffer(max_buffer_time) {
-        var mbt = max_buffer_time;
-        var mbt_id = "#btn_mbt_" + mbt.toFixed(1).replace(".", "_");
-        select_max_buffer_time(mbt_id, mbt);
-    }
-
-    var __active_bt = null;
-    function select_buffer_time(bt_id, buffer_time) {
-        srs_player.set_bt(buffer_time);
-
-        if (__active_bt) {
-            __active_bt.removeClass("active");
-        }
-
-        __active_bt = $(bt_id).parent();
-        __active_bt.addClass("active");
-
-        select_max_buffer(srs_player.max_buffer_time);
-    }
-
-    var __active_mbt = null;
-    function select_max_buffer_time(mbt_id, max_buffer_time) {
-        srs_player.set_mbt(max_buffer_time);
-
-        if (__active_mbt) {
-            __active_mbt.removeClass("active");
-        }
-
-        __active_mbt = $(mbt_id).parent();
-        __active_mbt.addClass("active");
-    }
 
     /****
      * The parameters for this page:
@@ -410,308 +244,21 @@
      *       http://localhost:8088/players/srs_player.html?vhost=ossrs.net&app=live&stream=livestream&server=ossrs.net&port=1935&autostart=true&schema=rtmp
      *       http://localhost:8088/players/srs_player.html?vhost=ossrs.net&app=live&stream=livestream.flv&server=ossrs.net&port=8080&autostart=true&schema=http
      */
-    var autoLoadPage = function() {
     var query = parse_query_string();
 
     // get the vhost and port to set the default url.
-        // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
+    // url set to: http://localhost:8080/live/livestream.flv
-        // url set to: rtmp://demo:1935/live/livestream
+    srs_init_flv("#txt_url");
-        srs_init_rtmp("#txt_url", "#main_modal");
 
-        // consts for buffer and max buffer.
+    if (query.autostart === "true") {
-        var bts =  [0.1, 0.2, 0.3, 0.5, 0.8, 1, 2, 3, 4, 5, 6, 8, 10, 15, 20, 30];
+        $('#video_player').prop('muted', true);
-        var mbts = [0.6, 0.9, 1.2, 1.5, 2.4, 3, 6, 9, 12, 15, 18, 24, 30, 45, 60, 90];
+        console.warn('For autostart, we should mute it, see https://www.jianshu.com/p/c3c6944eed5a ' +
+            'or https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#audiovideo_elements');
 
-        // the play startup time.
+        var r = apply_url_change();
-        var pst = new Date();
+        start_play(r);
-
-        $("#main_modal").on("show", function(){
-            if (srs_player) {
-                return;
-            }
-
-            $("#div_container").remove();
-            $("#debug_info").text("");
-
-            var div_container = $("<div/>");
-            $(div_container).attr("id", "div_container");
-            $("#player").append(div_container);
-
-            var player = $("<div/>");
-            $(player).attr("id", "player_id");
-            $(div_container).append(player);
-
-            srs_player = new SrsPlayer("player_id", srs_get_player_width(), srs_get_player_height());
-            srs_player.on_player_ready = function() {
-                var buffer_time = 0.5;
-                if (url.indexOf('.m3u8') > 0) {
-                    buffer_time = 2;
-                }
-
-                if (query.buffer) {
-                    for (var i = 0; i < bts.length - 1; i++) {
-                        var cur = bts[i];
-                        var next = bts[i+1];
-                        if (Number(query.buffer) >= cur && Number(query.buffer) < next) {
-                            buffer_time = cur;
-                            break;
-                        }
-                    }
-                }
-
-                select_buffer(buffer_time);
-                this.play(url);
-
-                pst = new Date();
-            };
-            srs_player.on_player_status = function(code, desc) {
-                //console.log("[播放器状态] code=" + code + ", desc=" + desc);
-            };
-            srs_player.on_player_metadata = function(metadata) {
-                $("#btn_dar_original").text("视频原始比例" + "(" + metadata.width + ":" + metadata.height + ")");
-                if (metadata.ip && metadata.pid && metadata.cid) {
-                    $("#debug_info").text("ID:" + metadata.ip + '/' + metadata.pid + '/' + metadata.cid + '');
-                }
-                select_dar("#btn_dar_original", 0, 0);
-                select_fs_size("#btn_fs_size_screen_100", "screen", 100);
-            };
-            srs_player.on_player_timer = function(time, buffer_length, kbps, fps, rtime) {
-                if (time > 0 && pst) {
-                    var diff = (new Date().getTime() - pst.getTime()) / 1000.0;
-                    $("#txt_pst").val(Number(diff).toFixed(2) + "秒");
-                    pst = null;
-                }
-
-                var buffer = buffer_length / this.max_buffer_time * 100;
-                $("#pb_buffer").width(Number(buffer).toFixed(1) + "%");
-
-                $("#pb_buffer_bg").attr("title",
-                    "缓冲区:" + buffer_length.toFixed(1) + "秒, 最大缓冲区:"
-                    + this.max_buffer_time.toFixed(1) + "秒, 当前:"
-                    + buffer.toFixed(1) + "%");
-
-                var bts = this.buffer_time >= 1? this.buffer_time.toFixed(0) : this.buffer_time.toFixed(1);
-                var mbts = this.buffer_time >= 1? this.max_buffer_time.toFixed(0) : this.max_buffer_time.toFixed(1);
-                $("#txt_buffer").val(buffer_length.toFixed(1) + "/" + bts + "/" + mbts + "s");
-
-                $("#txt_bitrate").val(kbps.toFixed(0) + "kbps");
-                $("#txt_fps").val(fps.toFixed(1) + "fps");
-                $("#txt_empty_count").val(srs_player.empty_count() + "次");
-                $("#txt_fluency").val(srs_player.fluency().toFixed(2) + "%");
-
-                var time_str = "";
-                // day
-                time_str = padding(parseInt(time / 24 / 3600), 2, '0') + " ";
-                // hour
-                time = time % (24 * 3600);
-                time_str += padding(parseInt(time / 3600), 2, '0') + ":";
-                // minute
-                time = time % (3600);
-                time_str += padding(parseInt(time / 60), 2, '0') + ":";
-                // seconds
-                time = time % (60);
-                time_str += padding(parseInt(time), 2, '0');
-                // show
-                $("#txt_time").val(time_str);
-
-                var clock = new Date().getTime() / 1000;
-                $("#player_clock").val(absolute_seconds_to_YYYYmmdd(clock) + " " + absolute_seconds_to_HHMMSS(clock));
-            };
-            srs_player.start();
-        });
-
-        $("#main_modal").on("hide", function(){
-            if (srs_player) {
-                // report the log to backend.
-                //console.log(srs_player.dump_log());
-
-                srs_player.stop();
-                srs_player = null;
-            }
-        });
-
-        var apply_url_change = function() {
-            var rtmp = parse_rtmp_url($("#txt_url").val());
-            var url = "http://" + query.host + query.pathname + "?"
-                + "app=" + rtmp.app + "&stream=" + rtmp.stream
-                + "&server=" + rtmp.server + "&port=" + rtmp.port
-                + "&autostart=true";
-            if (query.shp_identify) {
-                url += "&shp_identify=" + query.shp_identify;
-            }
-            if (rtmp.vhost == "__defaultVhost__") {
-                url += "&vhost=" + rtmp.server;
     } else {
-                url += "&vhost=" + rtmp.vhost;
+        $('#video_player').hide();
     }
-            if (rtmp.schema == "http") {
-                url += "&schema=http";
-            }
-            if (query.buffer) {
-                url += "&buffer=" + query.buffer;
-            }
-
-            var queries = user_extra_params(query);
-            if (queries && queries.length) {
-                url += '&' + queries.join('&');
-            }
-            $("#player_url").text($("#txt_url").val()).attr("href", url);
-
-            $("#link_server").text(rtmp.server);
-            $("#link_port").text(rtmp.port);
-            $("#link_vhost").text(rtmp.vhost);
-            $("#link_app").text(rtmp.app);
-            $("#link_stream").text(rtmp.stream);
-            $("#link_rtmp").text($("#txt_url").val());
-            $("#link_url").attr("href", url);
-        };
-
-        $("#txt_url").change(function(){
-            apply_url_change();
-        });
-
-        $("#btn_generate_link").click(function(){
-            $("#link_modal").modal({show:true, keyboard:true});
-        });
-
-        $("#btn_play").click(function(){
-            url = $("#txt_url").val();
-            $("#main_modal").modal({show:true, keyboard:true});
-        });
-
-        $("#btn_fullscreen").click(function(){
-            $("#fullscreen_tips").toggle();
-        });
-
-        $("#btn_pause").click(function() {
-            $("#btn_resume").toggle();
-            $("#btn_pause").toggle();
-            srs_player.pause();
-        });
-        $("#btn_resume").click(function(){
-            $("#btn_resume").toggle();
-            $("#btn_pause").toggle();
-            srs_player.resume();
-        });
-
-        if (true) {
-            $("#srs_publish").click(function () {
-                url = $("#srs_publish").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-            $("#srs_publish_ld").click(function () {
-                url = $("#srs_publish_ld").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-            $("#srs_publish_sd").click(function () {
-                url = $("#srs_publish_sd").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-            $("#srs_publish_fw").click(function () {
-                url = $("#srs_publish_fw").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-            $("#srs_publish_fw_ld").click(function () {
-                url = $("#srs_publish_fw_ld").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-            $("#srs_publish_fw_sd").click(function () {
-                url = $("#srs_publish_fw_sd").text();
-                $("#main_modal").modal({show: true, keyboard: false});
-            });
-        }
-
-        var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=live&hls_autostart=true";
-        if (true) {
-            $("#srs_publish_hls").attr("href", jwplayer_url + "&stream=livestream");
-            $("#srs_publish_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld");
-            $("#srs_publish_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd");
-            var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=forward/live&hls_autostart=true";
-            $("#srs_publish_fw_hls").attr("href", jwplayer_url + "&stream=livestream");
-            $("#srs_publish_fw_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld");
-            $("#srs_publish_fw_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd");
-        }
-
-        if (true) {
-            $("#btn_dar_original").click(function(){
-                select_dar("#btn_dar_original", 0, 0);
-            });
-            $("#btn_dar_21_9").click(function(){
-                select_dar("#btn_dar_21_9", 21, 9);
-            });
-            $("#btn_dar_16_9").click(function(){
-                select_dar("#btn_dar_16_9", 16, 9);
-            });
-            $("#btn_dar_4_3").click(function(){
-                select_dar("#btn_dar_4_3", 4, 3);
-            });
-            $("#btn_dar_fill").click(function(){
-                select_dar("#btn_dar_fill", -1, -1);
-            });
-        }
-
-        if (true) {
-            $("#btn_fs_size_video_100").click(function(){
-                select_fs_size("#btn_fs_size_video_100", "video", 100);
-            });
-            $("#btn_fs_size_video_75").click(function(){
-                select_fs_size("#btn_fs_size_video_75", "video", 75);
-            });
-            $("#btn_fs_size_video_50").click(function(){
-                select_fs_size("#btn_fs_size_video_50", "video", 50);
-            });
-            $("#btn_fs_size_screen_100").click(function(){
-                select_fs_size("#btn_fs_size_screen_100", "screen", 100);
-            });
-            $("#btn_fs_size_screen_75").click(function(){
-                select_fs_size("#btn_fs_size_screen_75", "screen", 75);
-            });
-            $("#btn_fs_size_screen_50").click(function(){
-                select_fs_size("#btn_fs_size_screen_50", "screen", 50);
-            });
-        }
-
-        if (true) {
-            for (var i = 0; i < bts.length; i++) {
-                var bt = bts[i];
-                var bt_id = "#btn_bt_" + bt.toFixed(1).replace(".", "_");
-
-                var bt_fun = function(id, v){
-                    $(bt_id).click(function(){
-                        select_buffer_time(id, v);
-
-                        // remember the chagned buffer.
-                        if (Number(query.buffer) != srs_player.buffer_time) {
-                            query.buffer = srs_player.buffer_time;
-                            apply_url_change();
-                        }
-
-                    });
-                };
-                bt_fun(bt_id, bt);
-            }
-        }
-        if (true) {
-            for (var i = 0; i < mbts.length; i++) {
-                var mbt = mbts[i];
-                var mbt_id = "#btn_mbt_" + mbt.toFixed(1).replace(".", "_");
-
-                var mbt_fun = function(id, v){
-                    $(mbt_id).click(function(){
-                        select_max_buffer_time(id, v);
-                    });
-                };
-                mbt_fun(mbt_id, mbt);
-            }
-        }
-
-        var query = parse_query_string();
-        if (query.autostart == "true") {
-            url = $("#txt_url").val();
-            $("#main_modal").modal({show:true, keyboard:false});
-        }
-
-        apply_url_change();
-    };
 </script>
 </html>

trunk/research/players/srs_player/src/HlsNetStream.as

@@ -1369,7 +1369,7 @@ class SrsTsHanlder implements ISrsTsHandler
     private function write_h264_ipb_frame(ibps:ByteArray, frame_type:uint, dts:uint, pts:uint, piece:ByteArray):void
     {
         // when sps or pps not sent, ignore the packet.
-        // @see https://github.com/winlinvip/simple-rtmp-server/issues/203
+        // @see https://github.com/ossrs/srs/issues/203
         if (video_sh_tag.length == 0) {
             return;
         }
@@ -2197,7 +2197,7 @@ class SrsRawAacStream
             // decode the ADTS.
             // @see aac-iso-13818-7.pdf, page 26
             //      6.2 Audio Data Transport Stream, ADTS
-            // @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64145885
+            // @see https://github.com/ossrs/srs/issues/212#issuecomment-64145885
             // byte_alignment()
             
             // adts_fixed_header:
@@ -2260,7 +2260,7 @@ class SrsRawAacStream
             var channel_configuration:uint = (sfiv >> 6) & 0x07;
             /*int8_t original = (sfiv >> 5) & 0x01;*/
             /*int8_t home = (sfiv >> 4) & 0x01;*/
-            //int8_t Emphasis; @remark, Emphasis is removed, @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64154736
+            //int8_t Emphasis; @remark, Emphasis is removed, @see https://github.com/ossrs/srs/issues/212#issuecomment-64154736
             // 4bits left.
             // adts_variable_header(), 1.A.2.2.2 Variable Header of ADTS
             // copyright_identification_bit 1 bslbf
@@ -2357,7 +2357,7 @@ class SrsRawAacStream
         var samplingFrequencyIndex:uint = codec.sampling_frequency_index;
         
         // override the aac samplerate by user specified.
-        // @see https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64146899
+        // @see https://github.com/ossrs/srs/issues/212#issuecomment-64146899
         switch (codec.sound_rate) {
             case SrsConsts.SrsCodecAudioSampleRate11025: 
                 samplingFrequencyIndex = 0x0a; break;
@@ -2478,7 +2478,7 @@ class SrsEnum
 
 /**
  * the aac profile, for ADTS(HLS/TS)
- * @see https://github.com/winlinvip/simple-rtmp-server/issues/310
+ * @see https://github.com/ossrs/srs/issues/310
  */
 class SrsAacProfile extends SrsEnum
 {
@@ -3697,7 +3697,7 @@ class SrsTsAdaptationField
             
             // @remark, for as, should never shift the Number object.
             // @remark, use pcr base and ignore the extension
-            // @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370
+            // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370
             // first 33bits is pcr base.
             program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe;
             var ch:uint = stream.readUnsignedByte();
@@ -3715,7 +3715,7 @@ class SrsTsAdaptationField
             }
             // @remark, for as, should never shift the Number object.
             // @remark, use pcr base and ignore the extension
-            // @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-71349370
+            // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370
             // first 33bits is pcr base.
             original_program_clock_reference_base = (stream.readUnsignedInt() << 1) & 0x1fffffe;
             ch = stream.readUnsignedByte();

trunk/research/players/srs_player_deprecated.html

@@ -0,0 +1,720 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SRS</title>   
+    <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
+    <style>
+        body{
+            padding-top: 55px;
+        }
+        #my_modal_footer {
+            margin-top: -20px;
+            padding-top: 3px;
+        }
+        #main_modal {
+            margin-top: -60px;
+        }
+        .div_play_time {
+            margin-top: 10px;
+        }
+        #pb_buffer_bg {
+            margin-top: -4px;
+            margin-bottom: 10px;
+        }
+    </style>
+</head>
+<body>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/srsplayer'/>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a id="srs_index" class="brand" href="#">SRS</a>
+            <div class="nav-collapse collapse">
+                <ul class="nav">
+                    <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
+                    <li><a  href="http://ossrs.net/srs.release/releases/app.html">iOS/Andriod</a></li>
+                    <!--<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>-->
+                    <!--<li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>-->
+                    <!--<li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>-->
+                    <!--li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>-->
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">GB28181</a></li>
+                    <li>
+                        <a href="https://github.com/ossrs/srs">
+                            <img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ossrs/srs?style=social">
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container">
+    <div name="detect_flash">
+        <div id="main_flash_alert" class="alert alert-danger fade in hide">
+            <button type="button" class="close" data-dismiss="alert">×</button>
+            <strong><p>Usage:</p></strong>
+            <p>
+                请点击下面的图标，启用Flash
+            </p>
+            <p>
+                若没有见到这个图标，Chrome浏览器请打开
+                <span class="text-info">chrome://settings/content/flash</span> 并修改为"Ask first"。
+            </p>
+        </div>
+        <div id="main_flash_hdr" class="hide">
+        </div>
+    </div>
+
+    <div id="main_content" class="hide">
+        <div class="alert alert-info fade in">
+            <button type="button" class="close" data-dismiss="alert">×</button>
+            <strong><span>Usage:</span></strong> <span>输入RTMP/HTTP-FLV/HLS地址后点击“播放视频”即可播放视频</span>
+        </div>
+        <div class="form-inline">
+            URL:
+            <input type="text" id="txt_url" class="input-xxlarge" value="">
+            <button class="btn btn-primary" id="btn_play">播放视频</button>
+            <button class="btn" id="btn_generate_link">生成链接</button>
+            <p></p>
+            <p>
+                推荐的其他播放器：
+                <ul>
+                    <li><a href="http://bilibili.github.io/flv.js/demo">flv.js</a>，H5/MSE播放HTTP-FLV</li>
+                    <li><a href="https://hls-js.netlify.com/demo">hls.js</a>，H5/MSE播放HLS</li>
+                    <li><a href="http://reference.dashif.org/dash.js/nightly/samples/dash-if-reference-player/index.html">dash.js</a>，H5/MSE播放MPEG-DASH</li>
+                </ul>
+            </p>
+        </div>
+        <div id="link_modal" class="modal hide fade">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3><a href="https://github.com/ossrs/srs">SRS Link Generator</a></h3>
+            </div>
+            <div class="modal-body">
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <label class="control-label" for="link_server">服务器地址</label>
+                        <div class="controls">
+                            <span id="link_server" class="span4 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_port">服务器端口</label>
+                        <div class="controls">
+                            <span id="link_port" class="span2 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_vhost">RTMP Vhost</label>
+                        <div class="controls">
+                            <span id="link_vhost" class="span4 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_app">RTMP App</label>
+                        <div class="controls">
+                            <span id="link_app" class="span4 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_stream">RTMP Stream</label>
+                        <div class="controls">
+                            <span id="link_stream" class="span4 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_rtmp">RTMP地址</label>
+                        <div class="controls">
+                            <span id="link_rtmp" class="span4 uneditable-input"></span>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="link_url">播放链接地址</label>
+                        <div class="controls">
+                            <div style="margin-top:5px;"><a href="#" id="link_url" target="_blank">请右键拷贝此链接地址.</a></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer"></div>
+        </div>
+        <div id="main_modal" class="modal hide fade">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3><a href="https://github.com/ossrs/srs">SrsPlayer</a></h3>
+            </div>
+            <div class="modal-body">
+                <div id="player"></div>
+                <div class="progress progress-striped active" id="pb_buffer_bg">
+                    <div class="bar" style="width: 0%;" id="pb_buffer"></div>
+                </div>
+            </div>
+            <div class="modal-footer" id="my_modal_footer">
+                <div>
+                    <div class="btn-group dropup">
+                        <button class="btn dropdown-toggle" data-toggle="dropdown">
+                            全屏比例大小<span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a id="btn_fs_size_screen_100" href="#">屏幕大小(100%)</a></li>
+                            <li><a id="btn_fs_size_screen_75" href="#">屏幕大小(75%)</a></li>
+                            <li><a id="btn_fs_size_screen_50" href="#">屏幕大小(50%)</a></li>
+                            <li><a id="btn_fs_size_video_100" href="#">视频大小(100%)</a></li>
+                            <li><a id="btn_fs_size_video_75" href="#">视频大小(75%)</a></li>
+                            <li><a id="btn_fs_size_video_50" href="#">视频大小(50%)</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group dropup">
+                        <button class="btn dropdown-toggle" data-toggle="dropdown">显示比例<span class="caret"></span></button>
+                        <ul class="dropdown-menu">
+                            <li><a id="btn_dar_original" href="#">视频原始比例</a></li>
+                            <li><a id="btn_dar_21_9" href="#">宽屏影院(21:9)</a></li>
+                            <li><a id="btn_dar_16_9" href="#">宽屏电视(16:9)</a></li>
+                            <li><a id="btn_dar_4_3" href="#">窄屏(4:3)</a></li>
+                            <li><a id="btn_dar_fill" href="#">填充(容器比例)</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group dropup">
+                        <button class="btn dropdown-toggle" data-toggle="dropdown">缓冲区大小<span class="caret"></span></button>
+                        <ul class="dropdown-menu">
+                            <li><a id="btn_bt_0_1" href="#">0.1秒(实时)</a></li>
+                            <li><a id="btn_bt_0_2" href="#">0.2秒(实时)</a></li>
+                            <li><a id="btn_bt_0_3" href="#">0.3秒(实时)</a></li>
+                            <li><a id="btn_bt_0_5" href="#">0.5秒(实时)</a></li>
+                            <li><a id="btn_bt_0_8" href="#">0.8秒(会议)</a></li>
+                            <li><a id="btn_bt_1_0" href="#">1秒(低延迟)</a></li>
+                            <li><a id="btn_bt_2_0" href="#">2秒(较低延时)</a></li>
+                            <li><a id="btn_bt_3_0" href="#">3秒(流畅播放)</a></li>
+                            <li><a id="btn_bt_4_0" href="#">4秒(流畅播放)</a></li>
+                            <li><a id="btn_bt_5_0" href="#">5秒(网速较低)</a></li>
+                            <li><a id="btn_bt_6_0" href="#">6秒(网速较低)</a></li>
+                            <li><a id="btn_bt_8_0" href="#">8秒(网速较低)</a></li>
+                            <li><a id="btn_bt_10_0" href="#">10秒(无所谓延迟)</a></li>
+                            <li><a id="btn_bt_15_0" href="#">15秒(无所谓延迟)</a></li>
+                            <li><a id="btn_bt_20_0" href="#">20秒(无所谓延迟)</a></li>
+                            <li><a id="btn_bt_30_0" href="#">30秒(流畅第一)</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group dropup">
+                        <button class="btn dropdown-toggle" data-toggle="dropdown">最大缓冲区<span class="caret"></span></button>
+                        <ul class="dropdown-menu">
+                            <li><a id="btn_mbt_0_6" href="#">0.6秒(实时)</a></li>
+                            <li><a id="btn_mbt_0_9" href="#">0.9秒(实时)</a></li>
+                            <li><a id="btn_mbt_1_2" href="#">1.2秒(实时)</a></li>
+                            <li><a id="btn_mbt_1_5" href="#">1.5秒(实时)</a></li>
+                            <li><a id="btn_mbt_2_4" href="#">2.4秒(会议)</a></li>
+                            <li><a id="btn_mbt_3_0" href="#">3秒(低延迟)</a></li>
+                            <li><a id="btn_mbt_6_0" href="#">6秒(较低延时)</a></li>
+                            <li><a id="btn_mbt_9_0" href="#">9秒(流畅播放)</a></li>
+                            <li><a id="btn_mbt_12_0" href="#">12秒(流畅播放)</a></li>
+                            <li><a id="btn_mbt_15_0" href="#">15秒(网速较低)</a></li>
+                            <li><a id="btn_mbt_18_0" href="#">18秒(网速较低)</a></li>
+                            <li><a id="btn_mbt_24_0" href="#">24秒(网速较低)</a></li>
+                            <li><a id="btn_mbt_30_0" href="#">30秒(无所谓延迟)</a></li>
+                            <li><a id="btn_mbt_45_0" href="#">45秒(无所谓延迟)</a></li>
+                            <li><a id="btn_mbt_60_0" href="#">60秒(无所谓延迟)</a></li>
+                            <li><a id="btn_mbt_90_0" href="#">90秒(流畅第一)</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group dropup">
+                        <a id="btn_fullscreen" class="btn">全屏</a>
+                    </div>
+                    <div class="btn-group dropup">
+                        <button id="btn_pause" class="btn">暂停播放</button>
+                        <button id="btn_resume" class="btn hide">继续播放</button>
+                    </div>
+                    <div class="btn-group dropup">
+                        <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">关闭播放器</button>
+                    </div>
+                </div>
+                <div class="hide" id="fullscreen_tips">
+                    请<font color="red">点击视频</font>进入全屏模式~<br/>
+                    由于安全原因，Flash全屏无法使用JS触发
+                </div>
+                <div>
+                    <div class="input-prepend div_play_time" title="BufferLength/BufferTime/MaxBufferTime">
+                        <span class="add-on">@B</span>
+                        <input class="span2" style="width:80px" id="txt_buffer" type="text" placeholder="0/0/0s">
+                    </div>
+                    <div class="input-prepend div_play_time" title="视频的播放流畅度">
+                        <span class="add-on">@F</span>
+                        <input class="span2" style="width:57px" id="txt_fluency" type="text" placeholder="100%">
+                    </div>
+                    <div class="input-prepend div_play_time" title="视频总共卡顿次数">
+                        <span class="add-on">@E</span>
+                        <input class="span2" style="width:45px" id="txt_empty_count" type="text" placeholder="0">
+                    </div>
+                    <div class="input-prepend div_play_time" title="视频当前的帧率FPS">
+                        <span class="add-on">@F</span>
+                        <input class="span2" style="width:55px" id="txt_fps" type="text" placeholder="fps">
+                    </div>
+                    <div class="input-prepend div_play_time" title="视频当前的码率(视频+音频)，单位：Kbps">
+                        <span class="add-on">@B</span>
+                        <input class="span2" style="width:55px" id="txt_bitrate" type="text" placeholder="kbps">
+                    </div>
+                    <div class="input-prepend div_play_time" title="播放时长，格式：天 时:分:秒">
+                        <span class="add-on">@T</span>
+                        <input class="span2" style="width:85px" id="txt_time" type="text" placeholder="天 时:分:秒">
+                    </div>
+                </div>
+                <div style="margin-top:-12px;">
+                    <span id="debug_info"></span>
+                    URL: <a href="#" id="player_url"></a>
+                    <div class="input-prepend div_play_time" title="当前时间：年-月-日 时:分:秒">
+                        <span class="add-on">@N</span>
+                        <input class="span2" style="width:135px" id="player_clock" type="text" placeholder="年-月-日 时:分:秒">
+                    </div>
+                </div>
+                <div>
+                    <div class="input-prepend" title="首播时间，点播放到开始播放的时间，秒">
+                        <span class="add-on">@PST</span>
+                        <input class="span1" style="width:60px" id="txt_pst" type="text" placeholder="N秒">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <footer>
+        <p></p>
+        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
+    </footer>
+</div>
+</body>
+<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/bootstrap.min.js"></script>
+<script type="text/javascript" src="js/swfobject.js"></script>
+<script type="text/javascript" src="js/json2.js"></script>
+<script type="text/javascript" src="js/srs.page.js"></script>
+<script type="text/javascript" src="js/srs.log.js"></script>
+<script type="text/javascript" src="js/srs.player.js"></script>
+<script type="text/javascript" src="js/srs.publisher.js"></script>
+<script type="text/javascript" src="js/srs.utility.js"></script>
+<script type="text/javascript" src="js/winlin.utility.js"></script>
+<script type="text/javascript">
+    var __on_flash_ready = null;
+
+    $(function(){
+        // 探测Flash是否正常启用。
+        $('#main_flash_hdr').html(
+            '\
+            <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="100%" height="100%"> \
+                <param name="movie" value="srs_player/release/srs_player.swf"> \
+                <param name="quality" value="autohigh"> \
+                <param name="swliveconnect" value="true"> \
+                <param name="allowScriptAccess" value="always"> \
+                <param name="bgcolor" value="#0"> \
+                <param name="allowFullScreen" value="true"> \
+                <param name="wmode" value="opaque"> \
+                <param name="FlashVars" value="log=1"> \
+                <param name="flashvars" value="id=1&on_player_ready=__on_flash_ready"> \
+                <embed src="srs_player/release/srs_player.swf" width="100%" height="100%" \
+                    quality="autohigh" bgcolor="#0" align="middle" allowfullscreen="true" allowscriptaccess="always" \
+                    type="application/x-shockwave-flash" swliveconnect="true" wmode="opaque" \
+                    flashvars="id=1&on_player_ready=__on_flash_ready" \
+                    pluginspage="http://www.macromedia.com/go/getflashplayer"> \
+            </object> \
+            '
+        );
+        $('#main_flash_hdr').show();
+
+        var showFlashHdr = setTimeout(function(){
+            $('#main_flash_alert').show();
+        }, 300);
+
+        __on_flash_ready = function (id) {
+            clearTimeout(showFlashHdr);
+
+            $('#main_flash_alert').hide();
+            $('#main_flash_hdr').hide();
+            $('#main_content').show();
+
+            autoLoadPage();
+        };
+    });
+</script>
+<script type="text/javascript">
+    var srs_player = null;
+    var url = null;
+
+    var __active_dar = null;
+    function select_dar(dar_id, num, den) {
+        srs_player.set_dar(num, den);
+
+        if (__active_dar) {
+            __active_dar.removeClass("active");
+        }
+
+        __active_dar = $(dar_id).parent();
+        __active_dar.addClass("active");
+    }
+
+    var __active_size = null;
+    function select_fs_size(size_id, refer, percent) {
+        srs_player.set_fs(refer, percent);
+
+        if (__active_size) {
+            __active_size.removeClass("active");
+        }
+
+        __active_size = $(size_id).parent();
+        __active_size.addClass("active");
+    }
+
+    function select_buffer(buffer_time) {
+        var bt = buffer_time;
+        var bt_id = "#btn_bt_" + bt.toFixed(1).replace(".", "_");
+        select_buffer_time(bt_id, bt);
+    }
+    function select_max_buffer(max_buffer_time) {
+        var mbt = max_buffer_time;
+        var mbt_id = "#btn_mbt_" + mbt.toFixed(1).replace(".", "_");
+        select_max_buffer_time(mbt_id, mbt);
+    }
+
+    var __active_bt = null;
+    function select_buffer_time(bt_id, buffer_time) {
+        srs_player.set_bt(buffer_time);
+
+        if (__active_bt) {
+            __active_bt.removeClass("active");
+        }
+
+        __active_bt = $(bt_id).parent();
+        __active_bt.addClass("active");
+
+        select_max_buffer(srs_player.max_buffer_time);
+    }
+
+    var __active_mbt = null;
+    function select_max_buffer_time(mbt_id, max_buffer_time) {
+        srs_player.set_mbt(max_buffer_time);
+
+        if (__active_mbt) {
+            __active_mbt.removeClass("active");
+        }
+
+        __active_mbt = $(mbt_id).parent();
+        __active_mbt.addClass("active");
+    }
+
+    /****
+    * The parameters for this page:
+    *       schema, the protocol schema, rtmp or http.
+    *       server, the ip of the url.
+    *       port, the rtmp port of url.
+    *       vhost, the vhost of url, can equals to server.
+    *       app, the app of url.
+    *       stream, the stream of url, can endwith .flv or .mp4 or nothing for RTMP.
+    *       autostart, whether auto play the stream.
+    *       buffer, the buffer time in seconds.
+    * extra params:
+    *       shp_identify, hls+ param.
+    * for example:
+    *       http://localhost:8088/players/srs_player.html?vhost=ossrs.net&app=live&stream=livestream&server=ossrs.net&port=1935&autostart=true&schema=rtmp
+    *       http://localhost:8088/players/srs_player.html?vhost=ossrs.net&app=live&stream=livestream.flv&server=ossrs.net&port=8080&autostart=true&schema=http
+    */
+    var autoLoadPage = function() {
+        var query = parse_query_string();
+
+        // get the vhost and port to set the default url.
+        // url set to: http://localhost:8080/live/livestream.flv
+        srs_init_flv("#txt_url", "#main_modal");
+
+        // consts for buffer and max buffer.
+        var bts =  [0.1, 0.2, 0.3, 0.5, 0.8, 1, 2, 3, 4, 5, 6, 8, 10, 15, 20, 30];
+        var mbts = [0.6, 0.9, 1.2, 1.5, 2.4, 3, 6, 9, 12, 15, 18, 24, 30, 45, 60, 90];
+
+        // the play startup time.
+        var pst = new Date();
+
+        $("#main_modal").on("show", function(){
+            if (srs_player) {
+                return;
+            }
+
+            $("#div_container").remove();
+            $("#debug_info").text("");
+
+            var div_container = $("<div/>");
+            $(div_container).attr("id", "div_container");
+            $("#player").append(div_container);
+
+            var player = $("<div/>");
+            $(player).attr("id", "player_id");
+            $(div_container).append(player);
+
+            apply_url_change();
+
+            srs_player = new SrsPlayer("player_id", srs_get_player_width(), srs_get_player_height());
+            srs_player.on_player_ready = function() {
+                var buffer_time = 0.5;
+                if (url.indexOf('.m3u8') > 0) {
+                    buffer_time = 2;
+                }
+
+                if (query.buffer) {
+                    for (var i = 0; i < bts.length - 1; i++) {
+                        var cur = bts[i];
+                        var next = bts[i+1];
+                        if (Number(query.buffer) >= cur && Number(query.buffer) < next) {
+                            buffer_time = cur;
+                            break;
+                        }
+                    }
+                }
+
+                select_buffer(buffer_time);
+                this.play(url);
+
+                pst = new Date();
+            };
+            srs_player.on_player_status = function(code, desc) {
+                //console.log("[播放器状态] code=" + code + ", desc=" + desc);
+            };
+            srs_player.on_player_metadata = function(metadata) {
+                $("#btn_dar_original").text("视频原始比例" + "(" + metadata.width + ":" + metadata.height + ")");
+                if (metadata.ip && metadata.pid && metadata.cid) {
+                    $("#debug_info").text("ID:" + metadata.ip + '/' + metadata.pid + '/' + metadata.cid + '');
+                }
+                select_dar("#btn_dar_original", 0, 0);
+                select_fs_size("#btn_fs_size_screen_100", "screen", 100);
+            };
+            srs_player.on_player_timer = function(time, buffer_length, kbps, fps, rtime) {
+                if (time > 0 && pst) {
+                    var diff = (new Date().getTime() - pst.getTime()) / 1000.0;
+                    $("#txt_pst").val(Number(diff).toFixed(2) + "秒");
+                    pst = null;
+                }
+
+                var buffer = buffer_length / this.max_buffer_time * 100;
+                $("#pb_buffer").width(Number(buffer).toFixed(1) + "%");
+
+                $("#pb_buffer_bg").attr("title",
+                    "缓冲区:" + buffer_length.toFixed(1) + "秒, 最大缓冲区:"
+                    + this.max_buffer_time.toFixed(1) + "秒, 当前:"
+                    + buffer.toFixed(1) + "%");
+
+                var bts = this.buffer_time >= 1? this.buffer_time.toFixed(0) : this.buffer_time.toFixed(1);
+                var mbts = this.buffer_time >= 1? this.max_buffer_time.toFixed(0) : this.max_buffer_time.toFixed(1);
+                $("#txt_buffer").val(buffer_length.toFixed(1) + "/" + bts + "/" + mbts + "s");
+
+                $("#txt_bitrate").val(kbps.toFixed(0) + "kbps");
+                $("#txt_fps").val(fps.toFixed(1) + "fps");
+                $("#txt_empty_count").val(srs_player.empty_count() + "次");
+                $("#txt_fluency").val(srs_player.fluency().toFixed(2) + "%");
+
+                var time_str = "";
+                // day
+                time_str = padding(parseInt(time / 24 / 3600), 2, '0') + " ";
+                // hour
+                time = time % (24 * 3600);
+                time_str += padding(parseInt(time / 3600), 2, '0') + ":";
+                // minute
+                time = time % (3600);
+                time_str += padding(parseInt(time / 60), 2, '0') + ":";
+                // seconds
+                time = time % (60);
+                time_str += padding(parseInt(time), 2, '0');
+                // show
+                $("#txt_time").val(time_str);
+
+                var clock = new Date().getTime() / 1000;
+                $("#player_clock").val(absolute_seconds_to_YYYYmmdd(clock) + " " + absolute_seconds_to_HHMMSS(clock));
+            };
+            srs_player.start();
+        });
+
+        $("#main_modal").on("hide", function(){
+            if (srs_player) {
+                // report the log to backend.
+                //console.log(srs_player.dump_log());
+
+                srs_player.stop();
+                srs_player = null;
+            }
+        });
+
+        var apply_url_change = function() {
+            var rtmp = parse_rtmp_url($("#txt_url").val());
+            var schema = window.location.protocol;
+            var url = schema + "//" + query.host + query.pathname + "?"
+                + "app=" + rtmp.app + "&stream=" + rtmp.stream
+                + "&server=" + rtmp.server + "&port=" + rtmp.port
+                + "&autostart=true";
+            if (query.shp_identify) {
+                url += "&shp_identify=" + query.shp_identify;
+            }
+            if (rtmp.vhost === "__defaultVhost__") {
+                url += "&vhost=" + rtmp.server;
+            } else {
+                url += "&vhost=" + rtmp.vhost;
+            }
+            if (rtmp.schema !== "rtmp") {
+                url += "&schema=" + rtmp.schema;
+            }
+            if (query.buffer) {
+                url += "&buffer=" + query.buffer;
+            }
+            if (query.api_port) {
+                url += "&api_port=" + query.api_port;
+            }
+
+            var queries = user_extra_params(query);
+            queries = user_extra_params(rtmp, queries);
+            
+            if (queries && queries.length) {
+                url += '&' + queries.join('&');
+            }
+            $("#player_url").text($("#txt_url").val()).attr("href", url);
+
+            $("#link_server").text(rtmp.server);
+            $("#link_port").text(rtmp.port);
+            $("#link_vhost").text(rtmp.vhost);
+            $("#link_app").text(rtmp.app);
+            $("#link_stream").text(rtmp.stream);
+            $("#link_rtmp").text($("#txt_url").val());
+            $("#link_url").attr("href", url);
+        };
+
+        $("#txt_url").change(function(){
+            apply_url_change();
+        });
+
+        $("#btn_generate_link").click(function(){
+            $("#link_modal").modal({show:true, keyboard:true});
+        });
+
+        $("#btn_play").click(function(){
+            url = $("#txt_url").val();
+            $("#main_modal").modal({show:true, keyboard:true});
+        });
+
+        $("#btn_fullscreen").click(function(){
+            $("#fullscreen_tips").toggle();
+        });
+
+        $("#btn_pause").click(function() {
+            $("#btn_resume").toggle();
+            $("#btn_pause").toggle();
+            srs_player.pause();
+        });
+        $("#btn_resume").click(function(){
+            $("#btn_resume").toggle();
+            $("#btn_pause").toggle();
+            srs_player.resume();
+        });
+
+        if (true) {
+            $("#srs_publish").click(function () {
+                url = $("#srs_publish").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+            $("#srs_publish_ld").click(function () {
+                url = $("#srs_publish_ld").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+            $("#srs_publish_sd").click(function () {
+                url = $("#srs_publish_sd").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+            $("#srs_publish_fw").click(function () {
+                url = $("#srs_publish_fw").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+            $("#srs_publish_fw_ld").click(function () {
+                url = $("#srs_publish_fw_ld").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+            $("#srs_publish_fw_sd").click(function () {
+                url = $("#srs_publish_fw_sd").text();
+                $("#main_modal").modal({show: true, keyboard: false});
+            });
+        }
+
+        if (true) {
+            $("#btn_dar_original").click(function(){
+                select_dar("#btn_dar_original", 0, 0);
+            });
+            $("#btn_dar_21_9").click(function(){
+                select_dar("#btn_dar_21_9", 21, 9);
+            });
+            $("#btn_dar_16_9").click(function(){
+                select_dar("#btn_dar_16_9", 16, 9);
+            });
+            $("#btn_dar_4_3").click(function(){
+                select_dar("#btn_dar_4_3", 4, 3);
+            });
+            $("#btn_dar_fill").click(function(){
+                select_dar("#btn_dar_fill", -1, -1);
+            });
+        }
+
+        if (true) {
+            $("#btn_fs_size_video_100").click(function(){
+                select_fs_size("#btn_fs_size_video_100", "video", 100);
+            });
+            $("#btn_fs_size_video_75").click(function(){
+                select_fs_size("#btn_fs_size_video_75", "video", 75);
+            });
+            $("#btn_fs_size_video_50").click(function(){
+                select_fs_size("#btn_fs_size_video_50", "video", 50);
+            });
+            $("#btn_fs_size_screen_100").click(function(){
+                select_fs_size("#btn_fs_size_screen_100", "screen", 100);
+            });
+            $("#btn_fs_size_screen_75").click(function(){
+                select_fs_size("#btn_fs_size_screen_75", "screen", 75);
+            });
+            $("#btn_fs_size_screen_50").click(function(){
+                select_fs_size("#btn_fs_size_screen_50", "screen", 50);
+            });
+        }
+
+        if (true) {
+            for (var i = 0; i < bts.length; i++) {
+                var bt = bts[i];
+                var bt_id = "#btn_bt_" + bt.toFixed(1).replace(".", "_");
+
+                var bt_fun = function(id, v){
+                    $(bt_id).click(function(){
+                        select_buffer_time(id, v);
+
+                        // remember the chagned buffer.
+                        if (Number(query.buffer) != srs_player.buffer_time) {
+                            query.buffer = srs_player.buffer_time;
+                            apply_url_change();
+                        }
+
+                    });
+                };
+                bt_fun(bt_id, bt);
+            }
+        }
+        if (true) {
+            for (var i = 0; i < mbts.length; i++) {
+                var mbt = mbts[i];
+                var mbt_id = "#btn_mbt_" + mbt.toFixed(1).replace(".", "_");
+
+                var mbt_fun = function(id, v){
+                    $(mbt_id).click(function(){
+                        select_max_buffer_time(id, v);
+                    });
+                };
+                mbt_fun(mbt_id, mbt);
+            }
+        }
+
+        var query = parse_query_string();
+        if (query.autostart == "true") {
+            url = $("#txt_url").val();
+            $("#main_modal").modal({show:true, keyboard:false});
+        }
+
+        apply_url_change();
+    };
+</script>
+</html>

trunk/research/players/srs_publisher.html

@@ -14,7 +14,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/obs'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/obs'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -22,12 +22,8 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
-                    <li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
-                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
-                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
-                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
         </div>
@@ -39,8 +35,8 @@
         <button type="button" class="close" data-dismiss="alert">×</button>
         <strong><span id="txt_log_title">Warning:</span></strong>
         <span id="txt_log_msg">
-            Flash推流已经很少用，建议用<a href="https://obsproject.com/" target="_blank">OBS</a>或<a href="http://ffmpeg.org/" target="_blank">FFMPEG</a>推流，
+            Flash推流已经很少用，建议用<a href="rtc_publisher.html">RTC推流</a>，<a href="https://obsproject.com/" target="_blank">OBS</a>或<a href="http://ffmpeg.org/" target="_blank">FFMPEG</a>推流，
-            如果一定要使用Flash推流请点<a id="https_publisher" href="srs_publisher2.html">这里</a>。
+            如果一定要使用Flash推流请点<a id="https_publisher" href="srs_publisher_flash.html">这里</a>。
         </span>
     </div>
     <hr/>
@@ -55,12 +51,12 @@
     $(function(){
         var l = window.location;
         var url = window.location.href;
-        if (l.hostname !== 'localhost' && l.hostname !== '127.0.0.1' && l.protocol == 'http:') {
+        if (l.hostname !== 'localhost' && l.hostname !== '127.0.0.1' && l.protocol === 'http:') {
             // For flash publisher, must use HTTPS.
             url = window.location.href.replace('http:', 'https:');
         }
 
-        url = url.substr(0, url.lastIndexOf('/')) + '/srs_publisher2.html';
+        url = url.substr(0, url.lastIndexOf('/')) + '/srs_publisher_flash.html';
         $('#https_publisher').attr('href', url);
     });
 </script>

trunk/research/players/srs_publisher_flash.html

@@ -11,7 +11,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/srspublisher'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/srspublisher'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -19,12 +19,6 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
-                    <li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
-                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
-                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
-                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
         </div>
@@ -316,9 +310,8 @@
     var query = parse_query_string();
     var autoLoadPage = function() {
         // get the vhost and port to set the default url.
-        // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
+        // url set to: http://localhost:8080/live/livestream.flv
-        // url set to: rtmp://demo:1935/live/livestream
+        srs_init_flv("#txt_url", null);
-        srs_init_rtmp("#txt_url", null);
 
         if (query.agent == "true") {
             document.write(navigator.userAgent);

trunk/research/players/vlc.html

@@ -11,7 +11,7 @@
     </style>
 </head>
 <body>
-<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/vlc'/>
+<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/vlc'/>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
@@ -19,12 +19,13 @@
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li>
+                    <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li>
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
-                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
+                    <li><a id="nav_gb28181" href="srs_gb28181.html">SRS-GB28181</a></li>
                 </ul>
             </div>
         </div>

trunk/scripts/git.commit.sh

@@ -1,85 +1,4 @@
 #!/bin/bash
 
-cat <<END >>/dev/null
+for file in $(git remote); do echo ""; git push $file; done
-touch git-ensure-commit &&
-echo "cd `pwd` &&" >git-ensure-commit &&
-echo "bash `pwd`/git.commit.sh" >>git-ensure-commit &&
-chmod +x git-ensure-commit &&
-sudo rm -f /bin/git-ensure-commit &&
-sudo mv git-ensure-commit /usr/local/bin/git-ensure-commit
-END
 
-echo "submit code to github.com"
-
-echo "argv[0]=$0"
-if [[ ! -f $0 ]]; then 
-    echo "directly execute the scripts on shell.";
-    work_dir=`pwd`
-else 
-    echo "execute scripts in file: $0";
-    work_dir=`dirname $0`; work_dir=`(cd ${work_dir} && pwd)`
-fi
-work_dir=`(cd ${work_dir}/.. && pwd)`
-product_dir=$work_dir
-
-# allow start script from any dir
-cd $work_dir && work_branch=`git branch|grep "*"|awk '{print $2}'` && commit_branch=2.0release && git checkout $commit_branch
-ret=$ret; if [[ $ret -ne 0 ]]; then echo "switch branch failed. ret=$ret"; exit $ret; fi
-echo "work branch is $work_branch"
-echo "commit branch is $commit_branch"
-
-. ${product_dir}/scripts/_log.sh
-ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
-ok_msg "导入脚本成功"
-
-function remote_check()
-{
-    remote=$1
-    url=$2
-    git remote -v| grep "$url" >/dev/null 2>&1
-    ret=$?; if [[ 0 -ne $ret ]]; then
-        echo "remote $remote not found, add by:"
-        echo "    git remote add $remote $url"
-        exit -1
-    fi
-    ok_msg "remote $remote ok, url is $url"
-}
-remote_check origin git@github.com:ossrs/srs.git
-remote_check srs.winlin git@github.com:winlinvip/simple-rtmp-server.git
-remote_check srs.csdn git@code.csdn.net:winlinvip/srs-csdn.git
-remote_check srs.oschina git@git.oschina.net:winlinvip/srs.oschina.git
-remote_check srs.gitlab git@gitlab.com:winlinvip/srs-gitlab.git
-ok_msg "remote check ok"
-
-function sync_push()
-{
-    for ((;;)); do 
-        git push $*
-        ret=$?; if [[ 0 -ne $ret ]]; then 
-            failed_msg "Retry for failed: git push $*"
-            sleep 3
-            continue
-        else
-            ok_msg "Success: git push $*"
-        fi
-        break
-    done
-}
-
-sync_push origin
-sync_push srs.winlin
-sync_push srs.csdn
-sync_push srs.oschina
-sync_push srs.gitlab
-ok_msg "push branches ok"
-
-sync_push --tags srs.winlin
-sync_push --tags srs.csdn
-sync_push --tags srs.oschina
-sync_push --tags srs.gitlab
-ok_msg "push tags ok"
-
-git checkout $work_branch
-ok_msg "switch to work branch $work_branch"
-
-exit 0

trunk/src/app/srs_app_config.cpp

@@ -4056,6 +4056,18 @@ bool SrsConfig::get_asprocess()
     return SRS_CONF_PERFER_FALSE(conf->arg0());
 }
 
+bool SrsConfig::whether_query_latest_version()
+{
+    static bool DEFAULT = true;
+
+    SrsConfDirective* conf = root->get("query_latest_version");
+    if (!conf) {
+        return DEFAULT;
+    }
+
+    return SRS_CONF_PERFER_TRUE(conf->arg0());
+}
+
 bool SrsConfig::empty_ip_ok()
 {
     static bool DEFAULT = true;

trunk/src/app/srs_app_config.hpp

@@ -468,6 +468,8 @@ public:
     virtual std::string get_work_dir();
     // Whether use asprocess mode.
     virtual bool get_asprocess();
+    // Whether query the latest available version of SRS.
+    virtual bool whether_query_latest_version();
     // Whether empty client IP is ok.
     virtual bool empty_ip_ok();
     // Get the start wait in ms for gracefully quit.

trunk/src/app/srs_app_http_stream.cpp

@@ -75,7 +75,7 @@ SrsBufferCache::~SrsBufferCache()
     srs_freep(req);
 }
 
-srs_error_t SrsBufferCache::update(SrsSource* s, SrsRequest* r)
+srs_error_t SrsBufferCache::update_auth(SrsSource* s, SrsRequest* r)
 {
     srs_freep(req);
     req = r->copy();
@@ -523,7 +523,7 @@ SrsLiveStream::~SrsLiveStream()
     srs_freep(req);
 }
 
-srs_error_t SrsLiveStream::update(SrsSource* s, SrsRequest* r)
+srs_error_t SrsLiveStream::update_auth(SrsSource* s, SrsRequest* r)
 {
     source = s;
     
@@ -938,9 +938,10 @@ srs_error_t SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r)
         }
         srs_trace("http: mount flv stream for sid=%s, mount=%s", sid.c_str(), mount.c_str());
     } else {
+        // The entry exists, we reuse it and update the request of stream and cache.
         entry = sflvs[sid];
-        entry->stream->update(s, r);
+        entry->stream->update_auth(s, r);
-        entry->cache->update(s, r);
+        entry->cache->update_auth(s, r);
     }
     
     if (entry->stream) {

trunk/src/app/srs_app_http_stream.hpp

@@ -46,7 +46,7 @@ private:
 public:
     SrsBufferCache(SrsSource* s, SrsRequest* r);
     virtual ~SrsBufferCache();
-    virtual srs_error_t update(SrsSource* s, SrsRequest* r);
+    virtual srs_error_t update_auth(SrsSource* s, SrsRequest* r);
 public:
     virtual srs_error_t start();
     virtual srs_error_t dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter);
@@ -188,7 +188,7 @@ private:
 public:
     SrsLiveStream(SrsSource* s, SrsRequest* r, SrsBufferCache* c);
     virtual ~SrsLiveStream();
-    virtual srs_error_t update(SrsSource* s, SrsRequest* r);
+    virtual srs_error_t update_auth(SrsSource* s, SrsRequest* r);
 public:
     virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
 private:

trunk/src/app/srs_app_ingest.cpp

@@ -484,7 +484,7 @@ void SrsIngester::show_ingest_log_message()
     }
     
     // random choose one ingester to report.
-    int index = rand() % (int)ingesters.size();
+    int index = srs_random() % (int)ingesters.size();
     SrsIngesterFFMPEG* ingester = ingesters.at(index);
     
     // reportable

trunk/src/app/srs_app_latest_version.cpp

@@ -0,0 +1,187 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 SRS(ossrs)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <srs_app_latest_version.hpp>
+
+#include <srs_core_autofree.hpp>
+#include <srs_kernel_error.hpp>
+#include <srs_kernel_log.hpp>
+#include <srs_kernel_utility.hpp>
+#include <srs_protocol_json.hpp>
+#include <srs_protocol_utility.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_http_conn.hpp>
+#include <srs_app_http_client.hpp>
+#include <srs_app_utility.hpp>
+#include <srs_app_uuid.hpp>
+
+#include <unistd.h>
+#include <sstream>
+using namespace std;
+
+// Whether we are in docker, defined in main module.
+extern bool _srs_in_docker;
+
+void srs_build_features(stringstream& ss)
+{
+    ss << "&os=linux";
+
+    ss << "&docker=" << _srs_in_docker
+        << "&packager=" << SRS_AUTO_PACKAGER;
+}
+
+SrsLatestVersion::SrsLatestVersion()
+{
+    trd_ = new SrsSTCoroutine("signal", this);
+}
+
+SrsLatestVersion::~SrsLatestVersion()
+{
+    srs_freep(trd_);
+}
+
+srs_error_t SrsLatestVersion::start()
+{
+    if (!_srs_config->whether_query_latest_version()) {
+        return srs_success;
+    }
+
+    if (true) {
+        uuid_t uuid;
+        uuid_generate_time(uuid);
+
+        char buf[32];
+        for (int i = 0; i < 16; i++) {
+            snprintf(buf + i * 2, sizeof(buf), "%02x", uuid[i]);
+        }
+        server_id_ = string(buf, sizeof(buf));
+    }
+
+    return trd_->start();
+}
+
+srs_error_t SrsLatestVersion::cycle()
+{
+    srs_error_t err = srs_success;
+
+    srs_utime_t first_random_wait = 0;
+    srs_random_generate((char*)&first_random_wait, 8);
+    first_random_wait = srs_utime_t(uint64_t((first_random_wait + srs_update_system_time() + getpid())) % (5 * 60)) * SRS_UTIME_SECONDS; // in s.
+
+    // Only report after 5+ minutes.
+    first_random_wait += 5 * 60 * SRS_UTIME_SECONDS;
+
+    srs_trace("Startup query id=%s, eip=%s, wait=%ds", server_id_.c_str(), srs_get_public_internet_address().c_str(), srsu2msi(first_random_wait)/1000);
+    srs_usleep(first_random_wait);
+
+    while (true) {
+        srs_utime_t starttime = srs_update_system_time();
+        if ((err = query_latest_version()) != srs_success) {
+            srs_warn("query err %s", srs_error_desc(err).c_str());
+            srs_freep(err); // Ignore any error.
+        }
+
+        srs_trace("Finish query id=%s, eip=%s, match=%s, stable=%s, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(srs_update_system_time() - starttime));
+        srs_usleep(3600 * SRS_UTIME_SECONDS); // Every an hour.
+    }
+
+    return err;
+}
+
+srs_error_t SrsLatestVersion::query_latest_version()
+{
+    srs_error_t err = srs_success;
+
+    // Generate uri and parse to object.
+    stringstream ss;
+    ss << "http://api.ossrs.net/service/v1/releases?"
+          << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
+          << "&id=" << server_id_ << "&role=srs"
+          << "&eip=" << srs_get_public_internet_address()
+          << "&ts=" << srs_get_system_time()
+          << "&alive=" << srsu2ms(srs_get_system_time() - srs_get_system_startup_time()) / 1000;
+    srs_build_features(ss);
+
+    string url = ss.str();
+
+    SrsHttpUri uri;
+    if ((err = uri.initialize(url)) != srs_success) {
+        return srs_error_wrap(err, "http: post failed. url=%s", url.c_str());
+    }
+
+    // Start HTTP request and read response.
+    SrsHttpClient http;
+    if ((err = http.initialize(uri.get_host(), uri.get_port())) != srs_success) {
+        return err;
+    }
+
+    // Path with query.
+    string path = uri.get_path();
+    path += "?";
+    path += uri.get_query();
+
+    ISrsHttpMessage* msg = NULL;
+    if ((err = http.get(path, "", &msg)) != srs_success) {
+        return err;
+    }
+    SrsAutoFree(ISrsHttpMessage, msg);
+
+    string res;
+    int code = msg->status_code();
+    if ((err = msg->body_read_all(res)) != srs_success) {
+        return err;
+    }
+
+    // Check the response code and content.
+    if (code != SRS_CONSTS_HTTP_OK) {
+        return srs_error_new(ERROR_HTTP_STATUS_INVALID, "invalid response status=%d", code);
+    }
+
+    if (res.empty()) {
+        return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid empty response");
+    }
+
+    // Response in json object.
+    SrsJsonAny* jres = SrsJsonAny::loads((char*)res.c_str());
+    if (!jres || !jres->is_object()) {
+        return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid response %s", res.c_str());
+    }
+    SrsAutoFree(SrsJsonAny, jres);
+
+    SrsJsonObject* obj = jres->to_object();
+    SrsJsonAny* prop = NULL;
+
+    // Parse fields of response.
+    if ((prop = obj->ensure_property_string("match_version")) == NULL) {
+        return srs_error_new(ERROR_RESPONSE_CODE, "no match_version");
+    }
+    match_version_ = prop->to_str();
+
+    if ((prop = obj->ensure_property_string("stable_version")) == NULL) {
+        return srs_error_new(ERROR_RESPONSE_CODE, "no stable_version");
+    }
+    stable_version_ = prop->to_str();
+
+    return err;
+}
+

trunk/src/app/srs_app_latest_version.hpp

@@ -0,0 +1,58 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 SRS(ossrs)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_APP_LATEST_VERSION_HPP
+#define SRS_APP_LATEST_VERSION_HPP
+
+/*
+#include <srs_app_latest_version.hpp>
+*/
+
+#include <srs_core.hpp>
+
+#include <srs_app_thread.hpp>
+
+#include <string>
+
+class SrsLatestVersion : public ISrsCoroutineHandler
+{
+private:
+    SrsCoroutine* trd_;
+    std::string server_id_;
+private:
+    std::string match_version_;
+    std::string stable_version_;
+public:
+    SrsLatestVersion();
+    virtual ~SrsLatestVersion();
+public:
+    virtual srs_error_t start();
+// interface ISrsEndlessThreadHandler.
+public:
+    virtual srs_error_t cycle();
+private:
+    srs_error_t query_latest_version();
+};
+
+#endif
+

trunk/src/app/srs_app_server.cpp

@@ -54,6 +54,7 @@ using namespace std;
 #include <srs_kernel_consts.hpp>
 #include <srs_app_thread.hpp>
 #include <srs_app_coworkers.hpp>
+#include <srs_app_latest_version.hpp>
 
 // system interval in srs_utime_t,
 // all resolution times should be times togother,
@@ -623,6 +624,7 @@ SrsServer::SrsServer()
     pid_fd = -1;
     
     signal_manager = new SrsSignalManager(this);
+    latest_version_ = new SrsLatestVersion();
     conn_manager = new SrsCoroutineManager();
     
     handler = NULL;
@@ -659,6 +661,7 @@ void SrsServer::destroy()
     }
     
     srs_freep(signal_manager);
+    srs_freep(latest_version_);
     srs_freep(conn_manager);
 }
 
@@ -787,7 +790,18 @@ srs_error_t SrsServer::initialize_st()
 
 srs_error_t SrsServer::initialize_signal()
 {
-    return signal_manager->initialize();
+    srs_error_t err = srs_success;
+
+    if ((err = signal_manager->initialize()) != srs_success) {
+        return srs_error_wrap(err, "init signal manager");
+    }
+
+    // Start the version query coroutine.
+    if ((err = latest_version_->start()) != srs_success) {
+        return srs_error_wrap(err, "start version query");
+    }
+
+    return err;
 }
 
 srs_error_t SrsServer::acquire_pid_file()

trunk/src/app/srs_app_server.hpp

@@ -51,6 +51,7 @@ class SrsUdpListener;
 class SrsTcpListener;
 class SrsAppCasterFlv;
 class SrsCoroutineManager;
+class SrsLatestVersion;
 
 // The listener type for server to identify the connection,
 // that is, use different type to process the connection.
@@ -239,6 +240,8 @@ private:
     std::vector<SrsListener*> listeners;
     // Signal manager which convert gignal to io message.
     SrsSignalManager* signal_manager;
+    // To query the latest available version of SRS.
+    SrsLatestVersion* latest_version_;
     // Handle in server cycle.
     ISrsServerCycle* handler;
     // User send the signal, convert to variable.

trunk/src/app/srs_app_statistic.cpp

@@ -215,6 +215,7 @@ SrsStatisticClient::SrsStatisticClient()
 
 SrsStatisticClient::~SrsStatisticClient()
 {
+	srs_freep(req);
 }
 
 srs_error_t SrsStatisticClient::dumps(SrsJsonObject* obj)
@@ -425,11 +426,15 @@ srs_error_t SrsStatistic::on_client(std::string id, SrsRequest* req, SrsConnecti
     
     // got client.
     client->conn = conn;
-    client->req = req;
     client->type = type;
     stream->nb_clients++;
     vhost->nb_clients++;
 
+    // The req might be freed, in such as SrsLiveStream::update, so we must copy it.
+    // @see https://github.com/ossrs/srs/issues/2311
+    srs_freep(client->req);
+    client->req = req->copy();
+    
     return err;
 }
 

trunk/src/app/srs_app_uuid.hpp

@@ -0,0 +1,112 @@
+//
+// libuuid BSD License @see https://sourceforge.net/projects/libuuid/
+//
+// SPDX-License-Identifier: BSD-3-Clause
+//
+#include <srs_core.hpp>
+
+/*
+ * Public include file for the UUID library
+ *
+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UUID_UUID_H
+#define _UUID_UUID_H
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+typedef unsigned char uuid_t[16];
+
+/* UUID Variant definitions */
+#define UUID_VARIANT_NCS	0
+#define UUID_VARIANT_DCE	1
+#define UUID_VARIANT_MICROSOFT	2
+#define UUID_VARIANT_OTHER	3
+
+/* UUID Type definitions */
+#define UUID_TYPE_DCE_TIME   1
+#define UUID_TYPE_DCE_RANDOM 4
+
+/* Allow UUID constants to be defined */
+#ifdef __GNUC__
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#else
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* clear.c */
+void uuid_clear(uuid_t uu);
+
+/* compare.c */
+int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+
+/* copy.c */
+void uuid_copy(uuid_t dst, const uuid_t src);
+
+/* gen_uuid.c */
+void uuid_generate(uuid_t out);
+void uuid_generate_random(uuid_t out);
+void uuid_generate_time(uuid_t out);
+int uuid_generate_time_safe(uuid_t out);
+
+/* isnull.c */
+int uuid_is_null(const uuid_t uu);
+
+/* parse.c */
+int uuid_parse(const char *in, uuid_t uu);
+
+/* unparse.c */
+void uuid_unparse(const uuid_t uu, char *out);
+void uuid_unparse_lower(const uuid_t uu, char *out);
+void uuid_unparse_upper(const uuid_t uu, char *out);
+
+/* uuid_time.c */
+time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+int uuid_type(const uuid_t uu);
+int uuid_variant(const uuid_t uu);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UUID_UUID_H */
+

trunk/src/core/srs_core_version3.hpp

@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 160
+#define SRS_VERSION3_REVISION 170
 
 #endif

trunk/src/protocol/srs_protocol_utility.cpp

@@ -150,18 +150,23 @@ void srs_parse_query_string(string q, map<string,string>& query)
 
 void srs_random_generate(char* bytes, int size)
 {
-    static bool _random_initialized = false;
-    if (!_random_initialized) {
-        srand(0);
-        _random_initialized = true;
-    }
-    
     for (int i = 0; i < size; i++) {
         // the common value in [0x0f, 0xf0]
-        bytes[i] = 0x0f + (rand() % (256 - 0x0f - 0x0f));
+        bytes[i] = 0x0f + (srs_random() % (256 - 0x0f - 0x0f));
     }
 }
 
+long srs_random()
+{
+    static bool _random_initialized = false;
+    if (!_random_initialized) {
+        _random_initialized = true;
+        srandom((unsigned int)srs_get_system_startup_time());
+    }
+
+    return random();
+}
+
 string srs_generate_tc_url(string host, string vhost, string app, int port)
 {
     string tcUrl = "rtmp://";

trunk/src/protocol/srs_protocol_utility.hpp

@@ -69,6 +69,8 @@ extern void srs_parse_query_string(std::string q, std::map<std::string, std::str
  * generate ramdom data for handshake.
  */
 extern void srs_random_generate(char* bytes, int size);
+// Generate random value, use srandom(now_us) to init seed if not initialized.
+extern long srs_random();
 
 /**
  * generate the tcUrl without param.

trunk/src/protocol/srs_rtmp_handshake.cpp

@@ -357,7 +357,7 @@ namespace srs_internal
     
     key_block::key_block()
     {
-        offset = (int32_t)rand();
+        offset = (int32_t)srs_random();
         random0 = NULL;
         random1 = NULL;
         
@@ -439,7 +439,7 @@ namespace srs_internal
     
     digest_block::digest_block()
     {
-        offset = (int32_t)rand();
+        offset = (int32_t)srs_random();
         random0 = NULL;
         random1 = NULL;
         

trunk/src/service/srs_service_rtmp_conn.cpp

@@ -57,6 +57,7 @@ SrsBasicRtmpClient::~SrsBasicRtmpClient()
     close();
     srs_freep(kbps);
     srs_freep(clk);
+    srs_freep(req);
 }
 
 srs_error_t SrsBasicRtmpClient::connect()