zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Expose AV1 encoder&decoder from Android SDK."

Browse Source 
This reverts commit fedd5029c584e9dc1352434b62a30cd8af2889d8.

Reason for revert: Speculative revert due to crashes in downstream tests on Android.

Original change's description:
> Expose AV1 encoder&decoder from Android SDK.
>
> Bug: None
> Change-Id: Ie32be36da498d4bed2a3cf51aa6abc8838e42da1
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212024
> Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
> Commit-Queue: Yura Yaroshevich <yura.yaroshevich@gmail.com>
> Cr-Commit-Position: refs/heads/master@{#33743}

TBR=alessiob@webrtc.org,mflodman@webrtc.org,yura.yaroshevich@gmail.com,xalep@webrtc.org

Change-Id: I76171087d1998b9d7573c2b86b1cf9ed65154bbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215324
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33753}
This commit is contained in:
Björn Terelius
2021-04-16 07:40:09 +00:00
committed by Commit Bot
parent 220a252de6
commit dd36198ae8
16 changed files with 20 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,14 +70,13 @@ public class DefaultVideoEncoderFactoryTest {
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
@ -86,12 +85,11 @@ public class DefaultVideoEncoderFactoryTest {
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
@ -100,13 +98,12 @@ public class DefaultVideoEncoderFactoryTest {
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"));
}
}