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

Side by Side Diff: webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc

Issue 2547483003: Move /webrtc/api/android files to /webrtc/sdk/android (Closed)
Patch Set: Move to api folder under Android instead of src Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/api/android/jni/androidvideotracksource.h" 11 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
12 #include "webrtc/api/android/jni/classreferenceholder.h" 12 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
13 #include "webrtc/api/videosourceproxy.h" 13 #include "webrtc/api/videosourceproxy.h"
14 14
15 // Identifiers are over 80 characters long so this is needed to fit them on one 15 // Identifiers are over 80 characters long so this is needed to fit them on one
16 // line. 16 // line.
17 #define JOW_OBSERVER_METHOD(rettype, name) \ 17 #define JOW_OBSERVER_METHOD(rettype, name) \
18 JOW(rettype, VideoCapturer_00024AndroidVideoTrackSourceObserver_##name) 18 JOW(rettype, VideoCapturer_00024AndroidVideoTrackSourceObserver_##name)
19 19
20 namespace webrtc_jni { 20 namespace webrtc_jni {
21 21
22 static webrtc::AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy( 22 static webrtc::AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 JOW(void, VideoSource_nativeAdaptOutputFormat) 82 JOW(void, VideoSource_nativeAdaptOutputFormat)
83 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) { 83 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) {
84 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat"; 84 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat";
85 webrtc::AndroidVideoTrackSource* source = 85 webrtc::AndroidVideoTrackSource* source =
86 AndroidVideoTrackSourceFromJavaProxy(j_source); 86 AndroidVideoTrackSourceFromJavaProxy(j_source);
87 source->OnOutputFormatRequest(j_width, j_height, j_fps); 87 source->OnOutputFormatRequest(j_width, j_height, j_fps);
88 } 88 }
89 89
90 } // namespace webrtc_jni 90 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidvideotracksource.cc ('k') | webrtc/sdk/android/src/jni/classreferenceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698