mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit fedd5029c5.

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/androidapp/res/values/arrays.xml
View file

@ -34,7 +34,6 @@
<item>VP9</item>
<item>H264 Baseline</item>
<item>H264 High</item>
<item>AV1</item>
</string-array>
<string-array name="audioCodecs">

4
examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View file

@ -95,8 +95,6 @@ public class PeerConnectionClient {
private static final String VIDEO_CODEC_H264 = "H264";
private static final String VIDEO_CODEC_H264_BASELINE = "H264 Baseline";
private static final String VIDEO_CODEC_H264_HIGH = "H264 High";
private static final String VIDEO_CODEC_AV1 = "AV1";
private static final String VIDEO_CODEC_AV1_SDP_CODEC_NAME = "AV1X";
private static final String AUDIO_CODEC_OPUS = "opus";
private static final String AUDIO_CODEC_ISAC = "ISAC";
private static final String VIDEO_CODEC_PARAM_START_BITRATE = "x-google-start-bitrate";
@ -988,8 +986,6 @@ public class PeerConnectionClient {
return VIDEO_CODEC_VP8;
case VIDEO_CODEC_VP9:
return VIDEO_CODEC_VP9;
case VIDEO_CODEC_AV1:
return VIDEO_CODEC_AV1_SDP_CODEC_NAME;
case VIDEO_CODEC_H264_HIGH:
case VIDEO_CODEC_H264_BASELINE:
return VIDEO_CODEC_H264;

40
sdk/android/BUILD.gn
View file

@ -43,7 +43,6 @@ if (is_android) {
":filevideo_java",
":hwcodecs_java",
":java_audio_device_module_java",
":libaom_av1_java",
":libjingle_peerconnection_java",
":libjingle_peerconnection_metrics_default_java",
":libvpx_vp8_java",
@ -501,20 +500,6 @@ if (is_android) {
]
}
rtc_android_library("libaom_av1_java") {
visibility = [ "*" ]
sources = [
"api/org/webrtc/LibaomAv1Decoder.java",
"api/org/webrtc/LibaomAv1Encoder.java",
]
deps = [
":base_java",
":video_api_java",
":video_java",
"//rtc_base:base_java",
]
}
rtc_android_library("swcodecs_java") {
visibility = [ "*" ]
sources = [
@ -524,7 +509,6 @@ if (is_android) {
deps = [
":base_java",
":libaom_av1_java",
":libvpx_vp8_java",
":libvpx_vp9_java",
":video_api_java",
@ -841,24 +825,10 @@ if (current_os == "linux" || is_android) {
]
}
rtc_library("libaom_av1_jni") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
sources = [ "src/jni/av1_codec.cc" ]
deps = [
":base_jni",
":generated_libaom_av1_jni",
":video_jni",
"../../modules/video_coding/codecs/av1:libaom_av1_decoder",
"../../modules/video_coding/codecs/av1:libaom_av1_encoder",
]
}
rtc_library("swcodecs_jni") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
deps = [
":libaom_av1_jni",
":libvpx_vp8_jni",
":libvpx_vp9_jni",
]
@ -1294,16 +1264,6 @@ if (current_os == "linux" || is_android) {
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
generate_jni("generated_libaom_av1_jni") {
sources = [
"api/org/webrtc/LibaomAv1Decoder.java",
"api/org/webrtc/LibaomAv1Encoder.java",
]
namespace = "webrtc::jni"
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
generate_jni("generated_peerconnection_jni") {
sources = [
"api/org/webrtc/AddIceObserver.java",

9
sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
View file

@ -137,9 +137,9 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
List<VideoCodecInfo> supportedCodecInfos = new ArrayList<VideoCodecInfo>();
// Generate a list of supported codecs in order of preference:
// VP8, VP9, H264 (high profile), H264 (baseline profile) and AV1.
for (VideoCodecMimeType type : new VideoCodecMimeType[] {VideoCodecMimeType.VP8,
VideoCodecMimeType.VP9, VideoCodecMimeType.H264, VideoCodecMimeType.AV1}) {
// VP8, VP9, H264 (high profile), and H264 (baseline profile).
for (VideoCodecMimeType type : new VideoCodecMimeType[] {
VideoCodecMimeType.VP8, VideoCodecMimeType.VP9, VideoCodecMimeType.H264}) {
MediaCodecInfo codec = findCodecForType(type);
if (codec != null) {
String name = type.name();
@ -202,8 +202,6 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
return isHardwareSupportedInCurrentSdkVp9(info);
case H264:
return isHardwareSupportedInCurrentSdkH264(info);
case AV1:
return false;
}
return false;
}
@ -250,7 +248,6 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
switch (type) {
case VP8: // Fallthrough intended.
case VP9:
case AV1:
return 100;
case H264:
return 20;

22
sdk/android/api/org/webrtc/LibaomAv1Decoder.java
View file

@ -1,22 +0,0 @@
/*
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
package org.webrtc;
public class LibaomAv1Decoder extends WrappedNativeVideoDecoder {
@Override
public long createNativeVideoDecoder() {
return nativeCreateDecoder();
}
static native long nativeCreateDecoder();
static native boolean nativeIsSupported();
}

27
sdk/android/api/org/webrtc/LibaomAv1Encoder.java
View file

@ -1,27 +0,0 @@
/*
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
package org.webrtc;
public class LibaomAv1Encoder extends WrappedNativeVideoEncoder {
@Override
public long createNativeVideoEncoder() {
return nativeCreateEncoder();
}
static native long nativeCreateEncoder();
@Override
public boolean isHardwareEncoder() {
return false;
}
static native boolean nativeIsSupported();
}

6
sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
View file

@ -32,9 +32,6 @@ public class SoftwareVideoDecoderFactory implements VideoDecoderFactory {
if (codecType.getName().equalsIgnoreCase("VP9") && LibvpxVp9Decoder.nativeIsSupported()) {
return new LibvpxVp9Decoder();
}
if (codecType.getName().equalsIgnoreCase("AV1") && LibaomAv1Decoder.nativeIsSupported()) {
return new LibaomAv1Decoder();
}
return null;
}
@ -51,9 +48,6 @@ public class SoftwareVideoDecoderFactory implements VideoDecoderFactory {
if (LibvpxVp9Decoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo("VP9", new HashMap<>()));
}
if (LibaomAv1Decoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo("AV1", new HashMap<>()));
}
return codecs.toArray(new VideoCodecInfo[codecs.size()]);
}

6
sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
View file

@ -25,9 +25,6 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
if (info.name.equalsIgnoreCase("VP9") && LibvpxVp9Encoder.nativeIsSupported()) {
return new LibvpxVp9Encoder();
}
if (info.name.equalsIgnoreCase("AV1") && LibaomAv1Encoder.nativeIsSupported()) {
return new LibaomAv1Encoder();
}
return null;
}
@ -44,9 +41,6 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
if (LibvpxVp9Encoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo("VP9", new HashMap<>()));
}
if (LibaomAv1Encoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo("AV1", new HashMap<>()));
}
return codecs.toArray(new VideoCodecInfo[codecs.size()]);
}

2
sdk/android/api/org/webrtc/VideoEncoder.java
View file

@ -86,8 +86,6 @@ public interface VideoEncoder {
public class CodecSpecificInfoH264 extends CodecSpecificInfo {}
public class CodecSpecificInfoAV1 extends CodecSpecificInfo {}
/**
* Represents bitrate allocated for an encoder to produce frames. Bitrate can be divided between
* spatial and temporal layers.

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"));
}
}

2
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View file

@ -169,7 +169,7 @@ class HardwareVideoEncoder implements VideoEncoder {
* intervals, and bitrateAdjuster.
*
* @param codecName the hardware codec implementation to use
* @param codecType the type of the given video codec (eg. VP8, VP9, H264 or AV1)
* @param codecType the type of the given video codec (eg. VP8, VP9, or H264)
* @param surfaceColorFormat color format for surface mode or null if not available
* @param yuvColorFormat color format for bytebuffer mode
* @param keyFrameIntervalSec interval in seconds between key frames; used to initialize the codec

1
sdk/android/src/java/org/webrtc/MediaCodecUtils.java
View file

@ -91,7 +91,6 @@ class MediaCodecUtils {
switch (type) {
case VP8:
case VP9:
case AV1:
return new HashMap<String, String>();
case H264:
return H264Utils.getDefaultH264Params(highProfile);

4
sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
View file

@ -64,8 +64,8 @@ class MediaCodecVideoDecoderFactory implements VideoDecoderFactory {
List<VideoCodecInfo> supportedCodecInfos = new ArrayList<VideoCodecInfo>();
// Generate a list of supported codecs in order of preference:
// VP8, VP9, H264 (high profile), and H264 (baseline profile).
for (VideoCodecMimeType type : new VideoCodecMimeType[] {VideoCodecMimeType.VP8,
VideoCodecMimeType.VP9, VideoCodecMimeType.H264, VideoCodecMimeType.AV1}) {
for (VideoCodecMimeType type : new VideoCodecMimeType[] {
VideoCodecMimeType.VP8, VideoCodecMimeType.VP9, VideoCodecMimeType.H264}) {
MediaCodecInfo codec = findCodecForType(type);
if (codec != null) {
String name = type.name();

3
sdk/android/src/java/org/webrtc/VideoCodecMimeType.java
View file

@ -14,8 +14,7 @@ package org.webrtc;
enum VideoCodecMimeType {
VP8("video/x-vnd.on2.vp8"),
VP9("video/x-vnd.on2.vp9"),
H264("video/avc"),
AV1("video/av01");
H264("video/avc");
private final String mimeType;

39
sdk/android/src/jni/av1_codec.cc
View file

@ -1,39 +0,0 @@
/*
* Copyright 2021 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <jni.h>
#include "modules/video_coding/codecs/av1/libaom_av1_decoder.h"
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Decoder_jni.h"
#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Encoder_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
static jlong JNI_LibaomAv1Encoder_CreateEncoder(JNIEnv* jni) {
return jlongFromPointer(webrtc::CreateLibaomAv1Encoder().release());
}
static jboolean JNI_LibaomAv1Encoder_IsSupported(JNIEnv* jni) {
return webrtc::kIsLibaomAv1EncoderSupported;
}
static jlong JNI_LibaomAv1Decoder_CreateDecoder(JNIEnv* jni) {
return jlongFromPointer(webrtc::CreateLibaomAv1Decoder().release());
}
static jboolean JNI_LibaomAv1Decoder_IsSupported(JNIEnv* jni) {
return webrtc::kIsLibaomAv1DecoderSupported;
}
} // namespace jni
} // namespace webrtc

19
sdk/android/src/jni/video_codec_info.cc
View file

@ -19,33 +19,18 @@ namespace jni {
SdpVideoFormat VideoCodecInfoToSdpVideoFormat(JNIEnv* jni,
const JavaRef<jobject>& j_info) {
std::string codecName =
JavaToNativeString(jni, Java_VideoCodecInfo_getName(jni, j_info));
std::string sdpCodecName;
if (codecName == "AV1") {
// TODO(yyaroshevich): Undo mapping once AV1 sdp name is standardized
sdpCodecName = "AV1X";
} else {
sdpCodecName = codecName;
}
return SdpVideoFormat(
sdpCodecName,
JavaToNativeString(jni, Java_VideoCodecInfo_getName(jni, j_info)),
JavaToNativeStringMap(jni, Java_VideoCodecInfo_getParams(jni, j_info)));
}
ScopedJavaLocalRef<jobject> SdpVideoFormatToVideoCodecInfo(
JNIEnv* jni,
const SdpVideoFormat& format) {
std::string codecName;
if (format.name == "AV1X" || format.name == "AV1") {
codecName = "AV1";
} else {
codecName = format.name;
}
ScopedJavaLocalRef<jobject> j_params =
NativeToJavaStringMap(jni, format.parameters);
return Java_VideoCodecInfo_Constructor(
jni, NativeToJavaString(jni, codecName), j_params);
jni, NativeToJavaString(jni, format.name), j_params);
}
} // namespace jni