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

Use Environment propagated through android sdk

Browse source 
This way VP8Decoder and DecoderFallback would use propagated instead of global field trials.

Bug: webrtc:15791, webrtc:10335
Change-Id: I5ad5fae38f5b9379bc6376334562c154fbc56e39
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340040
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41763}
This commit is contained in:
Danil Chapovalov 2024-02-19 14:05:27 +01:00 committed by WebRTC LUCI CQ
parent bde80e3c0e
commit 0355f455a4
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sdk/android/BUILD.gn
View file

@ -858,6 +858,7 @@ if (current_os == "linux" || is_android) {
":base_jni",
":generated_libvpx_vp8_jni",
":video_jni",
"../../api/environment",
"../../modules/video_coding:webrtc_vp8",
]
}

4
sdk/android/api/org/webrtc/LibvpxVp8Decoder.java
View file

@ -13,8 +13,8 @@ package org.webrtc;
public class LibvpxVp8Decoder extends WrappedNativeVideoDecoder {
@Override
public long createNative(long webrtcEnvRef) {
return nativeCreateDecoder();
return nativeCreateDecoder(webrtcEnvRef);
}
static native long nativeCreateDecoder();
static native long nativeCreateDecoder(long webrtcEnvRef);
}

6
sdk/android/src/jni/video_decoder_fallback.cc
View file

@ -10,6 +10,7 @@
#include <jni.h>
#include "api/environment/environment.h"
#include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
#include "sdk/android/generated_video_jni/VideoDecoderFallback_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
@ -29,8 +30,9 @@ static jlong JNI_VideoDecoderFallback_Create(
JavaToNativeVideoDecoder(jni, j_primary_decoder, j_webrtc_env_ref);
VideoDecoder* native_wrapper =
CreateVideoDecoderSoftwareFallbackWrapper(std::move(fallback_decoder),
std::move(primary_decoder))
CreateVideoDecoderSoftwareFallbackWrapper(
*reinterpret_cast<const Environment*>(j_webrtc_env_ref),
std::move(fallback_decoder), std::move(primary_decoder))
.release();
return NativeToJavaPointer(native_wrapper);

8
sdk/android/src/jni/vp8_codec.cc
View file

@ -10,6 +10,7 @@
#include <jni.h>
#include "api/environment/environment.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Decoder_jni.h"
#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Encoder_jni.h"
@ -22,8 +23,11 @@ static jlong JNI_LibvpxVp8Encoder_CreateEncoder(JNIEnv* jni) {
return jlongFromPointer(VP8Encoder::Create().release());
}
static jlong JNI_LibvpxVp8Decoder_CreateDecoder(JNIEnv* jni) {
return jlongFromPointer(VP8Decoder::Create().release());
static jlong JNI_LibvpxVp8Decoder_CreateDecoder(JNIEnv* jni,
jlong j_webrtc_env_ref) {
return NativeToJavaPointer(
CreateVp8Decoder(*reinterpret_cast<const Environment*>(j_webrtc_env_ref))
.release());
}
} // namespace jni