Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

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

Issue 1321893003: CameraEnumerationAndroid: Add getSupportedFormats() implementation using android.hardware.camera2 (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: weaker tests 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/Camera2Enumerator.java ('k') | talk/libjingle.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
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"); 74 LoadClass(jni, "org/webrtc/CameraEnumerator");
75 LoadClass(jni, "org/webrtc/Camera2Enumerator");
tommi 2015/09/01 12:48:59 Should we do this an all versions or should we hav
magjed_webrtc 2015/09/01 14:42:44 The version check is in Camera2Enumerator, so it w
75 LoadClass(jni, "org/webrtc/CameraEnumerationAndroid"); 76 LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");
76 LoadClass(jni, "org/webrtc/VideoCapturerAndroid"); 77 LoadClass(jni, "org/webrtc/VideoCapturerAndroid");
77 LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver"); 78 LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver");
78 LoadClass(jni, "org/webrtc/EglBase"); 79 LoadClass(jni, "org/webrtc/EglBase");
79 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder"); 80 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");
80 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo"); 81 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");
81 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType"); 82 LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");
82 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder"); 83 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");
83 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecoderOutputBufferInfo"); 84 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecoderOutputBufferInfo");
84 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType"); 85 LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 CHECK(inserted) << "Duplicate class name: " << name; 141 CHECK(inserted) << "Duplicate class name: " << name;
141 } 142 }
142 143
143 // Returns a global reference guaranteed to be valid for the lifetime of the 144 // Returns a global reference guaranteed to be valid for the lifetime of the
144 // process. 145 // process.
145 jclass FindClass(JNIEnv* jni, const char* name) { 146 jclass FindClass(JNIEnv* jni, const char* name) {
146 return g_class_reference_holder->GetClass(name); 147 return g_class_reference_holder->GetClass(name);
147 } 148 }
148 149
149 } // namespace webrtc_jni 150 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/Camera2Enumerator.java ('k') | talk/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698