From 6581d9b4d25f3865c615ce7b6cdd9490f849aafc Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 28 Jan 2018 14:28:49 +0100 Subject: [PATCH] Try to fix video for Huawei Mediapad 10 Android 7.0 Signed-off-by: Mario Danic --- .../main/java/com/nextcloud/talk/activities/CallActivity.java | 3 ++- .../nextcloud/talk/application/NextcloudTalkApplication.java | 3 ++- .../main/java/com/nextcloud/talk/webrtc/MagicWebRtcLists.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 2ef967efb..605c1cac8 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -488,7 +488,8 @@ public class CallActivity extends AppCompatActivity { cameraEnumerator = new Camera2Enumerator(this); } else { cameraEnumerator = new Camera1Enumerator(!MagicWebRtcLists.HARDWARE_ACCELERATION_VENDOR_BLACKLIST.contains(Build - .MANUFACTURER.toLowerCase())); + .MANUFACTURER.toLowerCase()) && !MagicWebRtcLists.HARDWARE_ACCELERATION_DEVICE_BLACKLIST.contains + (Build.MODEL)); } } diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java index 6791d3f99..d82084716 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java @@ -124,7 +124,8 @@ public class NextcloudTalkApplication extends MultiDexApplication { PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(this) .setEnableVideoHwAcceleration(!MagicWebRtcLists.HARDWARE_ACCELERATION_VENDOR_BLACKLIST.contains(Build - .MANUFACTURER.toLowerCase())) + .MANUFACTURER.toLowerCase()) && !MagicWebRtcLists.HARDWARE_ACCELERATION_DEVICE_BLACKLIST + .contains(Build.MODEL)) .createInitializationOptions()); } catch (UnsatisfiedLinkError e) { Log.w(TAG, e); diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRtcLists.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRtcLists.java index 626ddd42b..6fa2d4f1e 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRtcLists.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRtcLists.java @@ -57,6 +57,7 @@ public class MagicWebRtcLists { add("GT-I9100"); // Samsung Galaxy S2 add("GT-N8013"); // Samsung Galaxy Note 10.1 add("SM-G930F"); // Samsung Galaxy S7 + add("AGS-W09"); // Huawei MediaPad T3 10 }}; public static Set HARDWARE_ACCELERATION_VENDOR_BLACKLIST = new HashSet() {{