Merge branch 'main' into dependabot/gradle/androidx.navigation-navigation-compose-2.8.3

Author: skydoves

gradle/libs.versions.toml

@@ -3,13 +3,13 @@ streamLog = "1.1.4"
 landscapist = "2.4.1"
 jvmTarget = "11"
 androidGradlePlugin = "8.6.1"
-androidxActivity = "1.9.2"
+androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
-androidxComposeBom = "2024.09.03"
+androidxComposeBom = "2024.10.00"
 androidxComposeMaterial3 = "1.0.0-alpha13"
 androidxComposeConstraintLayout = "1.0.1"
 androidxComposeNavigation = "2.8.3"
-androidxAnnotation = "1.8.2"
+androidxAnnotation = "1.9.0"
 androidxCore = "1.13.1"
 androidxLifecycle = "2.8.6"
 androidxNavigation = "2.5.0"
@@ -20,7 +20,7 @@ kotlinxCoroutines = "1.9.0"
 okhttp = "4.12.0"
 retrofit = "2.9.0"
 spotless = "6.21.0"
-androidxMacroBenchmark = "1.3.2"
+androidxMacroBenchmark = "1.3.3"
 androidxProfileinstaller = "1.4.1"
 androidxUiAutomator = "2.3.0"
 

stream-webrtc-android/api/stream-webrtc-android.api

@@ -265,6 +265,13 @@ public final class org/webrtc/DefaultAlignedVideoEncoderFactory : org/webrtc/Vid
 	public fun getSupportedCodecs ()[Lorg/webrtc/VideoCodecInfo;
 }
 
+public class org/webrtc/DefaultBlacklistedVideoDecoderFactory : org/webrtc/VideoDecoderFactory {
+	public fun <init> (Lorg/webrtc/EglBase$Context;)V
+	public fun <init> (Lorg/webrtc/EglBase$Context;Ljava/util/function/Predicate;)V
+	public fun createDecoder (Lorg/webrtc/VideoCodecInfo;)Lorg/webrtc/VideoDecoder;
+	public fun getSupportedCodecs ()[Lorg/webrtc/VideoCodecInfo;
+}
+
 public class org/webrtc/DefaultVideoDecoderFactory : org/webrtc/VideoDecoderFactory {
 	public fun <init> (Lorg/webrtc/EglBase$Context;)V
 	public fun createDecoder (Lorg/webrtc/VideoCodecInfo;)Lorg/webrtc/VideoDecoder;

stream-webrtc-android/src/main/java/org/webrtc/DefaultBlacklistedVideoDecoderFactory.java

@@ -0,0 +1,76 @@
+package org.webrtc;
+
+import androidx.annotation.Nullable;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+
+public class DefaultBlacklistedVideoDecoderFactory implements VideoDecoderFactory {
+
+  private static final String TAG = "DefaultBlacklistedVideoDecoderFactory";
+
+  private static final Predicate<VideoDecoder> defaultBlacklistedPredicate =
+    decoder -> {
+      // if the decoder is Exynos VP9, then blacklist it
+      return isExynosVP9(decoder);
+    };
+
+  private final VideoDecoderFactory hardwareVideoDecoderFactory;
+  private final VideoDecoderFactory softwareVideoDecoderFactory;
+  private final VideoDecoderFactory platformSoftwareVideoDecoderFactory;
+  private final Predicate<VideoDecoder> isHardwareDecoderBlacklisted;
+
+  public DefaultBlacklistedVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
+    this(eglContext, null);
+  }
+
+  public DefaultBlacklistedVideoDecoderFactory(
+    @Nullable EglBase.Context eglContext,
+    @Nullable Predicate<VideoDecoder> decoderBlacklistedPredicate) {
+    this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext);
+    this.softwareVideoDecoderFactory = new SoftwareVideoDecoderFactory();
+    this.platformSoftwareVideoDecoderFactory = new PlatformSoftwareVideoDecoderFactory(eglContext);
+    this.isHardwareDecoderBlacklisted = decoderBlacklistedPredicate == null
+      ? defaultBlacklistedPredicate
+      : decoderBlacklistedPredicate.or(defaultBlacklistedPredicate);
+  }
+
+  @Override
+  public VideoDecoder createDecoder(VideoCodecInfo codecType) {
+    VideoDecoder softwareDecoder = softwareVideoDecoderFactory.createDecoder(codecType);
+    VideoDecoder hardwareDecoder = hardwareVideoDecoderFactory.createDecoder(codecType);
+    if (softwareDecoder == null) {
+      softwareDecoder = platformSoftwareVideoDecoderFactory.createDecoder(codecType);
+    }
+
+    if (isHardwareDecoderBlacklisted.test(hardwareDecoder)) {
+      Logging.d(TAG, "Hardware decoder is blacklisted: " + hardwareDecoder.getImplementationName());
+      return softwareDecoder;
+    }
+
+    if (hardwareDecoder != null && softwareDecoder != null) {
+      return new VideoDecoderFallback(softwareDecoder, hardwareDecoder);
+    } else {
+      return hardwareDecoder != null ? hardwareDecoder : softwareDecoder;
+    }
+  }
+
+  @Override
+  public VideoCodecInfo[] getSupportedCodecs() {
+    Set<VideoCodecInfo> supportedCodecInfos = new HashSet<>();
+    supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
+    supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
+    supportedCodecInfos.addAll(Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
+    return supportedCodecInfos.toArray(new VideoCodecInfo[0]);
+  }
+
+  private static boolean isExynosVP9(@Nullable VideoDecoder decoder) {
+    if (decoder == null) {
+      return false;
+    }
+    final String name = decoder.getImplementationName().toLowerCase();
+    return name.contains("exynos") && name.contains("vp9");
+  }
+}