| Index: webrtc/sdk/android/src/jni/video_renderer_jni.cc
|
| diff --git a/webrtc/sdk/android/src/jni/video_renderer_jni.cc b/webrtc/sdk/android/src/jni/video_renderer_jni.cc
|
| index 4f6807ad1de07d92bf0eb5112ac2d28a31037d27..7156fceee8a3bb54528d4eeca75341fae631fc3c 100644
|
| --- a/webrtc/sdk/android/src/jni/video_renderer_jni.cc
|
| +++ b/webrtc/sdk/android/src/jni/video_renderer_jni.cc
|
| @@ -135,31 +135,42 @@ class JavaVideoRendererWrapper
|
| ScopedGlobalRef<jclass> j_byte_buffer_class_;
|
| };
|
|
|
| -JOW(void, VideoRenderer_freeWrappedVideoRenderer)(JNIEnv*, jclass, jlong j_p) {
|
| +JNI_FUNCTION_DECLARATION(void,
|
| + VideoRenderer_freeWrappedVideoRenderer,
|
| + JNIEnv*,
|
| + jclass,
|
| + jlong j_p) {
|
| delete reinterpret_cast<JavaVideoRendererWrapper*>(j_p);
|
| }
|
|
|
| -JOW(void, VideoRenderer_releaseNativeFrame)
|
| -(JNIEnv* jni, jclass, jlong j_frame_ptr) {
|
| +JNI_FUNCTION_DECLARATION(void,
|
| + VideoRenderer_releaseNativeFrame,
|
| + JNIEnv* jni,
|
| + jclass,
|
| + jlong j_frame_ptr) {
|
| delete reinterpret_cast<const webrtc::VideoFrame*>(j_frame_ptr);
|
| }
|
|
|
| -JOW(jlong, VideoRenderer_nativeWrapVideoRenderer)
|
| -(JNIEnv* jni, jclass, jobject j_callbacks) {
|
| +JNI_FUNCTION_DECLARATION(jlong,
|
| + VideoRenderer_nativeWrapVideoRenderer,
|
| + JNIEnv* jni,
|
| + jclass,
|
| + jobject j_callbacks) {
|
| std::unique_ptr<JavaVideoRendererWrapper> renderer(
|
| new JavaVideoRendererWrapper(jni, j_callbacks));
|
| return (jlong)renderer.release();
|
| }
|
|
|
| -JOW(void, VideoRenderer_nativeCopyPlane)
|
| -(JNIEnv* jni,
|
| - jclass,
|
| - jobject j_src_buffer,
|
| - jint width,
|
| - jint height,
|
| - jint src_stride,
|
| - jobject j_dst_buffer,
|
| - jint dst_stride) {
|
| +JNI_FUNCTION_DECLARATION(void,
|
| + VideoRenderer_nativeCopyPlane,
|
| + JNIEnv* jni,
|
| + jclass,
|
| + jobject j_src_buffer,
|
| + jint width,
|
| + jint height,
|
| + jint src_stride,
|
| + jobject j_dst_buffer,
|
| + jint dst_stride) {
|
| size_t src_size = jni->GetDirectBufferCapacity(j_src_buffer);
|
| size_t dst_size = jni->GetDirectBufferCapacity(j_dst_buffer);
|
| RTC_CHECK(src_stride >= width) << "Wrong source stride " << src_stride;
|
|
|