Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
awrtc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Кубота
awrtc
Commits
16e88d0d
Commit
16e88d0d
authored
Oct 01, 2021
by
Иван Кубота
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
connection message, connect buttons
parent
f8bd91c5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
CallScreen.js
build/view/CallScreen.js
+35
-0
videoinputapp.ts
src/apps/videoinputapp.ts
+2
-4
No files found.
build/view/CallScreen.js
View file @
16e88d0d
...
@@ -229,6 +229,22 @@ Screen.Conference = function() {
...
@@ -229,6 +229,22 @@ Screen.Conference = function() {
window
.
instances
.
push
(
RTCinstance
);
window
.
instances
.
push
(
RTCinstance
);
RTCinstance
.
mUiRemoteVideoParent
=
currentCameraID
?
null
:
remoteVideoEl
;
RTCinstance
.
mUiRemoteVideoParent
=
currentCameraID
?
null
:
remoteVideoEl
;
var
slots
=
{
RemoveUser
:
{
1
:
0
,
2
:
1
},
OfficeUser
:
{
1
:
2
,
2
:
3
}
};
RTCinstance
.
connectMessage
=
()
=>
{
var
slot
=
slots
[
store
.
get
(
'userRole'
)][
store
.
get
(
'guestPosition'
)];
debugger
return
{
"roomSlot"
:
slot
,
"webCam"
:
cameras
[
currentCameraID
%
3
]
}
};
var
selfieSegmentation
=
new
SelfieSegmentation
(
{
var
selfieSegmentation
=
new
SelfieSegmentation
(
{
locateFile
:
(
file
)
=>
{
locateFile
:
(
file
)
=>
{
return
`https://cdn.jsdelivr.net/npm/@mediapipe/selfie_segmentation/
${
file
}
`
;
return
`https://cdn.jsdelivr.net/npm/@mediapipe/selfie_segmentation/
${
file
}
`
;
...
@@ -294,6 +310,25 @@ Screen.Conference = function() {
...
@@ -294,6 +310,25 @@ Screen.Conference = function() {
generateCameraUI()*/
generateCameraUI()*/
),
),
D
.
div
({
cls
:
[
'bottom-buttons'
,
{
hidden
:
Store
.
NOT
(
store
.
val
(
'callScreenCamerasTune'
))
}]},
D
.
h
(
'button'
,
{
cls
:
[
'button primary'
,
{
disabled
:
Store
.
NOT
(
store
.
val
(
'guestPosition'
))}],
onclick
:
()
=>
{
store
.
set
(
'connection'
,
true
)
}
},
'Ready to connect'
),
D
.
h
(
'button'
,
{
cls
:
[
'button orange'
,
{
hidden
:
/*isConnected*/
false
}],
onclick
:
()
=>
{
store
.
set
(
'connection'
,
false
);
Screen
.
show
(
'Main'
,
true
);
}},
'Exit to main menu'
)
),
window
.
addACameraBtn
=
D
.
h
(
'button'
,
{
cls
:
[
'button primary hidden'
,
{
hidden
:
Store
.
OR
(
isConnected
,
tooMuchUsers
)}],
window
.
addACameraBtn
=
D
.
h
(
'button'
,
{
cls
:
[
'button primary hidden'
,
{
hidden
:
Store
.
OR
(
isConnected
,
tooMuchUsers
)}],
onclick
:
()
=>
{
onclick
:
()
=>
{
usersBlock
.
appendChild
(
generateCameraUI
())
usersBlock
.
appendChild
(
generateCameraUI
())
...
...
src/apps/videoinputapp.ts
View file @
16e88d0d
...
@@ -19,6 +19,7 @@ export class VideoInputApp {
...
@@ -19,6 +19,7 @@ export class VideoInputApp {
private
mIsRunning
=
false
;
private
mIsRunning
=
false
;
public
___id
:
string
;
public
___id
:
string
;
public
connectMessage
:
any
;
public
constructor
()
{
public
constructor
()
{
this
.
mNetConfig
.
IceServers
=
[
this
.
mNetConfig
.
IceServers
=
[
...
@@ -217,10 +218,7 @@ export class VideoInputApp {
...
@@ -217,10 +218,7 @@ export class VideoInputApp {
let
messageArgs
=
args
as
awrtc
.
MessageEventArgs
;
let
messageArgs
=
args
as
awrtc
.
MessageEventArgs
;
this
.
mCall
.
Send
(
JSON
.
stringify
({
this
.
mCall
.
Send
(
JSON
.
stringify
(
this
.
connectMessage
()),
messageArgs
.
Reliable
,
messageArgs
.
ConnectionId
);
userId
:
store
.
get
(
'userRole'
+
this
.
___id
),
webCam
:
store
.
get
(
'webcam'
+
this
.
___id
)
}),
messageArgs
.
Reliable
,
messageArgs
.
ConnectionId
);
/* this.mCall.SendData(JSON.stringify({
/* this.mCall.SendData(JSON.stringify({
userId: store.get('userRole'+this.___id),
userId: store.get('userRole'+this.___id),
webCam: store.get('webcam'+this.___id)
webCam: store.get('webcam'+this.___id)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment