Revert "Expose AV1 encoder&decoder from Android SDK."
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:
committed by
Commit Bot
parent
220a252de6
commit
dd36198ae8
@ -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",
|
||||
|
||||
Reference in New Issue
Block a user