From becbe45bcdc0f4fe19ce2ef25abdefaced0fc6d2 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 5 May 2021 13:26:25 +0800 Subject: [PATCH] SquashSRS4: Add demo for RTC --- README.md | 2 + trunk/3rdparty/copy_to_gits.sh | 22 ++ trunk/3rdparty/httpx-static/README.md | 21 +- trunk/3rdparty/signaling/Dockerfile | 24 ++ trunk/3rdparty/signaling/README.md | 48 +++- trunk/3rdparty/signaling/auto/release.sh | 70 ++++++ trunk/3rdparty/signaling/main.go | 43 +++- trunk/3rdparty/signaling/www/demos/index.html | 16 +- .../signaling/www/demos/js/srs.sdk.js | 6 +- .../signaling/www/demos/js/srs.sig.js | 36 ++- .../3rdparty/signaling/www/demos/one2one.html | 166 ++++++++++++-- trunk/3rdparty/signaling/www/demos/room.html | 212 ++++++++++++++++++ trunk/3rdparty/srs-bench/auto/sync_vnet.sh | 2 +- .../srs-bench/vnet/udpproxy_direct.go | 3 +- .../srs-bench/vnet/udpproxy_direct_test.go | 171 +++++++++++++- trunk/configure | 5 +- trunk/research/console/en_index.html | 2 +- trunk/research/console/ng_index.html | 2 +- trunk/research/players/index.html | 2 +- trunk/research/players/js/srs.sdk.js | 22 +- trunk/research/players/rtc_player.html | 2 +- trunk/research/players/rtc_publisher.html | 2 +- trunk/research/players/srs_bwt.html | 2 +- trunk/research/players/srs_chat.html | 2 +- trunk/research/players/srs_gb28181.html | 2 +- trunk/research/players/srs_player.html | 16 +- .../players/srs_player_deprecated.html | 2 +- trunk/research/players/srs_publisher.html | 2 +- .../research/players/srs_publisher_flash.html | 4 +- trunk/research/players/vlc.html | 2 +- trunk/scripts/git.commit.sh | 2 +- trunk/scripts/package.sh | 2 - trunk/src/app/srs_app_rtc_conn.cpp | 4 + trunk/src/core/srs_core_version4.hpp | 2 +- 34 files changed, 836 insertions(+), 85 deletions(-) create mode 100755 trunk/3rdparty/copy_to_gits.sh create mode 100644 trunk/3rdparty/signaling/Dockerfile create mode 100755 trunk/3rdparty/signaling/auto/release.sh create mode 100644 trunk/3rdparty/signaling/www/demos/room.html diff --git a/README.md b/README.md index 4bc506ea4..36647a90c 100755 --- a/README.md +++ b/README.md @@ -182,6 +182,8 @@ The ports used by SRS: ## V4 changes +* v4.0, 2021-05-04, Add video room demo. 4.0.98 +* v4.0, 2021-05-03, Add RTC stream merging demo by FFmpeg. 4.0.97 * v4.0, 2021-05-02, Add one to one demo. 4.0.96 * v4.0, 2021-04-20, Support RTC2RTMP bridger and shared FastTimer. 4.0.95 * v4.0, 2021-04-20, Refine transcoder to support aac2opus and opus2aac. 4.0.94 diff --git a/trunk/3rdparty/copy_to_gits.sh b/trunk/3rdparty/copy_to_gits.sh new file mode 100755 index 000000000..d92d3a2ba --- /dev/null +++ b/trunk/3rdparty/copy_to_gits.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [[ ! -d signaling ]]; then + cd 3rdparty +fi +if [[ ! -d signaling ]]; then + echo "no 3rdparty" + exit -1 +fi +if [[ ! -d ~/git/signaling ]]; then + echo "no signaling" + exit -1 +fi + +echo "Copy signaling" +cp -R signaling/* ~/git/signaling/ && (cd ~/git/signaling && git st) + +echo "Copy httpx-static" +cp -R httpx-static/* ~/git/go-oryx/httpx-static/ && (cd ~/git/go-oryx && git st) + +echo "Copy srs-bench" +cp -R srs-bench/* ~/git/srs-bench/ && (cd ~/git/srs-bench && git st) diff --git a/trunk/3rdparty/httpx-static/README.md b/trunk/3rdparty/httpx-static/README.md index 3b6259475..d82b7b7a6 100644 --- a/trunk/3rdparty/httpx-static/README.md +++ b/trunk/3rdparty/httpx-static/README.md @@ -29,7 +29,7 @@ $GOPATH/bin/httpx-static -https 8443 -root `pwd`/html Open https://localhost:8443/ in browser. -> Remark: Click `ADVANCED` => `Proceed to localhost (unsafe)`. +> Remark: Click `ADVANCED` => `Proceed to localhost (unsafe)`, or type `thisisunsafe` in page. *HTTPS proxy*: Proxy http as https @@ -44,6 +44,25 @@ $GOPATH/bin/httpx-static -https 8443 -root `pwd`/html -proxy http://ossrs.net:19 Open https://localhost:8443/api/v1/summaries in browser. +## Docker + +Run httpx-static in docker: + +```bash +docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.2 +``` + +> Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/httpx/images). + +To proxy to other dockers, in macOS: + +```bash +CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') && +docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.5 \ + ./bin/httpx-static -http 80 -https 443 -ssk ./etc/server.key -ssc ./etc/server.crt \ + -proxy http://$CANDIDATE:8080/ +``` + ## History * v0.0.3, 2017-11-03, Support multiple proxy HTTP to HTTPS. diff --git a/trunk/3rdparty/signaling/Dockerfile b/trunk/3rdparty/signaling/Dockerfile new file mode 100644 index 000000000..393e57004 --- /dev/null +++ b/trunk/3rdparty/signaling/Dockerfile @@ -0,0 +1,24 @@ + +############################################################ +# build +############################################################ +FROM registry.cn-hangzhou.aliyuncs.com/ossrs/srs:dev AS build + +COPY . /tmp/signaling +RUN cd /tmp/signaling && make +RUN cp /tmp/signaling/objs/signaling /usr/local/bin/signaling +RUN cp -R /tmp/signaling/www /usr/local/ + +############################################################ +# dist +############################################################ +FROM centos:7 AS dist + +# HTTP/1989 +EXPOSE 1989 +# SRS binary, config files and srs-console. +COPY --from=build /usr/local/bin/signaling /usr/local/bin/ +COPY --from=build /usr/local/www /usr/local/www +# Default workdir and command. +WORKDIR /usr/local +CMD ["./bin/signaling"] diff --git a/trunk/3rdparty/signaling/README.md b/trunk/3rdparty/signaling/README.md index d786896a9..f20c724f9 100644 --- a/trunk/3rdparty/signaling/README.md +++ b/trunk/3rdparty/signaling/README.md @@ -4,21 +4,59 @@ WebRTC signaling for https://github.com/ossrs/srs ## Usage -Build and [run SRS](https://github.com/ossrs/srs/tree/4.0release#usage): +[Run SRS](https://github.com/ossrs/srs/tree/4.0release#usage) in docker: ```bash -git clone -b 4.0release https://gitee.com/ossrs/srs.git srs && -cd srs/trunk && ./configure && make && ./objs/srs -c conf/rtc.conf +docker run --rm --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') \ + -p 1935:1935 -p 8080:8080 -p 1985:1985 -p 8000:8000/udp \ + registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v4.0.95 \ + objs/srs -c conf/rtc.conf ``` -Build and run signaling: +> Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/srs/images). + +Run signaling in docker: ```bash -cd srs/trunk/3rdparty/signaling && make && ./objs/signaling +docker run --rm -p 1989:1989 registry.cn-hangzhou.aliyuncs.com/ossrs/signaling:v1.0.4 ``` +> Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/signaling/images). + Open the H5 demos: * [WebRTC: One to One over SFU(SRS)](http://localhost:1989/demos/one2one.html?autostart=true) +## Build from source + +Build and [run SRS](https://github.com/ossrs/srs/tree/4.0release#usage): + +```bash +cd ~/git && git clone -b 4.0release https://gitee.com/ossrs/srs.git srs && +cd ~/git/srs/trunk && ./configure && make && ./objs/srs -c conf/rtc.conf +``` + +Build and run signaling: + +```bash +cd ~/git/srs/trunk/3rdparty/signaling && make && ./objs/signaling +``` + +Open demos by localhost: http://localhost:1989/demos + +Build and run httpx-static for HTTPS/WSS: + +```bash +cd ~/git/srs/trunk/3rdparty/httpx-static && make && +./objs/httpx-static -http 80 -https 443 -ssk server.key -ssc server.crt \ + -proxy http://127.0.0.1:1989/sig -proxy http://127.0.0.1:1985/rtc \ + -proxy http://127.0.0.1:8080/ +``` + +Open demos by HTTPS or IP: + +* http://localhost/demos/ +* https://localhost/demos/ +* https://192.168.3.6/demos/ + Winlin 2021.05 diff --git a/trunk/3rdparty/signaling/auto/release.sh b/trunk/3rdparty/signaling/auto/release.sh new file mode 100755 index 000000000..c63c9e7b7 --- /dev/null +++ b/trunk/3rdparty/signaling/auto/release.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +SRS_GIT=$HOME/git/signaling +SRS_TAG= + +# linux shell color support. +RED="\\033[31m" +GREEN="\\033[32m" +YELLOW="\\033[33m" +BLACK="\\033[0m" + +function NICE() { + echo -e "${GREEN}$@${BLACK}" +} + +function TRACE() { + echo -e "${BLACK}$@${BLACK}" +} + +function WARN() { + echo -e "${YELLOW}$@${BLACK}" +} + +function ERROR() { + echo -e "${RED}$@${BLACK}" +} + +################################################################################## +################################################################################## +################################################################################## +if [[ -z $SRS_TAG ]]; then + SRS_TAG=`(cd $SRS_GIT && git describe --tags --abbrev=0 --exclude release-* 2>/dev/null)` + if [[ $? -ne 0 ]]; then + echo "Invalid tag $SRS_TAG of $SRS_FILTER in $SRS_GIT" + exit -1 + fi +fi + +NICE "Build docker for $SRS_GIT, tag is $SRS_TAG" + +git ci -am "Release $SRS_TAG" + +# For aliyun hub. +NICE "aliyun hub release-v$SRS_TAG" + +echo "git push aliyun" +git push aliyun + +git tag -d release-v$SRS_TAG 2>/dev/null +echo "Cleanup tag $SRS_TAG for aliyun" + +git tag release-v$SRS_TAG; git push -f aliyun release-v$SRS_TAG +echo "Create new tag $SRS_TAG for aliyun" +echo "" + +NICE "aliyun hub release-vlatest" +git tag -d release-vlatest 2>/dev/null +echo "Cleanup tag latest for aliyun" + +git tag release-vlatest; git push -f aliyun release-vlatest +echo "Create new tag latest for aliyun" + +# For github.com +echo "git push origin" +git push origin + +echo "git push origin $SRS_TAG" +git push origin $SRS_TAG + +NICE "Update github ok" diff --git a/trunk/3rdparty/signaling/main.go b/trunk/3rdparty/signaling/main.go index 3338c08c8..e91ec43fc 100644 --- a/trunk/3rdparty/signaling/main.go +++ b/trunk/3rdparty/signaling/main.go @@ -96,7 +96,7 @@ func (v *Room) Remove(p *Participant) { } } -func (v *Room) Notify(ctx context.Context, peer *Participant, event string) { +func (v *Room) Notify(ctx context.Context, peer *Participant, event, param, data string) { var participants []*Participant func() { v.lock.RLock() @@ -112,12 +112,15 @@ func (v *Room) Notify(ctx context.Context, peer *Participant, event string) { res := struct { Action string `json:"action"` Event string `json:"event"` + Param string `json:"param,omitempty"` + Data string `json:"data,omitempty"` Room string `json:"room"` Self *Participant `json:"self"` Peer *Participant `json:"peer"` Participants []*Participant `json:"participants"` }{ - "notify", event, v.Name, r, peer, participants, + "notify", event, param, data, + v.Name, r, peer, participants, } b, err := json.Marshal(struct { @@ -187,10 +190,16 @@ func main() { var self *Participant go func() { <-ctx.Done() - if self != nil { - self.Room.Remove(self) - logger.Tf(ctx, "Remove client %v", self) + if self == nil { + return } + + // Notify other peers that we're quiting. + // @remark The ctx(of self) is done, so we must use a new context. + go self.Room.Notify(context.Background(), self, "leave", "", "") + + self.Room.Remove(self) + logger.Tf(ctx, "Remove client %v", self) }() inMessages := make(chan []byte, 0) @@ -228,7 +237,6 @@ func main() { } var res interface{} - var p *Participant if action.Message.Action == "join" { obj := struct { Message struct { @@ -241,7 +249,7 @@ func main() { } r, _ := rooms.LoadOrStore(obj.Message.Room, &Room{Name: obj.Message.Room}) - p = &Participant{Room: r.(*Room), Display: obj.Message.Display, Out: outMessages} + p := &Participant{Room: r.(*Room), Display: obj.Message.Display, Out: outMessages} if err := r.(*Room).Add(p); err != nil { return errors.Wrapf(err, "join") } @@ -258,7 +266,7 @@ func main() { action.Message.Action, obj.Message.Room, p, r.(*Room).Participants, } - go r.(*Room).Notify(ctx, p, action.Message.Action) + go r.(*Room).Notify(ctx, p, action.Message.Action, "", "") } else if action.Message.Action == "publish" { obj := struct { Message struct { @@ -276,7 +284,24 @@ func main() { // Now, the peer is publishing. p.Publishing = true - go r.(*Room).Notify(ctx, p, action.Message.Action) + go r.(*Room).Notify(ctx, p, action.Message.Action, "", "") + } else if action.Message.Action == "control" { + obj := struct { + Message struct { + Room string `json:"room"` + Display string `json:"display"` + Call string `json:"call"` + Data string `json:"data"` + } `json:"msg"` + }{} + if err := json.Unmarshal(m, &obj); err != nil { + return errors.Wrapf(err, "Unmarshal %s", m) + } + + r, _ := rooms.LoadOrStore(obj.Message.Room, &Room{Name: obj.Message.Room}) + p := r.(*Room).Get(obj.Message.Display) + + go r.(*Room).Notify(ctx, p, action.Message.Action, obj.Message.Call, obj.Message.Data) } else { return errors.Errorf("Invalid message %s", m) } diff --git a/trunk/3rdparty/signaling/www/demos/index.html b/trunk/3rdparty/signaling/www/demos/index.html index ed3b6e03a..7774d6844 100644 --- a/trunk/3rdparty/signaling/www/demos/index.html +++ b/trunk/3rdparty/signaling/www/demos/index.html @@ -7,7 +7,19 @@

