Android: Generate JNI code for remaining classes in sdk/android
Bug: webrtc:8278 Change-Id: I20a4388ab347d8745d0edde808f7a0b610f077f9 Reviewed-on: https://webrtc-review.googlesource.com/31484 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21227}
This commit is contained in:
committed by
Commit Bot
parent
1a8fffbb01
commit
9060eb1528
@ -20,6 +20,7 @@ import android.opengl.EGLExt;
|
||||
import android.opengl.EGLSurface;
|
||||
import android.os.Build;
|
||||
import android.view.Surface;
|
||||
import org.webrtc.EglBase;
|
||||
|
||||
/**
|
||||
* Holds EGL state and utility methods for handling an EGL14 EGLContext, an EGLDisplay,
|
||||
@ -59,6 +60,11 @@ class EglBase14 implements EglBase {
|
||||
public Context(android.opengl.EGLContext eglContext) {
|
||||
this.egl14Context = eglContext;
|
||||
}
|
||||
|
||||
@CalledByNative("Context")
|
||||
static boolean isEgl14Context(EglBase.Context context) {
|
||||
return context instanceof EglBase14.Context;
|
||||
}
|
||||
}
|
||||
|
||||
// Create a new context with the specified config type, sharing data with sharedContext.
|
||||
|
||||
@ -45,7 +45,7 @@ class HardwareVideoEncoder implements VideoEncoder {
|
||||
|
||||
private static final int MAX_VIDEO_FRAMERATE = 30;
|
||||
|
||||
// See MAX_ENCODER_Q_SIZE in androidmediaencoder_jni.cc.
|
||||
// See MAX_ENCODER_Q_SIZE in androidmediaencoder.cc.
|
||||
private static final int MAX_ENCODER_Q_SIZE = 2;
|
||||
|
||||
private static final int MEDIA_CODEC_RELEASE_TIMEOUT_MS = 5000;
|
||||
|
||||
48
sdk/android/src/java/org/webrtc/JniHelper.java
Normal file
48
sdk/android/src/java/org/webrtc/JniHelper.java
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* This class is only used from jni_helper.cc to give some Java functionality that were not possible
|
||||
* to generate in other ways due to bugs.webrtc.org/8606 and bugs.webrtc.org/8632.
|
||||
*/
|
||||
class JniHelper {
|
||||
// TODO(bugs.webrtc.org/8632): Remove.
|
||||
@CalledByNative
|
||||
static byte[] getStringBytes(String s) {
|
||||
try {
|
||||
return s.getBytes("ISO-8859-1");
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
throw new RuntimeException("ISO-8859-1 is unsupported");
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(bugs.webrtc.org/8632): Remove.
|
||||
@CalledByNative
|
||||
static Object getStringClass() {
|
||||
return String.class;
|
||||
}
|
||||
|
||||
// TODO(bugs.webrtc.org/8606): Remove.
|
||||
@CalledByNative
|
||||
static String getKey(Map.Entry<String, String> entry) {
|
||||
return entry.getKey();
|
||||
}
|
||||
|
||||
// TODO(bugs.webrtc.org/8606): Remove.
|
||||
@CalledByNative
|
||||
static String getValue(Map.Entry<String, String> entry) {
|
||||
return entry.getValue();
|
||||
}
|
||||
}
|
||||
@ -26,6 +26,7 @@ class WrappedNativeI420Buffer implements VideoFrame.I420Buffer {
|
||||
private final int strideV;
|
||||
private final long nativeBuffer;
|
||||
|
||||
@CalledByNative
|
||||
WrappedNativeI420Buffer(int width, int height, ByteBuffer dataY, int strideY, ByteBuffer dataU,
|
||||
int strideU, ByteBuffer dataV, int strideV, long nativeBuffer) {
|
||||
this.width = width;
|
||||
|
||||
Reference in New Issue
Block a user