mirror of
https://github.com/Monibuca/plugin-webrtc.git
synced 2025-10-05 14:56:56 +08:00
合并修改
This commit is contained in:
180
main.go
180
main.go
@@ -48,10 +48,6 @@ var config struct {
|
|||||||
// port int
|
// port int
|
||||||
// }
|
// }
|
||||||
|
|
||||||
var m MediaEngine
|
|
||||||
var api *API
|
|
||||||
var SSRC uint32
|
|
||||||
var SSRCMap = make(map[string]uint32)
|
|
||||||
var ssrcLock sync.Mutex
|
var ssrcLock sync.Mutex
|
||||||
var playWaitList WaitList
|
var playWaitList WaitList
|
||||||
|
|
||||||
@@ -75,15 +71,7 @@ func (wl *WaitList) Get(k string) *WebRTC {
|
|||||||
return wl.m[k]
|
return wl.m[k]
|
||||||
}
|
}
|
||||||
func init() {
|
func init() {
|
||||||
m.RegisterCodec(NewRTPCodec(RTPCodecTypeVideo,
|
|
||||||
H264,
|
|
||||||
90000,
|
|
||||||
0,
|
|
||||||
"level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f",
|
|
||||||
DefaultPayloadTypeH264,
|
|
||||||
new(avformat.H264)))
|
|
||||||
//m.RegisterCodec(NewRTPPCMUCodec(DefaultPayloadTypePCMU, 8000))
|
|
||||||
api = NewAPI(WithMediaEngine(m))
|
|
||||||
InstallPlugin(&PluginConfig{
|
InstallPlugin(&PluginConfig{
|
||||||
Config: &config,
|
Config: &config,
|
||||||
Name: "WebRTC",
|
Name: "WebRTC",
|
||||||
@@ -97,11 +85,52 @@ type WebRTC struct {
|
|||||||
*PeerConnection
|
*PeerConnection
|
||||||
RemoteAddr string
|
RemoteAddr string
|
||||||
videoTrack *Track
|
videoTrack *Track
|
||||||
|
m MediaEngine
|
||||||
|
api *API
|
||||||
// codecs.H264Packet
|
// codecs.H264Packet
|
||||||
// *os.File
|
// *os.File
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rtc *WebRTC) Play(streamPath string) bool {
|
func (rtc *WebRTC) Play(streamPath string) bool {
|
||||||
|
var sub Subscriber
|
||||||
|
sub.ID = rtc.RemoteAddr
|
||||||
|
sub.Type = "WebRTC"
|
||||||
|
var lastTimeStamp uint32
|
||||||
|
sub.OnData = func(packet *avformat.SendPacket) error {
|
||||||
|
if packet.Type == avformat.FLV_TAG_TYPE_AUDIO {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if packet.IsSequence {
|
||||||
|
} else {
|
||||||
|
var s uint32
|
||||||
|
if lastTimeStamp > 0 {
|
||||||
|
s = packet.Timestamp - lastTimeStamp
|
||||||
|
}
|
||||||
|
if packet.IsKeyFrame {
|
||||||
|
rtc.videoTrack.WriteSample(media.Sample{
|
||||||
|
Data: sub.SPS,
|
||||||
|
Samples: 0,
|
||||||
|
})
|
||||||
|
rtc.videoTrack.WriteSample(media.Sample{
|
||||||
|
Data: sub.PPS,
|
||||||
|
Samples: 0,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
for payload := packet.Payload[5:]; len(payload) > 4; {
|
||||||
|
var naulLen = int(util.BigEndian.Uint32(payload))
|
||||||
|
payload = payload[4:]
|
||||||
|
rtc.videoTrack.WriteSample(media.Sample{
|
||||||
|
Data: payload[:naulLen],
|
||||||
|
Samples: s * 90,
|
||||||
|
})
|
||||||
|
s = 0
|
||||||
|
payload = payload[naulLen:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastTimeStamp = packet.Timestamp
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// go sub.Subscribe(streamPath)
|
||||||
rtc.OnICEConnectionStateChange(func(connectionState ICEConnectionState) {
|
rtc.OnICEConnectionStateChange(func(connectionState ICEConnectionState) {
|
||||||
Printf("%s Connection State has changed %s ", streamPath, connectionState.String())
|
Printf("%s Connection State has changed %s ", streamPath, connectionState.String())
|
||||||
switch connectionState {
|
switch connectionState {
|
||||||
@@ -110,51 +139,23 @@ func (rtc *WebRTC) Play(streamPath string) bool {
|
|||||||
rtc.Stream.Close()
|
rtc.Stream.Close()
|
||||||
}
|
}
|
||||||
case ICEConnectionStateConnected:
|
case ICEConnectionStateConnected:
|
||||||
var sub Subscriber
|
//rtc.videoTrack = rtc.GetSenders()[0].Track()
|
||||||
sub.ID = rtc.RemoteAddr
|
sub.Subscribe(streamPath)
|
||||||
sub.Type = "WebRTC"
|
|
||||||
var lastTimeStamp uint32
|
|
||||||
sub.OnData = func(packet *avformat.SendPacket) error {
|
|
||||||
if packet.Type == avformat.FLV_TAG_TYPE_AUDIO {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if packet.IsSequence {
|
|
||||||
} else {
|
|
||||||
var s uint32
|
|
||||||
if lastTimeStamp > 0 {
|
|
||||||
s = packet.Timestamp - lastTimeStamp
|
|
||||||
}
|
|
||||||
if packet.IsKeyFrame {
|
|
||||||
rtc.videoTrack.WriteSample(media.Sample{
|
|
||||||
Data: sub.SPS,
|
|
||||||
Samples: 0,
|
|
||||||
})
|
|
||||||
rtc.videoTrack.WriteSample(media.Sample{
|
|
||||||
Data: sub.PPS,
|
|
||||||
Samples: 0,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for payload := packet.Payload[5:]; len(payload) > 4; {
|
|
||||||
var naulLen = int(util.BigEndian.Uint32(payload))
|
|
||||||
payload = payload[4:]
|
|
||||||
rtc.videoTrack.WriteSample(media.Sample{
|
|
||||||
Data: payload[:naulLen],
|
|
||||||
Samples: s * 90,
|
|
||||||
})
|
|
||||||
s = 0
|
|
||||||
payload = payload[naulLen:]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lastTimeStamp = packet.Timestamp
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
go sub.Subscribe(streamPath)
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
func (rtc *WebRTC) Publish(streamPath string) bool {
|
func (rtc *WebRTC) Publish(streamPath string) bool {
|
||||||
peerConnection, err := api.NewPeerConnection(Configuration{
|
rtc.m.RegisterCodec(NewRTPCodec(RTPCodecTypeVideo,
|
||||||
|
H264,
|
||||||
|
90000,
|
||||||
|
0,
|
||||||
|
"level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f",
|
||||||
|
DefaultPayloadTypeH264,
|
||||||
|
new(avformat.H264)))
|
||||||
|
//m.RegisterCodec(NewRTPPCMUCodec(DefaultPayloadTypePCMU, 8000))
|
||||||
|
rtc.api = NewAPI(WithMediaEngine(rtc.m))
|
||||||
|
peerConnection, err := rtc.api.NewPeerConnection(Configuration{
|
||||||
ICEServers: []ICEServer{
|
ICEServers: []ICEServer{
|
||||||
{
|
{
|
||||||
URLs: config.ICEServers,
|
URLs: config.ICEServers,
|
||||||
@@ -233,79 +234,84 @@ func (rtc *WebRTC) GetAnswer(localSdp SessionDescription) ([]byte, error) {
|
|||||||
func run() {
|
func run() {
|
||||||
http.HandleFunc("/webrtc/play", func(w http.ResponseWriter, r *http.Request) {
|
http.HandleFunc("/webrtc/play", func(w http.ResponseWriter, r *http.Request) {
|
||||||
streamPath := r.URL.Query().Get("streamPath")
|
streamPath := r.URL.Query().Get("streamPath")
|
||||||
offer := SessionDescription{}
|
var offer SessionDescription
|
||||||
bytes, err := ioutil.ReadAll(r.Body)
|
bytes, err := ioutil.ReadAll(r.Body)
|
||||||
err = json.Unmarshal(bytes, &offer)
|
err = json.Unmarshal(bytes, &offer)
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
Println(err)
|
||||||
|
fmt.Fprint(w, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Println(err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if rtc := playWaitList.Get(streamPath); rtc != nil {
|
if rtc := playWaitList.Get(streamPath); rtc != nil {
|
||||||
if err := rtc.SetRemoteDescription(offer); err != nil {
|
if err := rtc.SetRemoteDescription(offer); err != nil {
|
||||||
Println(err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if rtc.Play(streamPath) {
|
rtc.Play(streamPath)
|
||||||
w.Write([]byte(`success`))
|
|
||||||
} else {
|
|
||||||
w.Write([]byte(`{"errmsg":"bad name"}`))
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
w.Write([]byte(`{"errmsg":"bad name"}`))
|
w.Write([]byte("bad name"))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
http.HandleFunc("/webrtc/preparePlay", func(w http.ResponseWriter, r *http.Request) {
|
http.HandleFunc("/webrtc/preparePlay", func(w http.ResponseWriter, r *http.Request) {
|
||||||
streamPath := r.URL.Query().Get("streamPath")
|
streamPath := r.URL.Query().Get("streamPath")
|
||||||
|
pli := "42001f"
|
||||||
|
if stream := FindStream(streamPath); stream != nil {
|
||||||
|
pli = fmt.Sprintf("%x", stream.SPS[1:4])
|
||||||
|
}
|
||||||
rtc := new(WebRTC)
|
rtc := new(WebRTC)
|
||||||
peerConnection, err := api.NewPeerConnection(Configuration{
|
rtc.m.RegisterCodec(NewRTPCodec(RTPCodecTypeVideo,
|
||||||
|
H264,
|
||||||
|
90000,
|
||||||
|
0,
|
||||||
|
"level-asymmetry-allowed=1;packetization-mode=1;profile-level-id="+pli,
|
||||||
|
DefaultPayloadTypeH264,
|
||||||
|
new(avformat.H264)))
|
||||||
|
//m.RegisterCodec(NewRTPPCMUCodec(DefaultPayloadTypePCMU, 8000))
|
||||||
|
rtc.api = NewAPI(WithMediaEngine(rtc.m))
|
||||||
|
peerConnection, err := rtc.api.NewPeerConnection(Configuration{
|
||||||
ICEServers: []ICEServer{
|
ICEServers: []ICEServer{
|
||||||
{
|
{
|
||||||
URLs: config.ICEServers,
|
URLs: config.ICEServers,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
if _, err = peerConnection.AddTransceiverFromKind(RTPCodecTypeVideo); err != nil {
|
rtc.PeerConnection = peerConnection
|
||||||
|
rtc.OnICECandidate(func(ice *ICECandidate) {
|
||||||
|
if ice != nil {
|
||||||
|
println(ice.ToJSON().Candidate)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if r, err := peerConnection.AddTransceiverFromKind(RTPCodecTypeVideo); err == nil {
|
||||||
|
rtc.videoTrack = r.Sender().Track()
|
||||||
|
} else {
|
||||||
|
Println(err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Println(err)
|
Println(err)
|
||||||
|
fmt.Fprintf(w, `{"errmsg":"%s"}`, err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
rtc.PeerConnection = peerConnection
|
|
||||||
// Create a video track, using the same SSRC as the incoming RTP Packet
|
|
||||||
ssrcLock.Lock()
|
|
||||||
if _, ok := SSRCMap[streamPath]; !ok {
|
|
||||||
SSRC++
|
|
||||||
SSRCMap[streamPath] = SSRC
|
|
||||||
}
|
|
||||||
ssrcLock.Unlock()
|
|
||||||
videoTrack, err := rtc.NewTrack(DefaultPayloadTypeH264, SSRC, "video", "monibuca")
|
|
||||||
if err != nil {
|
|
||||||
Println(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, err = rtc.AddTrack(videoTrack); err != nil {
|
|
||||||
Println(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
rtc.videoTrack = videoTrack
|
|
||||||
playWaitList.Set(streamPath, rtc)
|
playWaitList.Set(streamPath, rtc)
|
||||||
rtc.RemoteAddr = r.RemoteAddr
|
rtc.RemoteAddr = r.RemoteAddr
|
||||||
offer, err := rtc.CreateOffer(nil)
|
offer, err := rtc.CreateOffer(nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Println(err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if bytes, err := rtc.GetAnswer(offer); err == nil {
|
if bytes, err := rtc.GetAnswer(offer); err == nil {
|
||||||
w.Write(bytes)
|
w.Write(bytes)
|
||||||
} else {
|
} else {
|
||||||
Println(err)
|
|
||||||
w.Write([]byte(err.Error()))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
http.HandleFunc("/webrtc/publish", func(w http.ResponseWriter, r *http.Request) {
|
http.HandleFunc("/webrtc/publish", func(w http.ResponseWriter, r *http.Request) {
|
||||||
streamPath := r.URL.Query().Get("streamPath")
|
streamPath := r.URL.Query().Get("streamPath")
|
||||||
|
111
ui/dist/plugin-webrtc.common.js
vendored
111
ui/dist/plugin-webrtc.common.js
vendored
@@ -221,12 +221,12 @@ var staticRenderFns = []
|
|||||||
|
|
||||||
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=50fea0bc&scoped=true&
|
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=50fea0bc&scoped=true&
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d106341-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=template&id=edf62584&
|
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d106341-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=template&id=6aea3512&
|
||||||
var Playervue_type_template_id_edf62584_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Modal',_vm._g(_vm._b({attrs:{"draggable":"","title":_vm.streamPath},on:{"on-ok":_vm.onClosePreview,"on-cancel":_vm.onClosePreview}},'Modal',_vm.$attrs,false),_vm.$listeners),[_c('video',{ref:"webrtc",attrs:{"width":"488","height":"275","autoplay":"","muted":"","controls":""},domProps:{"srcObject":_vm.stream,"muted":true}}),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[(_vm.remoteSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.remoteSDPURL,"download":"remoteSDP.txt"},slot:"content"},[_vm._v("remoteSDP")])]):_vm._e(),(_vm.localSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.localSDPURL,"download":"localSDP.txt"},slot:"content"},[_vm._v("localSDP")])]):_vm._e()],1)])}
|
var Playervue_type_template_id_6aea3512_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Modal',_vm._g(_vm._b({attrs:{"draggable":"","title":_vm.streamPath},on:{"on-ok":_vm.onClosePreview,"on-cancel":_vm.onClosePreview}},'Modal',_vm.$attrs,false),_vm.$listeners),[_c('video',{ref:"webrtc",attrs:{"width":"488","height":"275","autoplay":"","muted":"","controls":""},domProps:{"srcObject":_vm.stream,"muted":true}}),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[(_vm.remoteSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.remoteSDPURL,"download":"remoteSDP.txt"},slot:"content"},[_vm._v("remoteSDP")])]):_vm._e(),(_vm.localSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.localSDPURL,"download":"localSDP.txt"},slot:"content"},[_vm._v("localSDP")])]):_vm._e()],1)])}
|
||||||
var Playervue_type_template_id_edf62584_staticRenderFns = []
|
var Playervue_type_template_id_6aea3512_staticRenderFns = []
|
||||||
|
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=template&id=edf62584&
|
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=template&id=6aea3512&
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=script&lang=js&
|
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=script&lang=js&
|
||||||
//
|
//
|
||||||
@@ -263,56 +263,57 @@ let pc = null;
|
|||||||
streamPath: ""
|
streamPath: ""
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
|
||||||
async play(streamPath) {
|
methods: {
|
||||||
pc = new RTCPeerConnection();
|
async play(streamPath) {
|
||||||
this.streamPath = streamPath;
|
pc = new RTCPeerConnection();
|
||||||
pc.onsignalingstatechange = e => {
|
this.streamPath = streamPath;
|
||||||
console.log(e);
|
pc.onsignalingstatechange = e => {
|
||||||
};
|
//console.log(e);
|
||||||
pc.oniceconnectionstatechange = e => {
|
};
|
||||||
this.$toast.info(pc.iceConnectionState);
|
pc.oniceconnectionstatechange = e => {
|
||||||
this.iceConnectionState = pc.iceConnectionState;
|
this.$toast.info(pc.iceConnectionState);
|
||||||
};
|
this.iceConnectionState = pc.iceConnectionState;
|
||||||
pc.onicecandidate = event => {};
|
};
|
||||||
const result = await this.ajax({
|
pc.onicecandidate = event => {
|
||||||
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
console.log(event)
|
||||||
dataType: "json"
|
};
|
||||||
});
|
let result = await this.ajax({
|
||||||
if (result.errmsg) {
|
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
||||||
this.$toast.error(result.errmsg);
|
dataType: "json"
|
||||||
return;
|
});
|
||||||
} else {
|
if (result.errmsg) {
|
||||||
this.remoteSDP = result.sdp;
|
this.$toast.error(result.errmsg);
|
||||||
this.remoteSDPURL = URL.createObjectURL(
|
return;
|
||||||
new Blob([this.remoteSDP], { type: "text/plain" })
|
} else {
|
||||||
);
|
this.remoteSDP = result.sdp;
|
||||||
}
|
this.remoteSDPURL = URL.createObjectURL(new Blob([this.remoteSDP], { type: "text/plain" }));
|
||||||
pc.ontrack = event => {
|
}
|
||||||
console.log(event);
|
pc.ontrack = event => {
|
||||||
if (event.streams[0].id == "monibuca") this.stream = event.streams[0];
|
// console.log(event);
|
||||||
};
|
if (event.track.kind == "video")
|
||||||
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
this.stream = event.streams[0];
|
||||||
await pc.setLocalDescription(await pc.createAnswer());
|
};
|
||||||
this.localSDP = pc.localDescription.sdp;
|
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
||||||
this.localSDPURL = URL.createObjectURL(
|
await pc.setLocalDescription(await pc.createAnswer());
|
||||||
new Blob([this.localSDP], { type: "text/plain" })
|
this.localSDP = pc.localDescription.sdp;
|
||||||
);
|
this.localSDPURL = URL.createObjectURL(
|
||||||
result = await this.ajax({
|
new Blob([this.localSDP], { type: "text/plain" })
|
||||||
type: "POST",
|
);
|
||||||
processData: false,
|
result = await this.ajax({
|
||||||
data: JSON.stringify(pc.localDescription),
|
type: "POST",
|
||||||
url: "/webrtc/play?streamPath=" + this.streamPath,
|
processData: false,
|
||||||
dataType: "json"
|
data: JSON.stringify(pc.localDescription.toJSON()),
|
||||||
});
|
url: "/webrtc/play?streamPath=" + this.streamPath,
|
||||||
if (result != "success") {
|
});
|
||||||
this.$toast.error(result.errmsg || result);
|
if (result != "success") {
|
||||||
}
|
this.$toast.error(result);
|
||||||
},
|
}
|
||||||
onClosePreview() {
|
},
|
||||||
pc.close();
|
onClosePreview() {
|
||||||
|
pc.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=script&lang=js&
|
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=script&lang=js&
|
||||||
@@ -427,8 +428,8 @@ function normalizeComponent (
|
|||||||
|
|
||||||
var component = normalizeComponent(
|
var component = normalizeComponent(
|
||||||
components_Playervue_type_script_lang_js_,
|
components_Playervue_type_script_lang_js_,
|
||||||
Playervue_type_template_id_edf62584_render,
|
Playervue_type_template_id_6aea3512_render,
|
||||||
Playervue_type_template_id_edf62584_staticRenderFns,
|
Playervue_type_template_id_6aea3512_staticRenderFns,
|
||||||
false,
|
false,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
|
2
ui/dist/plugin-webrtc.common.js.map
vendored
2
ui/dist/plugin-webrtc.common.js.map
vendored
File diff suppressed because one or more lines are too long
111
ui/dist/plugin-webrtc.umd.js
vendored
111
ui/dist/plugin-webrtc.umd.js
vendored
@@ -230,12 +230,12 @@ var staticRenderFns = []
|
|||||||
|
|
||||||
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=50fea0bc&scoped=true&
|
// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=50fea0bc&scoped=true&
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d106341-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=template&id=edf62584&
|
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d106341-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=template&id=6aea3512&
|
||||||
var Playervue_type_template_id_edf62584_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Modal',_vm._g(_vm._b({attrs:{"draggable":"","title":_vm.streamPath},on:{"on-ok":_vm.onClosePreview,"on-cancel":_vm.onClosePreview}},'Modal',_vm.$attrs,false),_vm.$listeners),[_c('video',{ref:"webrtc",attrs:{"width":"488","height":"275","autoplay":"","muted":"","controls":""},domProps:{"srcObject":_vm.stream,"muted":true}}),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[(_vm.remoteSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.remoteSDPURL,"download":"remoteSDP.txt"},slot:"content"},[_vm._v("remoteSDP")])]):_vm._e(),(_vm.localSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.localSDPURL,"download":"localSDP.txt"},slot:"content"},[_vm._v("localSDP")])]):_vm._e()],1)])}
|
var Playervue_type_template_id_6aea3512_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Modal',_vm._g(_vm._b({attrs:{"draggable":"","title":_vm.streamPath},on:{"on-ok":_vm.onClosePreview,"on-cancel":_vm.onClosePreview}},'Modal',_vm.$attrs,false),_vm.$listeners),[_c('video',{ref:"webrtc",attrs:{"width":"488","height":"275","autoplay":"","muted":"","controls":""},domProps:{"srcObject":_vm.stream,"muted":true}}),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[(_vm.remoteSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.remoteSDPURL,"download":"remoteSDP.txt"},slot:"content"},[_vm._v("remoteSDP")])]):_vm._e(),(_vm.localSDP)?_c('mu-badge',[_c('a',{attrs:{"slot":"content","href":_vm.localSDPURL,"download":"localSDP.txt"},slot:"content"},[_vm._v("localSDP")])]):_vm._e()],1)])}
|
||||||
var Playervue_type_template_id_edf62584_staticRenderFns = []
|
var Playervue_type_template_id_6aea3512_staticRenderFns = []
|
||||||
|
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=template&id=edf62584&
|
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=template&id=6aea3512&
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=script&lang=js&
|
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/Player.vue?vue&type=script&lang=js&
|
||||||
//
|
//
|
||||||
@@ -272,56 +272,57 @@ let pc = null;
|
|||||||
streamPath: ""
|
streamPath: ""
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
|
||||||
async play(streamPath) {
|
methods: {
|
||||||
pc = new RTCPeerConnection();
|
async play(streamPath) {
|
||||||
this.streamPath = streamPath;
|
pc = new RTCPeerConnection();
|
||||||
pc.onsignalingstatechange = e => {
|
this.streamPath = streamPath;
|
||||||
console.log(e);
|
pc.onsignalingstatechange = e => {
|
||||||
};
|
//console.log(e);
|
||||||
pc.oniceconnectionstatechange = e => {
|
};
|
||||||
this.$toast.info(pc.iceConnectionState);
|
pc.oniceconnectionstatechange = e => {
|
||||||
this.iceConnectionState = pc.iceConnectionState;
|
this.$toast.info(pc.iceConnectionState);
|
||||||
};
|
this.iceConnectionState = pc.iceConnectionState;
|
||||||
pc.onicecandidate = event => {};
|
};
|
||||||
const result = await this.ajax({
|
pc.onicecandidate = event => {
|
||||||
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
console.log(event)
|
||||||
dataType: "json"
|
};
|
||||||
});
|
let result = await this.ajax({
|
||||||
if (result.errmsg) {
|
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
||||||
this.$toast.error(result.errmsg);
|
dataType: "json"
|
||||||
return;
|
});
|
||||||
} else {
|
if (result.errmsg) {
|
||||||
this.remoteSDP = result.sdp;
|
this.$toast.error(result.errmsg);
|
||||||
this.remoteSDPURL = URL.createObjectURL(
|
return;
|
||||||
new Blob([this.remoteSDP], { type: "text/plain" })
|
} else {
|
||||||
);
|
this.remoteSDP = result.sdp;
|
||||||
}
|
this.remoteSDPURL = URL.createObjectURL(new Blob([this.remoteSDP], { type: "text/plain" }));
|
||||||
pc.ontrack = event => {
|
}
|
||||||
console.log(event);
|
pc.ontrack = event => {
|
||||||
if (event.streams[0].id == "monibuca") this.stream = event.streams[0];
|
// console.log(event);
|
||||||
};
|
if (event.track.kind == "video")
|
||||||
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
this.stream = event.streams[0];
|
||||||
await pc.setLocalDescription(await pc.createAnswer());
|
};
|
||||||
this.localSDP = pc.localDescription.sdp;
|
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
||||||
this.localSDPURL = URL.createObjectURL(
|
await pc.setLocalDescription(await pc.createAnswer());
|
||||||
new Blob([this.localSDP], { type: "text/plain" })
|
this.localSDP = pc.localDescription.sdp;
|
||||||
);
|
this.localSDPURL = URL.createObjectURL(
|
||||||
result = await this.ajax({
|
new Blob([this.localSDP], { type: "text/plain" })
|
||||||
type: "POST",
|
);
|
||||||
processData: false,
|
result = await this.ajax({
|
||||||
data: JSON.stringify(pc.localDescription),
|
type: "POST",
|
||||||
url: "/webrtc/play?streamPath=" + this.streamPath,
|
processData: false,
|
||||||
dataType: "json"
|
data: JSON.stringify(pc.localDescription.toJSON()),
|
||||||
});
|
url: "/webrtc/play?streamPath=" + this.streamPath,
|
||||||
if (result != "success") {
|
});
|
||||||
this.$toast.error(result.errmsg || result);
|
if (result != "success") {
|
||||||
}
|
this.$toast.error(result);
|
||||||
},
|
}
|
||||||
onClosePreview() {
|
},
|
||||||
pc.close();
|
onClosePreview() {
|
||||||
|
pc.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=script&lang=js&
|
// CONCATENATED MODULE: ./src/components/Player.vue?vue&type=script&lang=js&
|
||||||
@@ -436,8 +437,8 @@ function normalizeComponent (
|
|||||||
|
|
||||||
var component = normalizeComponent(
|
var component = normalizeComponent(
|
||||||
components_Playervue_type_script_lang_js_,
|
components_Playervue_type_script_lang_js_,
|
||||||
Playervue_type_template_id_edf62584_render,
|
Playervue_type_template_id_6aea3512_render,
|
||||||
Playervue_type_template_id_edf62584_staticRenderFns,
|
Playervue_type_template_id_6aea3512_staticRenderFns,
|
||||||
false,
|
false,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
|
2
ui/dist/plugin-webrtc.umd.js.map
vendored
2
ui/dist/plugin-webrtc.umd.js.map
vendored
File diff suppressed because one or more lines are too long
2
ui/dist/plugin-webrtc.umd.min.js
vendored
2
ui/dist/plugin-webrtc.umd.min.js
vendored
File diff suppressed because one or more lines are too long
2
ui/dist/plugin-webrtc.umd.min.js.map
vendored
2
ui/dist/plugin-webrtc.umd.min.js.map
vendored
File diff suppressed because one or more lines are too long
@@ -32,55 +32,56 @@ export default {
|
|||||||
streamPath: ""
|
streamPath: ""
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
|
||||||
async play(streamPath) {
|
methods: {
|
||||||
pc = new RTCPeerConnection();
|
async play(streamPath) {
|
||||||
this.streamPath = streamPath;
|
pc = new RTCPeerConnection();
|
||||||
pc.onsignalingstatechange = e => {
|
this.streamPath = streamPath;
|
||||||
console.log(e);
|
pc.onsignalingstatechange = e => {
|
||||||
};
|
//console.log(e);
|
||||||
pc.oniceconnectionstatechange = e => {
|
};
|
||||||
this.$toast.info(pc.iceConnectionState);
|
pc.oniceconnectionstatechange = e => {
|
||||||
this.iceConnectionState = pc.iceConnectionState;
|
this.$toast.info(pc.iceConnectionState);
|
||||||
};
|
this.iceConnectionState = pc.iceConnectionState;
|
||||||
pc.onicecandidate = event => {};
|
};
|
||||||
const result = await this.ajax({
|
pc.onicecandidate = event => {
|
||||||
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
console.log(event)
|
||||||
dataType: "json"
|
};
|
||||||
});
|
let result = await this.ajax({
|
||||||
if (result.errmsg) {
|
url: "/webrtc/preparePlay?streamPath=" + this.streamPath,
|
||||||
this.$toast.error(result.errmsg);
|
dataType: "json"
|
||||||
return;
|
});
|
||||||
} else {
|
if (result.errmsg) {
|
||||||
this.remoteSDP = result.sdp;
|
this.$toast.error(result.errmsg);
|
||||||
this.remoteSDPURL = URL.createObjectURL(
|
return;
|
||||||
new Blob([this.remoteSDP], { type: "text/plain" })
|
} else {
|
||||||
);
|
this.remoteSDP = result.sdp;
|
||||||
}
|
this.remoteSDPURL = URL.createObjectURL(new Blob([this.remoteSDP], { type: "text/plain" }));
|
||||||
pc.ontrack = event => {
|
}
|
||||||
console.log(event);
|
pc.ontrack = event => {
|
||||||
if (event.streams[0].id == "monibuca") this.stream = event.streams[0];
|
// console.log(event);
|
||||||
};
|
if (event.track.kind == "video")
|
||||||
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
this.stream = event.streams[0];
|
||||||
await pc.setLocalDescription(await pc.createAnswer());
|
};
|
||||||
this.localSDP = pc.localDescription.sdp;
|
await pc.setRemoteDescription(new RTCSessionDescription(result));
|
||||||
this.localSDPURL = URL.createObjectURL(
|
await pc.setLocalDescription(await pc.createAnswer());
|
||||||
new Blob([this.localSDP], { type: "text/plain" })
|
this.localSDP = pc.localDescription.sdp;
|
||||||
);
|
this.localSDPURL = URL.createObjectURL(
|
||||||
result = await this.ajax({
|
new Blob([this.localSDP], { type: "text/plain" })
|
||||||
type: "POST",
|
);
|
||||||
processData: false,
|
result = await this.ajax({
|
||||||
data: JSON.stringify(pc.localDescription),
|
type: "POST",
|
||||||
url: "/webrtc/play?streamPath=" + this.streamPath,
|
processData: false,
|
||||||
dataType: "json"
|
data: JSON.stringify(pc.localDescription.toJSON()),
|
||||||
});
|
url: "/webrtc/play?streamPath=" + this.streamPath,
|
||||||
if (result != "success") {
|
});
|
||||||
this.$toast.error(result.errmsg || result);
|
if (result != "success") {
|
||||||
}
|
this.$toast.error(result);
|
||||||
},
|
}
|
||||||
onClosePreview() {
|
},
|
||||||
pc.close();
|
onClosePreview() {
|
||||||
|
pc.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
Reference in New Issue
Block a user