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

Rename corresponding libaom_av1_encoder_if_supported java buildtargets.

Browse Source 
This is in preparation to introduce new java buildtargets that will use the `libaom_av1_encoder` buildtarget instead.

bug: webrtc:13573
Change-Id: I23e80653943ede576657acc17bcc5602cb0a4d5d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/254540
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36171}
This commit is contained in:
philipel
2022-03-10 10:51:49 +01:00
committed by WebRTC LUCI CQ
parent c2a2bef4f7
commit 09d488b352
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/android/BUILD.gn
View File

@ -503,7 +503,7 @@ if (is_android) {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"api/org/webrtc/LibaomAv1Decoder.java", "api/org/webrtc/LibaomAv1Decoder.java",
"api/org/webrtc/LibaomAv1Encoder.java", "api/org/webrtc/LibaomAv1EncoderIfSupported.java",
] ]
deps = [ deps = [
":base_java", ":base_java",
@ -848,13 +848,13 @@ if (current_os == "linux" || is_android) {
] ]
} }
rtc_library("libaom_av1_jni") { rtc_library("libaom_av1_jni_if_supported") {
visibility = [ "*" ] visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] allow_poison = [ "software_video_codecs" ]
sources = [ "src/jni/libaom_av1_codec.cc" ] sources = [ "src/jni/libaom_av1_codec.cc" ]
deps = [ deps = [
":base_jni", ":base_jni",
":generated_libaom_av1_jni", ":generated_libaom_av1_jni_if_supported",
":video_jni", ":video_jni",
"../../modules/video_coding/codecs/av1:libaom_av1_decoder", "../../modules/video_coding/codecs/av1:libaom_av1_decoder",
"../../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported", "../../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported",
@ -877,7 +877,7 @@ if (current_os == "linux" || is_android) {
visibility = [ "*" ] visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] allow_poison = [ "software_video_codecs" ]
deps = [ deps = [
":libaom_av1_jni", ":libaom_av1_jni_if_supported",
":libvpx_vp8_jni", ":libvpx_vp8_jni",
":libvpx_vp9_jni", ":libvpx_vp9_jni",
] ]
@ -1313,10 +1313,10 @@ if (current_os == "linux" || is_android) {
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
} }
generate_jni("generated_libaom_av1_jni") { generate_jni("generated_libaom_av1_jni_if_supported") {
sources = [ sources = [
"api/org/webrtc/LibaomAv1Decoder.java", "api/org/webrtc/LibaomAv1Decoder.java",
"api/org/webrtc/LibaomAv1Encoder.java", "api/org/webrtc/LibaomAv1EncoderIfSupported.java",
] ]
namespace = "webrtc::jni" namespace = "webrtc::jni"

2
sdk/android/api/org/webrtc/LibaomAv1Encoder.java → sdk/android/api/org/webrtc/LibaomAv1EncoderIfSupported.java
View File

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
public class LibaomAv1Encoder extends WrappedNativeVideoEncoder { public class LibaomAv1EncoderIfSupported extends WrappedNativeVideoEncoder {
@Override @Override
public long createNativeVideoEncoder() { public long createNativeVideoEncoder() {
return nativeCreateEncoder(); return nativeCreateEncoder();

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

@ -29,8 +29,8 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
return new LibvpxVp9Encoder(); return new LibvpxVp9Encoder();
} }
if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name()) if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name())
&& LibaomAv1Encoder.nativeIsSupported()) { && LibaomAv1EncoderIfSupported.nativeIsSupported()) {
return new LibaomAv1Encoder(); return new LibaomAv1EncoderIfSupported();
} }
return null; return null;
@ -48,7 +48,7 @@ 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<>()));
} }
if (LibaomAv1Encoder.nativeIsSupported()) { if (LibaomAv1EncoderIfSupported.nativeIsSupported()) {
codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>())); codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
} }

8
sdk/android/src/jni/libaom_av1_codec.cc
View File

@ -12,19 +12,19 @@
#include "modules/video_coding/codecs/av1/libaom_av1_decoder.h" #include "modules/video_coding/codecs/av1/libaom_av1_decoder.h"
#include "modules/video_coding/codecs/av1/libaom_av1_encoder_supported.h" #include "modules/video_coding/codecs/av1/libaom_av1_encoder_supported.h"
#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Decoder_jni.h" #include "sdk/android/generated_libaom_av1_jni_if_supported/LibaomAv1Decoder_jni.h"
#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Encoder_jni.h" #include "sdk/android/generated_libaom_av1_jni_if_supported/LibaomAv1EncoderIfSupported_jni.h"
#include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc { namespace webrtc {
namespace jni { namespace jni {
static jlong JNI_LibaomAv1Encoder_CreateEncoder(JNIEnv* jni) { static jlong JNI_LibaomAv1EncoderIfSupported_CreateEncoder(JNIEnv* jni) {
return jlongFromPointer( return jlongFromPointer(
webrtc::CreateLibaomAv1EncoderIfSupported().release()); webrtc::CreateLibaomAv1EncoderIfSupported().release());
} }
static jboolean JNI_LibaomAv1Encoder_IsSupported(JNIEnv* jni) { static jboolean JNI_LibaomAv1EncoderIfSupported_IsSupported(JNIEnv* jni) {
return webrtc::kIsLibaomAv1EncoderSupported; return webrtc::kIsLibaomAv1EncoderSupported;
} }