Signaling works!

- Run demo for WebRTC: One to One over SFU(SRS)
- 点击进入SRS一对一通话演示 + Run demo for WebRTC: One to One over SFU(SRS)
+ 点击进入SRS一对一通话演示

+

+ Run demo for WebRTC: Video Room over SFU(SRS)
+ 点击进入SRS多人通话演示 +

+ diff --git a/trunk/3rdparty/signaling/www/demos/js/srs.sdk.js b/trunk/3rdparty/signaling/www/demos/js/srs.sdk.js index f872f7daa..4a80f23f0 100644 --- a/trunk/3rdparty/signaling/www/demos/js/srs.sdk.js +++ b/trunk/3rdparty/signaling/www/demos/js/srs.sdk.js @@ -57,7 +57,7 @@ function SrsRtcPublisherAsync() { self.pc.addTransceiver("video", {direction: "sendonly"}); var stream = await navigator.mediaDevices.getUserMedia( - {audio: true, video: {height: {max: 320}}} + {audio: true, video: {width: {max: 320}}} ); // @see https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addStream#Migrating_to_addTrack stream.getTracks().forEach(function (track) { @@ -144,7 +144,7 @@ function SrsRtcPublisherAsync() { return { apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, - tid: new Date().getTime().toString(16) + tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16) }; }, parse: function (url) { @@ -361,7 +361,7 @@ function SrsRtcPlayerAsync() { return { apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, - tid: new Date().getTime().toString(16) + tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16) }; }, parse: function (url) { diff --git a/trunk/3rdparty/signaling/www/demos/js/srs.sig.js b/trunk/3rdparty/signaling/www/demos/js/srs.sig.js index d78490d99..bae95cc42 100644 --- a/trunk/3rdparty/signaling/www/demos/js/srs.sig.js +++ b/trunk/3rdparty/signaling/www/demos/js/srs.sig.js @@ -59,7 +59,7 @@ function SrsRtcSignalingAsync() { // The message is a json object. self.send = async function (message) { return new Promise(function (resolve, reject) { - var r = {tid: new Date().getTime().toString(16), msg: message}; + var r = {tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16), msg: message}; self._internals.msgs[r.tid] = {resolve: resolve, reject: reject}; self.ws.send(JSON.stringify(r)); }); @@ -100,21 +100,49 @@ function SrsRtcSignalingParse(location) { let wsPort = location.href.split('wsp=')[1]; wsPort = wsPort? wsPort.split('&')[0] : location.host.split(':')[1]; - wsHost = wsPort? wsHost.split(':')[0] + ':' + wsPort : wsHost; let host = location.href.split('host=')[1]; host = host? host.split('&')[0] : location.hostname; let room = location.href.split('room=')[1]; + room = room? room.split('&')[0] : null; let display = location.href.split('display=')[1]; - display = display? display.split('&')[0] : new Date().getTime().toString(16).substr(3); + display = display? display.split('&')[0] : Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16).substr(3); let autostart = location.href.split('autostart=')[1]; autostart = autostart && autostart.split('&')[0] === 'true'; + // Remove data in query. + let rawQuery = query; + if (query) { + query = query.replace('wss=' + wsSchema, ''); + query = query.replace('wsh=' + wsHost, ''); + query = query.replace('wsp=' + wsPort, ''); + query = query.replace('host=' + host, ''); + if (room) { + query = query.replace('room=' + room, ''); + } + query = query.replace('display=' + display, ''); + query = query.replace('autostart=' + autostart, ''); + + while (query.indexOf('&&') >= 0) { + query = query.replace('&&', '&'); + } + query = query.replace('?&', '?'); + if (query.lastIndexOf('?') === query.length - 1) { + query = query.substr(0, query.length - 1); + } + if (query.lastIndexOf('&') === query.length - 1) { + query = query.substr(0, query.length - 1); + } + } + + // Regenerate the host of websocket. + wsHost = wsPort? wsHost.split(':')[0] + ':' + wsPort : wsHost; + return { - query: query, wsSchema: wsSchema, wsHost: wsHost, host: host, + query: query, rawQuery: rawQuery, wsSchema: wsSchema, wsHost: wsHost, host: host, room: room, display: display, autostart: autostart, }; } diff --git a/trunk/3rdparty/signaling/www/demos/one2one.html b/trunk/3rdparty/signaling/www/demos/one2one.html index d6ab19f08..6271e0511 100644 --- a/trunk/3rdparty/signaling/www/demos/one2one.html +++ b/trunk/3rdparty/signaling/www/demos/one2one.html @@ -5,7 +5,7 @@ @@ -15,15 +15,16 @@ - +
SRS
-
-
+
- +
-
+
- + + Refresh + + Alert +
+
+ + + +
+
+
+ FFmpeg合流转直播 +
+
+
+ ffmpeg -f flv -i rtmp://// -f flv -i rtmp://// \
+      -filter_complex "[1:v]scale=w=96:h=72[ckout];[0:v][ckout]overlay=x=W-w-10:y=H-h-10[out]" -map "[out]" \
+      -c:v libx264 -profile:v high -preset medium \
+      -filter_complex amix -c:a aac \
+      -f flv -y + + rtmp:////merge + + + &&
+ echo "ok" +
+
+ + 预览：rtmp:////merge + +
+
+
+
+ + + +
+
+
+ + 视频号推流信息 + +
+
+
+ 推流地址 +
+
+ 推流密钥 +
+
+ +
+
+
+
+

© SRS 2020

+
+
+ + + + + + +
+
+
+ SRS +
+ +
+
+
+
+
+
+ SRS: + + Room: + + Display: + + +
+ +
+
+ + + + + +
+
+ + + + + +
+
+
+ \ No newline at end of file diff --git a/trunk/3rdparty/srs-bench/auto/sync_vnet.sh b/trunk/3rdparty/srs-bench/auto/sync_vnet.sh index 487bf09ba..ad00d3993 100755 --- a/trunk/3rdparty/srs-bench/auto/sync_vnet.sh +++ b/trunk/3rdparty/srs-bench/auto/sync_vnet.sh @@ -27,7 +27,7 @@ go test -race ./... if [[ $? -ne 0 ]]; then echo "fail"; exit -1; fi echo "golangci-lint run --skip-files conn_map_test.go,router_test.go" && -golangci-lint run --skip-files conn_map_test.go,a_test.go +golangci-lint run --skip-files conn_map_test.go,router_test.go if [[ $? -ne 0 ]]; then echo "fail"; exit -1; fi echo "OK" diff --git a/trunk/3rdparty/srs-bench/vnet/udpproxy_direct.go b/trunk/3rdparty/srs-bench/vnet/udpproxy_direct.go index ff902d56f..9ab460e71 100644 --- a/trunk/3rdparty/srs-bench/vnet/udpproxy_direct.go +++ b/trunk/3rdparty/srs-bench/vnet/udpproxy_direct.go @@ -1,6 +1,7 @@ package vnet import ( + "fmt" "net" ) @@ -22,7 +23,7 @@ func (v *UDPProxy) Deliver(sourceAddr, destAddr net.Addr, b []byte) (nn int, err func (v *aUDPProxyWorker) Deliver(sourceAddr, destAddr net.Addr, b []byte) (nn int, err error) { addr, ok := sourceAddr.(*net.UDPAddr) if !ok { - return 0, nil + return 0, fmt.Errorf("invalid addr %v", sourceAddr) // nolint:goerr113 } // nolint:godox // TODO: Support deliver packet from real server to vnet. diff --git a/trunk/3rdparty/srs-bench/vnet/udpproxy_direct_test.go b/trunk/3rdparty/srs-bench/vnet/udpproxy_direct_test.go index 7ad367b82..18e43c191 100644 --- a/trunk/3rdparty/srs-bench/vnet/udpproxy_direct_test.go +++ b/trunk/3rdparty/srs-bench/vnet/udpproxy_direct_test.go @@ -1,3 +1,5 @@ +// +build !wasm + package vnet import ( @@ -17,7 +19,7 @@ import ( // which proxy to real server: // 192.168.1.10:8000 // We should get a reply if directly deliver to proxy. -func TestUDPProxyDirectDeliver(t *testing.T) { +func TestUDPProxyDirectDeliverTypical(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) var r0, r1, r2 error @@ -164,3 +166,170 @@ func TestUDPProxyDirectDeliver(t *testing.T) { } }() } + +// Error if deliver to invalid address. +func TestUDPProxyDirectDeliverBadcase(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + + var r0, r1, r2 error + defer func() { + if r0 != nil || r1 != nil || r2 != nil { + t.Errorf("fail for ctx=%v, r0=%v, r1=%v, r2=%v", ctx.Err(), r0, r1, r2) + } + }() + + var wg sync.WaitGroup + defer wg.Wait() + + // Timeout, fail + wg.Add(1) + go func() { + defer wg.Done() + defer cancel() + + select { + case <-ctx.Done(): + case <-time.After(time.Duration(*testTimeout) * time.Millisecond): + r2 = fmt.Errorf("timeout") // nolint:goerr113 + } + }() + + // For utest, we always proxy vnet packets to the random port we listen to. + mockServer := NewMockUDPEchoServer() + wg.Add(1) + go func() { + defer wg.Done() + defer cancel() + if err := mockServer.doMockUDPServer(ctx); err != nil { + r0 = err + } + }() + + // Create a vent and proxy. + wg.Add(1) + go func() { + defer wg.Done() + defer cancel() + + // When real server is ready, start the vnet test. + select { + case <-ctx.Done(): + return + case <-mockServer.realServerReady.Done(): + } + + doVnetProxy := func() error { + router, err := NewRouter(&RouterConfig{ + CIDR: "0.0.0.0/0", + LoggerFactory: logging.NewDefaultLoggerFactory(), + }) + if err != nil { + return err + } + + clientNetwork := NewNet(&NetConfig{ + StaticIP: "10.0.0.11", + }) + if err = router.AddNet(clientNetwork); err != nil { + return err + } + + if err = router.Start(); err != nil { + return err + } + defer router.Stop() // nolint:errcheck + + proxy, err := NewProxy(router) + if err != nil { + return err + } + defer proxy.Close() // nolint:errcheck + + // For utest, mock the target real server. + proxy.mockRealServerAddr = mockServer.realServerAddr + + // The real server address to proxy to. + // Note that for utest, we will proxy to a local address. + serverAddr, err := net.ResolveUDPAddr("udp4", "192.168.1.10:8000") + if err != nil { + return err + } + + if err = proxy.Proxy(clientNetwork, serverAddr); err != nil { + return err + } + + // Now, all packets from client, will be proxy to real server, vice versa. + client, err := clientNetwork.ListenPacket("udp4", "10.0.0.11:5787") + if err != nil { + return err + } + + // When system quit, interrupt client. + selfKill, selfKillCancel := context.WithCancel(context.Background()) + go func() { + <-ctx.Done() + selfKillCancel() + _ = client.Close() + }() + + // Write by vnet client. + if _, err = client.WriteTo([]byte("Hello"), serverAddr); err != nil { + return err + } + + buf := make([]byte, 1500) + if n, addr, err := client.ReadFrom(buf); err != nil { // nolint:gocritic,govet + if errors.Is(selfKill.Err(), context.Canceled) { + return nil + } + return err + } else if n != 5 || addr == nil { + return fmt.Errorf("n=%v, addr=%v", n, addr) // nolint:goerr113 + } else if string(buf[:n]) != "Hello" { // nolint:goconst + return fmt.Errorf("data %v", buf[:n]) // nolint:goerr113 + } + + // BadCase: Invalid address, error and ignore. + tcpAddr, err := net.ResolveTCPAddr("tcp4", "192.168.1.10:8000") + if err != nil { + return err + } + + if _, err = proxy.Deliver(tcpAddr, serverAddr, []byte("Hello")); err == nil { + return fmt.Errorf("should err") // nolint:goerr113 + } + + // BadCase: Invalid target address, ignore. + udpAddr, err := net.ResolveUDPAddr("udp4", "10.0.0.12:5788") + if err != nil { + return err + } + + if nn, err := proxy.Deliver(udpAddr, serverAddr, []byte("Hello")); err != nil { // nolint:govet + return err + } else if nn != 0 { + return fmt.Errorf("invalid %v", nn) // nolint:goerr113 + } + + // BadCase: Write on closed socket, error and ignore. + proxy.workers.Range(func(key, value interface{}) bool { + value.(*aUDPProxyWorker).endpoints.Range(func(key, value interface{}) bool { + _ = value.(*net.UDPConn).Close() + return true + }) + return true + }) + + if _, err = proxy.Deliver(client.LocalAddr(), serverAddr, []byte("Hello")); err == nil { + return fmt.Errorf("should error") // nolint:goerr113 + } + + return nil + } + + if err := doVnetProxy(); err != nil { + r1 = err + } + }() +} diff --git a/trunk/configure b/trunk/configure index b57700e2d..604017e28 100755 --- a/trunk/configure +++ b/trunk/configure @@ -583,8 +583,9 @@ install: @cp -f research/api-server/static-dir/index.html \$(__REAL_INSTALL)/objs/nginx/html @cp -f research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html @cp -f research/api-server/static-dir/favicon.ico \$(__REAL_INSTALL)/objs/nginx/html - @cp -Rf research/players \$(__REAL_INSTALL)/objs/nginx/html - @cp -Rf research/console \$(__REAL_INSTALL)/objs/nginx/html + @cp -Rf research/players \$(__REAL_INSTALL)/objs/nginx/html/ + @cp -Rf research/console \$(__REAL_INSTALL)/objs/nginx/html/ + @cp -Rf 3rdparty/signaling/www/demos \$(__REAL_INSTALL)/objs/nginx/html/ @echo "Now copy binary files" @mkdir -p \$(__REAL_INSTALL)/objs @cp -f objs/srs \$(__REAL_INSTALL)/objs diff --git a/trunk/research/console/en_index.html b/trunk/research/console/en_index.html index c0aa7df67..9c0c28169 100644 --- a/trunk/research/console/en_index.html +++ b/trunk/research/console/en_index.html @@ -7,7 +7,7 @@ diff --git a/trunk/research/console/ng_index.html b/trunk/research/console/ng_index.html index 7ec9e3fcb..a7f3e16a4 100644 --- a/trunk/research/console/ng_index.html +++ b/trunk/research/console/ng_index.html @@ -7,7 +7,7 @@ diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html index 59a01a5b9..fcf4f1e6e 100644 --- a/trunk/research/players/index.html +++ b/trunk/research/players/index.html @@ -6,7 +6,7 @@ diff --git a/trunk/research/players/js/srs.sdk.js b/trunk/research/players/js/srs.sdk.js index 6bde3fb8f..03a77ad6d 100644 --- a/trunk/research/players/js/srs.sdk.js +++ b/trunk/research/players/js/srs.sdk.js @@ -57,7 +57,7 @@ function SrsRtcPublisherAsync() { self.pc.addTransceiver("video", {direction: "sendonly"}); var stream = await navigator.mediaDevices.getUserMedia( - {audio: true, video: {height: {max: 320}}} + {audio: true, video: {width: {max: 320}}} ); // @see https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addStream#Migrating_to_addTrack stream.getTracks().forEach(function (track) { @@ -69,7 +69,8 @@ function SrsRtcPublisherAsync() { 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 + api: conf.apiUrl, tid: conf.tid, streamurl: conf.streamUrl, + clientip: null, sdp: offer.sdp }; console.log("Generated offer: ", data); @@ -101,7 +102,7 @@ function SrsRtcPublisherAsync() { // Close the publisher. self.close = function () { - self.pc.close(); + self.pc && self.pc.close(); self.pc = null; }; @@ -141,7 +142,10 @@ function SrsRtcPublisherAsync() { var streamUrl = urlObject.url; - return {apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port}; + return { + apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, + tid: new Date().getTime().toString(16) + }; }, parse: function (url) { // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri @@ -289,7 +293,8 @@ function SrsRtcPlayerAsync() { 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 + api: conf.apiUrl, tid: conf.tid, streamurl: conf.streamUrl, + clientip: null, sdp: offer.sdp }; console.log("Generated offer: ", data); @@ -315,7 +320,7 @@ function SrsRtcPlayerAsync() { // Close the player. self.close = function() { - self.pc.close(); + self.pc && self.pc.close(); self.pc = null; }; @@ -354,7 +359,10 @@ function SrsRtcPlayerAsync() { var streamUrl = urlObject.url; - return {apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port}; + return { + apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, + tid: new Date().getTime().toString(16) + }; }, parse: function (url) { // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index 045bc8731..bd3d668c9 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -5,7 +5,7 @@ diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index dda6e80f8..3aa9d0e66 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -5,7 +5,7 @@ diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index a35d67e76..961609685 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -6,7 +6,7 @@ diff --git a/trunk/research/players/srs_player_deprecated.html b/trunk/research/players/srs_player_deprecated.html index 5ee5b0af2..e0e773884 100755 --- a/trunk/research/players/srs_player_deprecated.html +++ b/trunk/research/players/srs_player_deprecated.html @@ -6,7 +6,7 @@ @@ -335,7 +335,7 @@ $("#btn_publish").click(on_user_publish); // for publish, we use randome stream name. - $("#txt_url").val($("#txt_url").val() + "." + new Date().getTime()); + $("#txt_url").val($("#txt_url").val() + "." + Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16)); // start the publisher. srs_publisher = new SrsPublisher("local_publisher", 430, 185); diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index afc5932d0..893b280a6 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -6,7 +6,7 @@ diff --git a/trunk/scripts/git.commit.sh b/trunk/scripts/git.commit.sh index 803b2dd33..fd83d907b 100755 --- a/trunk/scripts/git.commit.sh +++ b/trunk/scripts/git.commit.sh @@ -1,4 +1,4 @@ #!/bin/bash -for file in $(git remote); do echo ""; git push $file; done +for file in $(git remote); do echo ""; git push $file $@; done diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh index ee4b6d739..3768b54ba 100755 --- a/trunk/scripts/package.sh +++ b/trunk/scripts/package.sh @@ -59,8 +59,6 @@ if [ $help = yes ]; then --pi for pi platform, configure/make/package. --x86-64 alias for --x86-x64. --jobs Set the configure and make jobs. - - --console The path for https://github.com/ossrs/srs-console END exit 0 fi diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 4523c0dde..ffba74781 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1012,6 +1012,10 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti return srs_error_new(ERROR_SYSTEM_STREAM_BUSY, "rtmp stream %s busy", r->get_stream_url().c_str()); } + // Disable GOP cache for RTC2RTMP bridger, to keep the streams in sync, + // especially for stream merging. + rtmp->set_cache(false); + SrsRtmpFromRtcBridger *bridger = new SrsRtmpFromRtcBridger(rtmp); if ((err = bridger->initialize(r)) != srs_success) { srs_freep(bridger); diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 4c08134a5..30cccb4d5 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 96 +#define VERSION_REVISION 98 #endif