Remove libaom av1 encoder from SoftwareVideoEncoderFactory.

Bug: webrtc:13573
Change-Id: If2948cf144e0b670f4fa6fabb06e2a14b4a8e281
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/279561
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38430}

sdk/android/BUILD.gn

diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index b3f641a..6cdcec8 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -527,7 +527,6 @@
     deps = [
       ":base_java",
       ":dav1d_java",
-      ":libaom_av1_encoder_java",
       ":libvpx_vp8_java",
       ":libvpx_vp9_java",
       ":video_api_java",

sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java

diff --git a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
index c4ac229..39d874d 100644
--- a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
@@ -28,9 +28,6 @@
         && LibvpxVp9Encoder.nativeIsSupported()) {
       return new LibvpxVp9Encoder();
     }
-    if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name())) {
-      return new LibaomAv1Encoder();
-    }
 
     return null;
   }
@@ -47,7 +44,6 @@
     if (LibvpxVp9Encoder.nativeIsSupported()) {
       codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
     }
-    codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
 
     return codecs.toArray(new VideoCodecInfo[codecs.size()]);
   }

sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java

diff --git a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
index 9721cbd..14ddfe1 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
@@ -67,14 +67,13 @@
     VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, true);
     DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
     VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
-    assertEquals(5, videoCodecs.length);
+    assertEquals(4, videoCodecs.length);
     assertEquals("VP8", videoCodecs[0].name);
     assertEquals("VP9", videoCodecs[1].name);
-    assertEquals("AV1", videoCodecs[2].name);
+    assertEquals("H264", videoCodecs[2].name);
+    assertEquals("42e01f", videoCodecs[2].params.get("profile-level-id"));
     assertEquals("H264", videoCodecs[3].name);
-    assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id"));
-    assertEquals("H264", videoCodecs[4].name);
-    assertEquals("640c1f", videoCodecs[4].params.get("profile-level-id"));
+    assertEquals("640c1f", videoCodecs[3].params.get("profile-level-id"));
   }
 
   @SmallTest
@@ -83,12 +82,11 @@
     VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, false);
     DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
     VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
-    assertEquals(4, videoCodecs.length);
+    assertEquals(3, videoCodecs.length);
     assertEquals("VP8", videoCodecs[0].name);
     assertEquals("VP9", videoCodecs[1].name);
-    assertEquals("AV1", videoCodecs[2].name);
-    assertEquals("H264", videoCodecs[3].name);
-    assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id"));
+    assertEquals("H264", videoCodecs[2].name);
+    assertEquals("42e01f", videoCodecs[2].params.get("profile-level-id"));
   }
 
   @SmallTest
@@ -97,13 +95,12 @@
     VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(false, true);
     DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
     VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
-    assertEquals(5, videoCodecs.length);
+    assertEquals(4, videoCodecs.length);
     assertEquals("VP8", videoCodecs[0].name);
     assertEquals("VP9", videoCodecs[1].name);
-    assertEquals("AV1", videoCodecs[2].name);
+    assertEquals("H264", videoCodecs[2].name);
+    assertEquals("42e01f", videoCodecs[2].params.get("profile-level-id"));
     assertEquals("H264", videoCodecs[3].name);
-    assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id"));
-    assertEquals("H264", videoCodecs[4].name);
-    assertEquals("640c1f", videoCodecs[4].params.get("profile-level-id"));
+    assertEquals("640c1f", videoCodecs[3].params.get("profile-level-id"));
   }
 }