admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libaom av1 encoder from SoftwareVideoEncoderFactory.

Browse Source 
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}
This commit is contained in:
philipel 2022-10-17 16:02:33 +02:00 committed by WebRTC LUCI CQ
parent 98a9efaa98
commit aafcc43440
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/android/BUILD.gn
View File

@ -527,7 +527,6 @@ if (is_android) {
deps = [ deps = [
":base_java", ":base_java",
":dav1d_java", ":dav1d_java",
":libaom_av1_encoder_java",
":libvpx_vp8_java", ":libvpx_vp8_java",
":libvpx_vp9_java", ":libvpx_vp9_java",
":video_api_java", ":video_api_java",

4
sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
View File

@ -28,9 +28,6 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
&& LibvpxVp9Encoder.nativeIsSupported()) { && LibvpxVp9Encoder.nativeIsSupported()) {
return new LibvpxVp9Encoder(); return new LibvpxVp9Encoder();
} }
if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name())) {
return new LibaomAv1Encoder();
}
return null; return null;
} }
@ -47,7 +44,6 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
if (LibvpxVp9Encoder.nativeIsSupported()) { if (LibvpxVp9Encoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>())); 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()]); return codecs.toArray(new VideoCodecInfo[codecs.size()]);
} }

25
sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
View File

@ -67,14 +67,13 @@ public class DefaultVideoEncoderFactoryTest {
VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, true); VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, true);
DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory); DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs(); VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
assertEquals(5, videoCodecs.length); assertEquals(4, videoCodecs.length);
assertEquals("VP8", videoCodecs[0].name); assertEquals("VP8", videoCodecs[0].name);
assertEquals("VP9", videoCodecs[1].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("H264", videoCodecs[3].name);
assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id")); assertEquals("640c1f", videoCodecs[3].params.get("profile-level-id"));
assertEquals("H264", videoCodecs[4].name);
assertEquals("640c1f", videoCodecs[4].params.get("profile-level-id"));
} }
@SmallTest @SmallTest
@ -83,12 +82,11 @@ public class DefaultVideoEncoderFactoryTest {
VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, false); VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(true, false);
DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory); DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs(); VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
assertEquals(4, videoCodecs.length); assertEquals(3, videoCodecs.length);
assertEquals("VP8", videoCodecs[0].name); assertEquals("VP8", videoCodecs[0].name);
assertEquals("VP9", videoCodecs[1].name); assertEquals("VP9", videoCodecs[1].name);
assertEquals("AV1", videoCodecs[2].name); assertEquals("H264", videoCodecs[2].name);
assertEquals("H264", videoCodecs[3].name); assertEquals("42e01f", videoCodecs[2].params.get("profile-level-id"));
assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id"));
} }
@SmallTest @SmallTest
@ -97,13 +95,12 @@ public class DefaultVideoEncoderFactoryTest {
VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(false, true); VideoEncoderFactory hwFactory = new CustomHardwareVideoEncoderFactory(false, true);
DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory); DefaultVideoEncoderFactory dvef = new DefaultVideoEncoderFactory(hwFactory);
VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs(); VideoCodecInfo[] videoCodecs = dvef.getSupportedCodecs();
assertEquals(5, videoCodecs.length); assertEquals(4, videoCodecs.length);
assertEquals("VP8", videoCodecs[0].name); assertEquals("VP8", videoCodecs[0].name);
assertEquals("VP9", videoCodecs[1].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("H264", videoCodecs[3].name);
assertEquals("42e01f", videoCodecs[3].params.get("profile-level-id")); assertEquals("640c1f", videoCodecs[3].params.get("profile-level-id"));
assertEquals("H264", videoCodecs[4].name);
assertEquals("640c1f", videoCodecs[4].params.get("profile-level-id"));
} }
} }