talk/app/webrtc/java/jni/classreferenceholder.cc - Issue 1461083002: Use EGL14 if supported on Android

Side by Side Diff: talk/app/webrtc/java/jni/classreferenceholder.cc

Issue 1461083002: Use EGL14 if supported on Android (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Changed VideoRendererGui to return an EglBase.Context. Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.cc ('k') | talk/app/webrtc/java/jni/peerconnection_jni.cc » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * libjingle	2 * libjingle

3 * Copyright 2015 Google Inc.	3 * Copyright 2015 Google Inc.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions are met:	6 * modification, are permitted provided that the following conditions are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright notice,	8 * 1. Redistributions of source code must retain the above copyright notice,

9 * this list of conditions and the following disclaimer.	9 * this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright notice,	10 * 2. Redistributions in binary form must reproduce the above copyright notice,

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 LoadClass(jni, "org/webrtc/IceCandidate");	72 LoadClass(jni, "org/webrtc/IceCandidate");

73 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)	73 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)

74 LoadClass(jni, "android/graphics/SurfaceTexture");	74 LoadClass(jni, "android/graphics/SurfaceTexture");

75 LoadClass(jni, "javax/microedition/khronos/egl/EGLContext");	75 LoadClass(jni, "javax/microedition/khronos/egl/EGLContext");

76 LoadClass(jni, "org/webrtc/CameraEnumerator");	76 LoadClass(jni, "org/webrtc/CameraEnumerator");

77 LoadClass(jni, "org/webrtc/Camera2Enumerator");	77 LoadClass(jni, "org/webrtc/Camera2Enumerator");

78 LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");	78 LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");

79 LoadClass(jni, "org/webrtc/VideoCapturerAndroid");	79 LoadClass(jni, "org/webrtc/VideoCapturerAndroid");

80 LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver");	80 LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver");

81 LoadClass(jni, "org/webrtc/EglBase");	81 LoadClass(jni, "org/webrtc/EglBase");

	82 LoadClass(jni, "org/webrtc/EglBase$Context");

82 LoadClass(jni, "org/webrtc/NetworkMonitor");	83 LoadClass(jni, "org/webrtc/NetworkMonitor");

83 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");	84 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");

84 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");	85 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");

85 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");	86 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");

86 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");	87 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");

87 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");	88 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");

88 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");	89 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");

89 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");	90 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");

90 LoadClass(jni, "org/webrtc/SurfaceTextureHelper");	91 LoadClass(jni, "org/webrtc/SurfaceTextureHelper");

91 #endif	92 #endif

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 RTC_CHECK(inserted) << "Duplicate class name: " << name;	143 RTC_CHECK(inserted) << "Duplicate class name: " << name;

143 }	144 }

144	145

145 // Returns a global reference guaranteed to be valid for the lifetime of the	146 // Returns a global reference guaranteed to be valid for the lifetime of the

146 // process.	147 // process.

147 jclass FindClass(JNIEnv* jni, const char* name) {	148 jclass FindClass(JNIEnv* jni, const char* name) {

148 return g_class_reference_holder->GetClass(name);	149 return g_class_reference_holder->GetClass(name);

149 }	150 }

150	151

151 } // namespace webrtc_jni	152 } // namespace webrtc_jni

OLD	NEW