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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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
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/video/video_rotation.h" 11 #include "webrtc/api/video/video_rotation.h"
12 #include "webrtc/api/videosourceproxy.h" 12 #include "webrtc/api/videosourceproxy.h"
13 #include "webrtc/base/logging.h" 13 #include "webrtc/rtc_base/logging.h"
14 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" 14 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
15 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 15 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
16 16
17 // Identifiers are over 80 characters long so this is needed to fit them on one 17 // Identifiers are over 80 characters long so this is needed to fit them on one
18 // line. 18 // line.
19 #define JOW_OBSERVER_METHOD(rettype, name) \ 19 #define JOW_OBSERVER_METHOD(rettype, name) \
20 JOW(rettype, AndroidVideoTrackSourceObserver_##name) 20 JOW(rettype, AndroidVideoTrackSourceObserver_##name)
21 21
22 static webrtc::VideoRotation jintToVideoRotation(jint rotation) { 22 static webrtc::VideoRotation jintToVideoRotation(jint rotation) {
23 RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 || 23 RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 JOW(void, VideoSource_nativeAdaptOutputFormat) 90 JOW(void, VideoSource_nativeAdaptOutputFormat)
91 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) { 91 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) {
92 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat"; 92 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat";
93 webrtc::AndroidVideoTrackSource* source = 93 webrtc::AndroidVideoTrackSource* source =
94 AndroidVideoTrackSourceFromJavaProxy(j_source); 94 AndroidVideoTrackSourceFromJavaProxy(j_source);
95 source->OnOutputFormatRequest(j_width, j_height, j_fps); 95 source->OnOutputFormatRequest(j_width, j_height, j_fps);
96 } 96 }
97 97
98 } // namespace webrtc_jni 98 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidvideotracksource.cc ('k') | webrtc/sdk/android/src/jni/audio_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698