Browse Source

e2ee: remove legacy apis (#1653)

remove legacy APIs which are not even supported anymore
dev1
Philipp Hancke 4 years ago
parent
commit
ba2958c014
No account linked to committer's email address

+ 0
- 2
modules/RTC/RTC.js View File

@@ -473,8 +473,6 @@ export default class RTC extends Listenable {
473 473
         if (options.enableInsertableStreams) {
474 474
             logger.debug('E2EE - setting insertable streams constraints');
475 475
             iceConfig.encodedInsertableStreams = true;
476
-            iceConfig.forceEncodedAudioInsertableStreams = true; // legacy, to be removed in M88.
477
-            iceConfig.forceEncodedVideoInsertableStreams = true; // legacy, to be removed in M88.
478 476
         }
479 477
 
480 478
         const supportsSdpSemantics = browser.isReactNative()

+ 1
- 2
modules/browser/BrowserCapabilities.js View File

@@ -241,8 +241,7 @@ export default class BrowserCapabilities extends BrowserDetection {
241 241
      */
242 242
     supportsInsertableStreams() {
243 243
         if (!(typeof window.RTCRtpSender !== 'undefined'
244
-            && (window.RTCRtpSender.prototype.createEncodedStreams
245
-                || window.RTCRtpSender.prototype.createEncodedVideoStreams))) {
244
+            && window.RTCRtpSender.prototype.createEncodedStreams)) {
246 245
             return false;
247 246
         }
248 247
 

+ 8
- 24
modules/e2ee/E2EEContext.js View File

@@ -74,22 +74,14 @@ export default class E2EEcontext {
74 74
         }
75 75
         receiver[kJitsiE2EE] = true;
76 76
 
77
-        let receiverStreams;
78
-
79
-        if (receiver.createEncodedStreams) {
80
-            receiverStreams = receiver.createEncodedStreams();
81
-        } else {
82
-            receiverStreams = kind === 'video' ? receiver.createEncodedVideoStreams()
83
-                : receiver.createEncodedAudioStreams();
84
-        }
77
+        const receiverStreams = receiver.createEncodedStreams();
85 78
 
86 79
         this._worker.postMessage({
87 80
             operation: 'decode',
88
-            readableStream: receiverStreams.readable || receiverStreams.readableStream,
89
-            writableStream: receiverStreams.writable || receiverStreams.writableStream,
81
+            readableStream: receiverStreams.readable,
82
+            writableStream: receiverStreams.writable,
90 83
             participantId
91
-        }, [ receiverStreams.readable || receiverStreams.readableStream,
92
-            receiverStreams.writable || receiverStreams.writableStream ]);
84
+        }, [ receiverStreams.readable, receiverStreams.writable ]);
93 85
     }
94 86
 
95 87
     /**
@@ -106,22 +98,14 @@ export default class E2EEcontext {
106 98
         }
107 99
         sender[kJitsiE2EE] = true;
108 100
 
109
-        let senderStreams;
110
-
111
-        if (sender.createEncodedStreams) {
112
-            senderStreams = sender.createEncodedStreams();
113
-        } else {
114
-            senderStreams = kind === 'video' ? sender.createEncodedVideoStreams()
115
-                : sender.createEncodedAudioStreams();
116
-        }
101
+        const senderStreams = sender.createEncodedStreams();
117 102
 
118 103
         this._worker.postMessage({
119 104
             operation: 'encode',
120
-            readableStream: senderStreams.readable || senderStreams.readableStream,
121
-            writableStream: senderStreams.writable || senderStreams.writableStream,
105
+            readableStream: senderStreams.readable,
106
+            writableStream: senderStreams.writable,
122 107
             participantId
123
-        }, [ senderStreams.readable || senderStreams.readableStream,
124
-            senderStreams.writable || senderStreams.writableStream ]);
108
+        }, [ senderStreams.readable, senderStreams.writable ]);
125 109
     }
126 110
 
127 111
     /**

+ 0
- 7
modules/e2ee/Worker.js View File

@@ -4,7 +4,6 @@
4 4
 // Worker for E2EE/Insertable streams.
5 5
 
6 6
 import { Context } from './Context';
7
-import { polyFillEncodedFrameMetadata } from './utils';
8 7
 
9 8
 const contexts = new Map(); // Map participant id => context
10 9
 
@@ -23,9 +22,6 @@ onmessage = async event => {
23 22
         });
24 23
 
25 24
         readableStream
26
-            .pipeThrough(new TransformStream({
27
-                transform: polyFillEncodedFrameMetadata // M83 polyfill.
28
-            }))
29 25
             .pipeThrough(transformStream)
30 26
             .pipeTo(writableStream);
31 27
     } else if (operation === 'decode') {
@@ -40,9 +36,6 @@ onmessage = async event => {
40 36
         });
41 37
 
42 38
         readableStream
43
-            .pipeThrough(new TransformStream({
44
-                transform: polyFillEncodedFrameMetadata // M83 polyfill.
45
-            }))
46 39
             .pipeThrough(transformStream)
47 40
             .pipeTo(writableStream);
48 41
     } else if (operation === 'setKey') {

+ 0
- 19
modules/e2ee/utils.js View File

@@ -1,22 +1,3 @@
1
-/**
2
- * Polyfill RTCEncoded(Audio|Video)Frame.getMetadata() (not available in M83, available M84+).
3
- * The polyfill can not be done on the prototype since its not exposed in workers. Instead,
4
- * it is done as another transformation to keep it separate.
5
- * TODO: remove when we decode to drop M83 support.
6
- */
7
-export function polyFillEncodedFrameMetadata(encodedFrame, controller) {
8
-    if (!encodedFrame.getMetadata) {
9
-        encodedFrame.getMetadata = function() {
10
-            return {
11
-                // TODO: provide a more complete polyfill based on additionalData for video.
12
-                synchronizationSource: this.synchronizationSource,
13
-                contributingSources: this.contributingSources
14
-            };
15
-        };
16
-    }
17
-    controller.enqueue(encodedFrame);
18
-}
19
-
20 1
 /**
21 2
  * Compares two byteArrays for equality.
22 3
  */

Loading…
Cancel
Save