Pārlūkot izejas kodu

Fixes shifted audio level glow on thumbnails. Fixes missing audio level indicator on large video avatar.

j8
yanas 9 gadus atpakaļ
vecāks
revīzija
e7e8dc3457

+ 2
- 2
css/videolayout_default.css Parādīt failu

@@ -420,7 +420,7 @@
420 420
     position: absolute;
421 421
     top: 0px;
422 422
     left: 0px;
423
-    z-index: 1;
423
+    z-index: 2;
424 424
     visibility: inherit;
425 425
 }
426 426
 
@@ -435,7 +435,7 @@
435 435
     margin: auto;
436 436
     position: relative;
437 437
     border-radius: 50px;
438
-    z-index: 2;
438
+    z-index: 3;
439 439
     visibility: inherit;
440 440
 }
441 441
 

+ 22
- 14
modules/UI/audio_levels/AudioLevels.js Parādīt failu

@@ -50,7 +50,8 @@ function drawAudioLevelCanvas(id, audioLevel) {
50 50
          * been observed to pile into the console, strain the CPU.
51 51
          */
52 52
         if (audioLevelCanvasOrig) {
53
-            audioLevelCanvasCache[id] = CanvasUtil.cloneCanvas(audioLevelCanvasOrig);
53
+            audioLevelCanvasCache[id]
54
+                = CanvasUtil.cloneCanvas(audioLevelCanvasOrig);
54 55
         }
55 56
     }
56 57
 
@@ -68,13 +69,14 @@ function drawAudioLevelCanvas(id, audioLevel) {
68 69
 
69 70
     if (shadowLevel > 0) {
70 71
         // drawContext, x, y, w, h, r, shadowColor, shadowLevel
71
-        CanvasUtil.drawRoundRectGlow(drawContext,
72
-                                     interfaceConfig.CANVAS_EXTRA / 2, interfaceConfig.CANVAS_EXTRA / 2,
73
-                                     canvas.width - interfaceConfig.CANVAS_EXTRA,
74
-                                     canvas.height - interfaceConfig.CANVAS_EXTRA,
75
-                                     interfaceConfig.CANVAS_RADIUS,
76
-                                     interfaceConfig.SHADOW_COLOR,
77
-                                     shadowLevel);
72
+        CanvasUtil.drawRoundRectGlow(
73
+            drawContext,
74
+            interfaceConfig.CANVAS_EXTRA / 2, interfaceConfig.CANVAS_EXTRA / 2,
75
+            canvas.width - interfaceConfig.CANVAS_EXTRA,
76
+            canvas.height - interfaceConfig.CANVAS_EXTRA,
77
+            interfaceConfig.CANVAS_RADIUS,
78
+            interfaceConfig.SHADOW_COLOR,
79
+            shadowLevel);
78 80
     }
79 81
 }
80 82
 
@@ -88,11 +90,14 @@ function getShadowLevel (audioLevel) {
88 90
     let shadowLevel = 0;
89 91
 
90 92
     if (audioLevel <= 0.3) {
91
-        shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*(audioLevel/0.3));
93
+        shadowLevel
94
+            = Math.round(interfaceConfig.CANVAS_EXTRA/2*(audioLevel/0.3));
92 95
     } else if (audioLevel <= 0.6) {
93
-        shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3));
96
+        shadowLevel
97
+            = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3));
94 98
     } else {
95
-        shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4));
99
+        shadowLevel
100
+            = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4));
96 101
     }
97 102
 
98 103
     return shadowLevel;
@@ -203,7 +208,8 @@ const AudioLevels = {
203 208
     },
204 209
 
205 210
     updateDominantSpeakerAudioLevel (audioLevel) {
206
-        if($("#domiantSpeaker").css("visibility") == "hidden" || ASDrawContext === null) {
211
+        if($("#dominantSpeaker").css("visibility") == "hidden"
212
+            || ASDrawContext === null) {
207 213
             return;
208 214
         }
209 215
 
@@ -214,7 +220,6 @@ const AudioLevels = {
214 220
 
215 221
         ASDrawContext.shadowBlur = getShadowLevel(audioLevel);
216 222
 
217
-
218 223
         // Fill the shape.
219 224
         ASDrawContext.fill();
220 225
     },
@@ -223,7 +228,10 @@ const AudioLevels = {
223 228
         let canvasWidth = thumbWidth + interfaceConfig.CANVAS_EXTRA;
224 229
         let canvasHeight = thumbHeight + interfaceConfig.CANVAS_EXTRA;
225 230
 
226
-        BottomToolbar.getThumbs().children('canvas').width(canvasWidth).height(canvasHeight);
231
+        BottomToolbar.getThumbs().children('canvas').each(function () {
232
+            $(this).attr('width', canvasWidth);
233
+            $(this).attr('height', canvasHeight);
234
+        });
227 235
 
228 236
         Object.keys(audioLevelCanvasCache).forEach(function (id) {
229 237
             audioLevelCanvasCache[id].width = canvasWidth;

+ 3
- 2
modules/UI/videolayout/LargeVideo.js Parādīt failu

@@ -418,13 +418,14 @@ export default class LargeVideoManager {
418 418
             // change the avatar url on large
419 419
             this.updateAvatar(Avatar.getAvatarUrl(id));
420 420
 
421
-            let isVideoMuted = stream? stream.isMuted() : true;
421
+            let isVideoMuted = stream ? stream.isMuted() : true;
422 422
 
423 423
             // show the avatar on large if needed
424 424
             this.videoContainer.showAvatar(isVideoMuted);
425 425
 
426 426
             // do not show stream if video is muted
427
-            let promise = isVideoMuted ? Promise.resolve() : this.videoContainer.show();
427
+            let promise
428
+                = isVideoMuted ? Promise.resolve() : this.videoContainer.show();
428 429
 
429 430
             // resolve updateLargeVideo promise after everything is done
430 431
             promise.then(resolve);

+ 2
- 1
modules/UI/videolayout/VideoLayout.js Parādīt failu

@@ -150,7 +150,8 @@ var VideoLayout = {
150 150
         this.onVideoTypeChanged(localId, stream.videoType);
151 151
 
152 152
         let {thumbWidth, thumbHeight} = this.calculateThumbnailSize();
153
-        AudioLevels.updateAudioLevelCanvas(null, thumbWidth, thumbHeight);
153
+        AudioLevels.updateAudioLevelCanvas(
154
+            null, thumbWidth, thumbHeight);
154 155
 
155 156
         if (!stream.isMuted()) {
156 157
             localVideoThumbnail.changeVideo(stream);

Notiek ielāde…
Atcelt
Saglabāt