mirror of
https://github.com/Monibuca/plugin-webrtc.git
synced 2025-10-05 14:56:56 +08:00
加入订阅测试页面
This commit is contained in:
9
main.go
9
main.go
@@ -47,7 +47,8 @@ import (
|
||||
|
||||
//go:embed publish.html
|
||||
var publishHTML []byte
|
||||
|
||||
//go:embed subscribe.html
|
||||
var subscribeHTML []byte
|
||||
var (
|
||||
reg_level = regexp.MustCompile("profile-level-id=(4.+f)")
|
||||
)
|
||||
@@ -144,7 +145,7 @@ func (conf *WebRTCConfig) Push_(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
// puber.SetIO(puber.PeerConnection)
|
||||
puber.SetIO(puber.PeerConnection) //TODO: 单PC需要注释掉
|
||||
puber.OnICECandidate(func(ice *ICECandidate) {
|
||||
if ice != nil {
|
||||
puber.Info(ice.ToJSON().Candidate)
|
||||
@@ -206,7 +207,9 @@ func (conf *WebRTCConfig) Push_(w http.ResponseWriter, r *http.Request) {
|
||||
func (conf *WebRTCConfig) Test_Publish(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write(publishHTML)
|
||||
}
|
||||
|
||||
func (conf *WebRTCConfig) Test_Subscribe(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write(subscribeHTML)
|
||||
}
|
||||
var webrtcConfig WebRTCConfig
|
||||
|
||||
var WebRTCPlugin = engine.InstallPlugin(&webrtcConfig)
|
||||
|
72
publish.html
72
publish.html
@@ -12,10 +12,20 @@
|
||||
<video id="video" width="640" height="480" autoplay muted>
|
||||
</video>
|
||||
<!-- <button id="sw" onclick="action()" type="button" style="width:100px;height:30px;display: block;">unpublish</button> -->
|
||||
<pre>
|
||||
<code id="remoteSdp">
|
||||
|
||||
</code>
|
||||
</pre>
|
||||
</body>
|
||||
<script>
|
||||
let action = () => { console.log('action not set'); };
|
||||
(async () => {
|
||||
navigator.mediaDevices.enumerateDevices().then((devices) => {
|
||||
devices.forEach((device) => {
|
||||
console.log(device.kind + ": " + device.label + " id = " + device.deviceId);
|
||||
});
|
||||
});
|
||||
const mediaStream = await navigator.mediaDevices.getUserMedia({
|
||||
video: true,
|
||||
audio: true,
|
||||
@@ -29,12 +39,13 @@
|
||||
pc.onicecandidate = (e) => {
|
||||
console.log('onicecandidate', e.candidate);
|
||||
};
|
||||
// mediaStream.getTracks().forEach((t) => {
|
||||
// pc.addTrack(t, mediaStream);
|
||||
// });
|
||||
let videoTransceiver = pc.addTransceiver(mediaStream.getVideoTracks()[0], { direction: 'sendonly' });
|
||||
let audioTransceiver = pc.addTransceiver(mediaStream.getAudioTracks()[0], { direction: 'sendonly' });
|
||||
const dc = pc.createDataChannel('sdp');
|
||||
mediaStream.id = 'live/webrtc';
|
||||
mediaStream.getTracks().forEach((t) => {
|
||||
pc.addTrack(t, mediaStream);
|
||||
});
|
||||
// const videoTransceiver = pc.addTransceiver(mediaStream.getVideoTracks()[0], { direction: 'sendonly' });
|
||||
// const audioTransceiver = pc.addTransceiver(mediaStream.getAudioTracks()[0], { direction: 'sendonly' });
|
||||
// const dc = pc.createDataChannel('sdp');
|
||||
const offer = await pc.createOffer();
|
||||
await pc.setLocalDescription(offer);
|
||||
const result = await fetch(
|
||||
@@ -51,33 +62,34 @@
|
||||
},
|
||||
);
|
||||
const remoteSdp = await result.text();
|
||||
document.getElementById('remoteSdp').innerText = remoteSdp;
|
||||
await pc.setRemoteDescription(
|
||||
new RTCSessionDescription({ type: 'answer', sdp: remoteSdp }),
|
||||
);
|
||||
dc.onmessage = async (e) => {
|
||||
await pc.setRemoteDescription(
|
||||
new RTCSessionDescription({ type: 'answer', sdp: e.data }),
|
||||
);
|
||||
};
|
||||
const publish = async () => {
|
||||
videoTransceiver.direction = 'sendonly';
|
||||
audioTransceiver.direction = 'sendonly';
|
||||
const offer = await pc.createOffer();
|
||||
await pc.setLocalDescription(offer);
|
||||
dc.send('1' + offer.sdp);
|
||||
action = unpublish;
|
||||
document.getElementById('sw').innerText = 'unpublish';
|
||||
};
|
||||
const unpublish = async () => {
|
||||
videoTransceiver.direction = 'inactive';
|
||||
audioTransceiver.direction = 'inactive';
|
||||
const offer = await pc.createOffer();
|
||||
await pc.setLocalDescription(offer);
|
||||
dc.send('0' + offer.sdp);
|
||||
action = publish;
|
||||
document.getElementById('sw').innerText = 'publish';
|
||||
};
|
||||
action = unpublish;
|
||||
// dc.onmessage = async (e) => {
|
||||
// await pc.setRemoteDescription(
|
||||
// new RTCSessionDescription({ type: 'answer', sdp: e.data }),
|
||||
// );
|
||||
// };
|
||||
// const publish = async () => {
|
||||
// videoTransceiver.direction = 'sendonly';
|
||||
// audioTransceiver.direction = 'sendonly';
|
||||
// const offer = await pc.createOffer();
|
||||
// await pc.setLocalDescription(offer);
|
||||
// dc.send('1' + offer.sdp);
|
||||
// action = unpublish;
|
||||
// document.getElementById('sw').innerText = 'unpublish';
|
||||
// };
|
||||
// const unpublish = async () => {
|
||||
// videoTransceiver.direction = 'inactive';
|
||||
// audioTransceiver.direction = 'inactive';
|
||||
// const offer = await pc.createOffer();
|
||||
// await pc.setLocalDescription(offer);
|
||||
// dc.send('0' + offer.sdp);
|
||||
// action = publish;
|
||||
// document.getElementById('sw').innerText = 'publish';
|
||||
// };
|
||||
// action = unpublish;
|
||||
})()
|
||||
</script>
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
package webrtc
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/pion/rtcp"
|
||||
@@ -75,7 +74,8 @@ func (puber *WebRTCPublisher) writeRTCP(track *TrackRemote) {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
if rtcpErr := puber.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}); rtcpErr != nil {
|
||||
fmt.Println(rtcpErr)
|
||||
puber.Error("writeRTCP", zap.Error(rtcpErr))
|
||||
return
|
||||
}
|
||||
case <-puber.Done():
|
||||
return
|
||||
|
87
subscribe.html
Normal file
87
subscribe.html
Normal file
@@ -0,0 +1,87 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>测试WebRTC拉流</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<video id="video" width="640" height="480" autoplay>
|
||||
</video>
|
||||
<!-- <button id="sw" onclick="action()" type="button" style="width:100px;height:30px;display: block;">unpublish</button> -->
|
||||
<pre>
|
||||
<code id="remoteSdp">
|
||||
|
||||
</code>
|
||||
</pre>
|
||||
</body>
|
||||
<script>
|
||||
let action = () => { console.log('action not set'); };
|
||||
(async () => {
|
||||
|
||||
const pc = new RTCPeerConnection();
|
||||
pc.ontrack = (e) => {
|
||||
console.log('ontrack', e);
|
||||
if (e.streams.length === 0) return;
|
||||
document.getElementById('video').srcObject = e.streams[0];
|
||||
};
|
||||
pc.oniceconnectionstatechange = () => {
|
||||
console.log('oniceconnectionstatechange', pc.iceConnectionState);
|
||||
};
|
||||
pc.onicecandidate = (e) => {
|
||||
console.log('onicecandidate', e.candidate);
|
||||
};
|
||||
pc.addTransceiver('video', { direction: 'recvonly' });
|
||||
pc.addTransceiver('audio', { direction: 'recvonly' });
|
||||
// const dc = pc.createDataChannel('sdp');
|
||||
const offer = await pc.createOffer();
|
||||
await pc.setLocalDescription(offer);
|
||||
const result = await fetch(
|
||||
`/webrtc/play/live/webrtc`,
|
||||
{
|
||||
method: 'POST',
|
||||
mode: 'cors',
|
||||
cache: 'no-cache',
|
||||
credentials: 'include',
|
||||
redirect: 'follow',
|
||||
referrerPolicy: 'no-referrer',
|
||||
headers: { 'Content-Type': 'application/sdp' },
|
||||
body: offer.sdp,
|
||||
},
|
||||
);
|
||||
const remoteSdp = await result.text();
|
||||
document.getElementById('remoteSdp').innerText = remoteSdp;
|
||||
await pc.setRemoteDescription(
|
||||
new RTCSessionDescription({ type: 'answer', sdp: remoteSdp }),
|
||||
);
|
||||
// dc.onmessage = async (e) => {
|
||||
// await pc.setRemoteDescription(
|
||||
// new RTCSessionDescription({ type: 'answer', sdp: e.data }),
|
||||
// );
|
||||
// };
|
||||
// const publish = async () => {
|
||||
// videoTransceiver.direction = 'sendonly';
|
||||
// audioTransceiver.direction = 'sendonly';
|
||||
// const offer = await pc.createOffer();
|
||||
// await pc.setLocalDescription(offer);
|
||||
// dc.send('1' + offer.sdp);
|
||||
// action = unpublish;
|
||||
// document.getElementById('sw').innerText = 'unpublish';
|
||||
// };
|
||||
// const unpublish = async () => {
|
||||
// videoTransceiver.direction = 'inactive';
|
||||
// audioTransceiver.direction = 'inactive';
|
||||
// const offer = await pc.createOffer();
|
||||
// await pc.setLocalDescription(offer);
|
||||
// dc.send('0' + offer.sdp);
|
||||
// action = publish;
|
||||
// document.getElementById('sw').innerText = 'publish';
|
||||
// };
|
||||
// action = unpublish;
|
||||
})()
|
||||
</script>
|
||||
|
||||
</html>
|
Reference in New Issue
Block a user