瀏覽代碼

Fixes issue with obtaining audio/video permissions when simulcast is disabled.

j8
hristoterezov 10 年之前
父節點
當前提交
efc161dacd
共有 3 個檔案被更改,包括 14 行新增4 行删除
  1. 12
    1
      libs/modules/RTC.bundle.js
  2. 1
    2
      libs/modules/statistics.bundle.js
  3. 1
    1
      modules/RTC/RTCUtils.js

+ 12
- 1
libs/modules/RTC.bundle.js 查看文件

321
  * @constructor
321
  * @constructor
322
  */
322
  */
323
 function MediaStream(data, sid, ssrc, eventEmmiter, browser) {
323
 function MediaStream(data, sid, ssrc, eventEmmiter, browser) {
324
+
325
+    // XXX(gp) to minimize headaches in the future, we should build our
326
+    // abstractions around tracks and not streams. ORTC is track based API.
327
+    // Mozilla expects m-lines to represent media tracks.
328
+    //
329
+    // Practically, what I'm saying is that we should have a MediaTrack class
330
+    // and not a MediaStream class.
331
+    //
332
+    // Also, we should be able to associate multiple SSRCs with a MediaTrack as
333
+    // a track might have an associated RTX and FEC sources.
334
+
324
     this.sid = sid;
335
     this.sid = sid;
325
     this.stream = data.stream;
336
     this.stream = data.stream;
326
     this.peerjid = data.peerjid;
337
     this.peerjid = data.peerjid;
727
                 });
738
                 });
728
         } else {
739
         } else {
729
 
740
 
730
-            RTCUtils.getUserMedia(constraints,
741
+            this.getUserMedia(constraints,
731
                 function (stream) {
742
                 function (stream) {
732
                     console.log('onUserMediaSuccess');
743
                     console.log('onUserMediaSuccess');
733
                     success_callback(stream);
744
                     success_callback(stream);

+ 1
- 2
libs/modules/statistics.bundle.js
文件差異過大導致無法顯示
查看文件


+ 1
- 1
modules/RTC/RTCUtils.js 查看文件

245
                 });
245
                 });
246
         } else {
246
         } else {
247
 
247
 
248
-            RTCUtils.getUserMedia(constraints,
248
+            this.getUserMedia(constraints,
249
                 function (stream) {
249
                 function (stream) {
250
                     console.log('onUserMediaSuccess');
250
                     console.log('onUserMediaSuccess');
251
                     success_callback(stream);
251
                     success_callback(stream);

Loading…
取消
儲存