瀏覽代碼

android: revert back to SW decoding

We see tons of crashes on Samsung and Huawei devices. It's really not worth the
headache anymore.
master
Saúl Ibarra Corretgé 5 年之前
父節點
當前提交
b0e7471a83
共有 1 個文件被更改,包括 2 次插入22 次删除
  1. 2
    22
      android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

+ 2
- 22
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java 查看文件

17
 package org.jitsi.meet.sdk;
17
 package org.jitsi.meet.sdk;
18
 
18
 
19
 import android.app.Activity;
19
 import android.app.Activity;
20
-import android.os.Build;
21
 
20
 
22
 import androidx.annotation.Nullable;
21
 import androidx.annotation.Nullable;
23
 
22
 
33
 import com.facebook.react.uimanager.ViewManager;
32
 import com.facebook.react.uimanager.ViewManager;
34
 import com.facebook.soloader.SoLoader;
33
 import com.facebook.soloader.SoLoader;
35
 
34
 
36
-import com.oney.WebRTCModule.EglUtils;
37
 import com.oney.WebRTCModule.RTCVideoViewManager;
35
 import com.oney.WebRTCModule.RTCVideoViewManager;
38
 import com.oney.WebRTCModule.WebRTCModule;
36
 import com.oney.WebRTCModule.WebRTCModule;
39
 
37
 
40
-import org.webrtc.DefaultVideoDecoderFactory;
41
-import org.webrtc.EglBase;
42
 import org.webrtc.SoftwareVideoDecoderFactory;
38
 import org.webrtc.SoftwareVideoDecoderFactory;
43
 import org.webrtc.SoftwareVideoEncoderFactory;
39
 import org.webrtc.SoftwareVideoEncoderFactory;
44
-import org.webrtc.VideoDecoderFactory;
45
-import org.webrtc.VideoEncoderFactory;
46
 import org.webrtc.audio.AudioDeviceModule;
40
 import org.webrtc.audio.AudioDeviceModule;
47
 import org.webrtc.audio.JavaAudioDeviceModule;
41
 import org.webrtc.audio.JavaAudioDeviceModule;
48
 
42
 
91
             .createAudioDeviceModule();
85
             .createAudioDeviceModule();
92
         options.setAudioDeviceModule(adm);
86
         options.setAudioDeviceModule(adm);
93
 
87
 
94
-        VideoEncoderFactory videoEncoderFactory = new SoftwareVideoEncoderFactory();
95
-        VideoDecoderFactory videoDecoderFactory = new SoftwareVideoDecoderFactory();
96
-
97
-        // Initialize EGL context required for HW acceleration. We are only going to use it for
98
-        // decoding.
99
-        // NOTE: We are explicitly skipping Samsung devices because we have observed a high crash
100
-        // count on them.
101
-        if (!Build.MANUFACTURER.toLowerCase().contains("samsung")) {
102
-            EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
103
-            if (eglContext != null) {
104
-                videoDecoderFactory = new DefaultVideoDecoderFactory(eglContext);
105
-            }
106
-        }
107
-
108
-        options.setVideoDecoderFactory(videoDecoderFactory);
109
-        options.setVideoEncoderFactory(videoEncoderFactory);
88
+        options.setVideoDecoderFactory(new SoftwareVideoDecoderFactory());
89
+        options.setVideoEncoderFactory(new SoftwareVideoEncoderFactory());
110
 
90
 
111
         nativeModules.add(new WebRTCModule(reactContext, options));
91
         nativeModules.add(new WebRTCModule(reactContext, options));
112
 
92
 

Loading…
取消
儲存