talk/app/webrtc/java/jni/classreferenceholder.cc - Issue 1321903002: CameraEnumerationAndroid: Make getSupportedFormats() an interface

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

Issue 1321903002: CameraEnumerationAndroid: Make getSupportedFormats() an interface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Release camera in finally clause Created 5 years, 3 months 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/android/org/webrtc/VideoCapturerAndroid.java ('k') | talk/libjingle.gyp » ('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 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {	64 ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {

65 LoadClass(jni, "java/nio/ByteBuffer");	65 LoadClass(jni, "java/nio/ByteBuffer");

66 LoadClass(jni, "org/webrtc/AudioTrack");	66 LoadClass(jni, "org/webrtc/AudioTrack");

67 LoadClass(jni, "org/webrtc/DataChannel");	67 LoadClass(jni, "org/webrtc/DataChannel");

68 LoadClass(jni, "org/webrtc/DataChannel$Buffer");	68 LoadClass(jni, "org/webrtc/DataChannel$Buffer");

69 LoadClass(jni, "org/webrtc/DataChannel$Init");	69 LoadClass(jni, "org/webrtc/DataChannel$Init");

70 LoadClass(jni, "org/webrtc/DataChannel$State");	70 LoadClass(jni, "org/webrtc/DataChannel$State");

71 LoadClass(jni, "org/webrtc/IceCandidate");	71 LoadClass(jni, "org/webrtc/IceCandidate");

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

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

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

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

74 LoadClass(jni, "org/webrtc/VideoCapturerAndroid");	76 LoadClass(jni, "org/webrtc/VideoCapturerAndroid");

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

76 LoadClass(jni, "org/webrtc/EglBase");	78 LoadClass(jni, "org/webrtc/EglBase");

77 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");	79 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");

78 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");	80 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");

79 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");	81 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");

80 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");	82 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");

81 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecoderOutputBufferInfo");	83 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecoderOutputBufferInfo");

82 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");	84 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");

83 jclass j_egl_base_class = GetClass("org/webrtc/EglBase");	85 jclass j_egl_base_class = GetClass("org/webrtc/EglBase");

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 CHECK(inserted) << "Duplicate class name: " << name;	140 CHECK(inserted) << "Duplicate class name: " << name;

139 }	141 }

140	142

141 // Returns a global reference guaranteed to be valid for the lifetime of the	143 // Returns a global reference guaranteed to be valid for the lifetime of the

142 // process.	144 // process.

143 jclass FindClass(JNIEnv* jni, const char* name) {	145 jclass FindClass(JNIEnv* jni, const char* name) {

144 return g_class_reference_holder->GetClass(name);	146 return g_class_reference_holder->GetClass(name);

145 }	147 }

146	148

147 } // namespace webrtc_jni	149 } // namespace webrtc_jni

OLD	NEW