update zlmrtcclient.js sdk and demo

This commit is contained in:
xiongguangjie 2024-12-20 19:31:05 +08:00 committed by 夏楚
parent 5e32199661
commit 3f5923337e
5 changed files with 26 additions and 17 deletions

View File

@ -15,8 +15,8 @@ var ZLMRTCClient = (function (exports) {
CAPTURE_STREAM_FAILED: 'CAPTURE_STREAM_FAILED' CAPTURE_STREAM_FAILED: 'CAPTURE_STREAM_FAILED'
}; };
const VERSION$1 = '1.1.1'; const VERSION$1 = '1.1.2';
const BUILD_DATE = 'Tue Nov 19 2024 20:10:15 GMT+0800 (China Standard Time)'; const BUILD_DATE = 'Fri Dec 20 2024 19:12:10 GMT+0800 (China Standard Time)';
// Copyright (C) <2018> Intel Corporation // Copyright (C) <2018> Intel Corporation
// //
@ -8984,7 +8984,7 @@ var ZLMRTCClient = (function (exports) {
super('RTCPusherPlayer'); super('RTCPusherPlayer');
this.TAG = '[RTCPusherPlayer]'; this.TAG = '[RTCPusherPlayer]';
let defaults = { let defaults = {
element: '', element: null,
// html video element // html video element
debug: false, debug: false,
// if output debug log // if output debug log
@ -9198,7 +9198,7 @@ var ZLMRTCClient = (function (exports) {
}); });
}).catch(e => { }).catch(e => {
this.dispatch(Events$1.CAPTURE_STREAM_FAILED); this.dispatch(Events$1.CAPTURE_STREAM_FAILED);
//debug.error(this.TAG,e); error(this.TAG, e);
}); });
//const offerOptions = {}; //const offerOptions = {};
@ -9224,12 +9224,15 @@ var ZLMRTCClient = (function (exports) {
if (this.options.element && event.streams && event.streams.length > 0) { if (this.options.element && event.streams && event.streams.length > 0) {
this.options.element.srcObject = event.streams[0]; this.options.element.srcObject = event.streams[0];
this._remoteStream = event.streams[0]; this._remoteStream = event.streams[0];
this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, event); this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, this._remoteStream);
} else { } else {
if (this.pc.getReceivers().length == this._tracks.length) { if (this.pc.getReceivers().length == this._tracks.length) {
log(this.TAG, 'play remote stream '); log(this.TAG, 'play remote stream ');
this._remoteStream = new MediaStream(this._tracks); this._remoteStream = new MediaStream(this._tracks);
this.options.element.srcObject = this._remoteStream; if (this.options.element) {
this.options.element.srcObject = this._remoteStream;
}
this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, this._remoteStream);
} else { } else {
error(this.TAG, 'wait stream track finish'); error(this.TAG, 'wait stream track finish');
} }

File diff suppressed because one or more lines are too long

View File

@ -15,8 +15,8 @@ var ZLMRTCClient = (function (exports) {
CAPTURE_STREAM_FAILED: 'CAPTURE_STREAM_FAILED' CAPTURE_STREAM_FAILED: 'CAPTURE_STREAM_FAILED'
}; };
const VERSION$1 = '1.1.1'; const VERSION$1 = '1.1.2';
const BUILD_DATE = 'Tue Nov 19 2024 20:10:15 GMT+0800 (China Standard Time)'; const BUILD_DATE = 'Fri Dec 20 2024 19:12:10 GMT+0800 (China Standard Time)';
// Copyright (C) <2018> Intel Corporation // Copyright (C) <2018> Intel Corporation
// //
@ -8984,7 +8984,7 @@ var ZLMRTCClient = (function (exports) {
super('RTCPusherPlayer'); super('RTCPusherPlayer');
this.TAG = '[RTCPusherPlayer]'; this.TAG = '[RTCPusherPlayer]';
let defaults = { let defaults = {
element: '', element: null,
// html video element // html video element
debug: false, debug: false,
// if output debug log // if output debug log
@ -9198,7 +9198,7 @@ var ZLMRTCClient = (function (exports) {
}); });
}).catch(e => { }).catch(e => {
this.dispatch(Events$1.CAPTURE_STREAM_FAILED); this.dispatch(Events$1.CAPTURE_STREAM_FAILED);
//debug.error(this.TAG,e); error(this.TAG, e);
}); });
//const offerOptions = {}; //const offerOptions = {};
@ -9224,12 +9224,15 @@ var ZLMRTCClient = (function (exports) {
if (this.options.element && event.streams && event.streams.length > 0) { if (this.options.element && event.streams && event.streams.length > 0) {
this.options.element.srcObject = event.streams[0]; this.options.element.srcObject = event.streams[0];
this._remoteStream = event.streams[0]; this._remoteStream = event.streams[0];
this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, event); this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, this._remoteStream);
} else { } else {
if (this.pc.getReceivers().length == this._tracks.length) { if (this.pc.getReceivers().length == this._tracks.length) {
log(this.TAG, 'play remote stream '); log(this.TAG, 'play remote stream ');
this._remoteStream = new MediaStream(this._tracks); this._remoteStream = new MediaStream(this._tracks);
this.options.element.srcObject = this._remoteStream; if (this.options.element) {
this.options.element.srcObject = this._remoteStream;
}
this.dispatch(Events$1.WEBRTC_ON_REMOTE_STREAMS, this._remoteStream);
} else { } else {
error(this.TAG, 'wait stream track finish'); error(this.TAG, 'wait stream track finish');
} }

File diff suppressed because one or more lines are too long

View File

@ -240,10 +240,13 @@
console.log('ICE 协商出错'); console.log('ICE 协商出错');
}); });
player.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,function(e) player.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,function(s)
{ {
//获取到了远端流,可以播放 //获取到了远端流,可以播放,如果element 为null 或者不传,可以在这里播放(如下注释代码)
console.log('播放成功',e.streams); /*
document.getElementById('video').srcObject=s;
*/
console.log('播放成功',s);
}); });
player.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,function(e) player.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,function(e)