4643fb7e01
This reverts commit 4f3d660f4f28a1dcdb577ab89d57830083ac883a. Reason for revert: downstream still broken Original change's description: > Reland "Remove jni_zero type aliases in jni_generator_helper.h." > > 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} > > Bug: b/319078685, b/351773023 > Change-Id: I604b0842d220d76c36b73d2d49bcefe0ee7ae14f > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356903 > Commit-Queue: Jeremy Leconte <jleconte@google.com> > Reviewed-by: Zoé Lepaul <xalep@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#42626} Bug: b/319078685, b/351773023 Change-Id: I9429789e44c82735305b2d0d90cbaa4891d79622 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357041 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Jeremy Leconte <jleconte@google.com> Owners-Override: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#42627}
50 lines
1.7 KiB
C++
50 lines
1.7 KiB
C++
/*
|
|
* Copyright 2018 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 "sdk/android/native_api/codecs/wrapper.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "sdk/android/native_api/jni/scoped_java_ref.h"
|
|
#include "sdk/android/src/jni/video_codec_info.h"
|
|
#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
|
|
#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
|
|
#include "sdk/android/src/jni/video_encoder_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
SdpVideoFormat JavaToNativeVideoCodecInfo(JNIEnv* jni, jobject codec_info) {
|
|
return jni::VideoCodecInfoToSdpVideoFormat(
|
|
jni, JavaParamRef<jobject>(jni, codec_info));
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
|
|
JNIEnv* jni,
|
|
jobject decoder_factory) {
|
|
return std::make_unique<jni::VideoDecoderFactoryWrapper>(
|
|
jni, JavaParamRef<jobject>(jni, decoder_factory));
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
|
|
JNIEnv* jni,
|
|
jobject encoder_factory) {
|
|
return std::make_unique<jni::VideoEncoderFactoryWrapper>(
|
|
jni, JavaParamRef<jobject>(jni, encoder_factory));
|
|
}
|
|
|
|
std::vector<VideoEncoder::ResolutionBitrateLimits>
|
|
JavaToNativeResolutionBitrateLimits(JNIEnv* jni,
|
|
const jobjectArray j_bitrate_limits_array) {
|
|
return jni::JavaToNativeResolutionBitrateLimits(
|
|
jni, JavaParamRef<jobjectArray>(jni, j_bitrate_limits_array));
|
|
}
|
|
|
|
} // namespace webrtc
|