We currently use raw jobject in our code mixed with sporadic ScopedLocalRefFrame. This CL moves every jobject into a scoped object, either local, global, or a parameter. Also, this CL uses the JNI generation script to generate declaration stubs for the Java->C++ functions so that it no longer becomes possible to mistype them without getting compilation errors. TBR=brandt@webrtc.org Bug: webrtc:8278,webrtc:6969 Change-Id: Ic7bac74a89c11180177d65041086d7db1cdfb516 Reviewed-on: https://webrtc-review.googlesource.com/34655 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21387}
40 lines
1.4 KiB
C++
40 lines
1.4 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 "media/engine/videodecodersoftwarefallbackwrapper.h"
|
|
#include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
#include "sdk/android/src/jni/wrappednativecodec.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
static jlong JNI_VideoDecoderFallback_CreateDecoder(
|
|
JNIEnv* jni,
|
|
const JavaParamRef<jclass>&,
|
|
const JavaParamRef<jobject>& j_fallback_decoder,
|
|
const JavaParamRef<jobject>& j_primary_decoder) {
|
|
std::unique_ptr<VideoDecoder> fallback_decoder =
|
|
JavaToNativeVideoDecoder(jni, j_fallback_decoder);
|
|
std::unique_ptr<VideoDecoder> primary_decoder =
|
|
JavaToNativeVideoDecoder(jni, j_primary_decoder);
|
|
|
|
VideoDecoderSoftwareFallbackWrapper* nativeWrapper =
|
|
new VideoDecoderSoftwareFallbackWrapper(std::move(fallback_decoder),
|
|
std::move(primary_decoder));
|
|
|
|
return jlongFromPointer(nativeWrapper);
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|