6cb7b3a424
This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343 Original change's description: > Remove jni_zero type aliases in jni_generator_helper.h. > > This CL removes some type alias from > sdk/android/src/jni/jni_generator_helper.h and make sure all the > jni_zero types are referred to using the jni_zero:: namespace. > > The goal is to remove sdk/android/src/jni/jni_generator_helper.h > in future CLs. > > Bug: b/319078685, b/351773023 > Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882 > Reviewed-by: Zoé Lepaul <xalep@webrtc.org> > Reviewed-by: Jeremy Leconte <jleconte@google.com> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#42618} No-Presubmit: True Bug: b/319078685, b/351773023 Change-Id: I605a726788ee84efdbdc9e75098b404cbd7c1f30 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358922 Reviewed-by: Zoé Lepaul <xalep@webrtc.org> Reviewed-by: Christoffer Dewerin <jansson@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42751}
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/*
|
|
* Copyright 2017 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 "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"
|
|
#include "sdk/android/src/jni/video_decoder_wrapper.h"
|
|
#include "third_party/jni_zero/jni_zero.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
static jlong JNI_VideoDecoderFallback_Create(
|
|
JNIEnv* jni,
|
|
jlong j_webrtc_env_ref,
|
|
const jni_zero::JavaParamRef<jobject>& j_fallback_decoder,
|
|
const jni_zero::JavaParamRef<jobject>& j_primary_decoder) {
|
|
std::unique_ptr<VideoDecoder> fallback_decoder =
|
|
JavaToNativeVideoDecoder(jni, j_fallback_decoder, j_webrtc_env_ref);
|
|
std::unique_ptr<VideoDecoder> primary_decoder =
|
|
JavaToNativeVideoDecoder(jni, j_primary_decoder, j_webrtc_env_ref);
|
|
|
|
VideoDecoder* native_wrapper =
|
|
CreateVideoDecoderSoftwareFallbackWrapper(
|
|
*reinterpret_cast<const Environment*>(j_webrtc_env_ref),
|
|
std::move(fallback_decoder), std::move(primary_decoder))
|
|
.release();
|
|
|
|
return NativeToJavaPointer(native_wrapper);
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|