OLD | NEW |
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/videosourceproxy.h" | 11 #include "webrtc/api/videosourceproxy.h" |
| 12 #include "webrtc/base/logging.h" |
12 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" | 13 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" |
13 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" | 14 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" |
14 | 15 |
15 // Identifiers are over 80 characters long so this is needed to fit them on one | 16 // Identifiers are over 80 characters long so this is needed to fit them on one |
16 // line. | 17 // line. |
17 #define JOW_OBSERVER_METHOD(rettype, name) \ | 18 #define JOW_OBSERVER_METHOD(rettype, name) \ |
18 JOW(rettype, AndroidVideoTrackSourceObserver_##name) | 19 JOW(rettype, AndroidVideoTrackSourceObserver_##name) |
19 | 20 |
20 namespace webrtc_jni { | 21 namespace webrtc_jni { |
21 | 22 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 | 82 |
82 JOW(void, VideoSource_nativeAdaptOutputFormat) | 83 JOW(void, VideoSource_nativeAdaptOutputFormat) |
83 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) { | 84 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) { |
84 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat"; | 85 LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat"; |
85 webrtc::AndroidVideoTrackSource* source = | 86 webrtc::AndroidVideoTrackSource* source = |
86 AndroidVideoTrackSourceFromJavaProxy(j_source); | 87 AndroidVideoTrackSourceFromJavaProxy(j_source); |
87 source->OnOutputFormatRequest(j_width, j_height, j_fps); | 88 source->OnOutputFormatRequest(j_width, j_height, j_fps); |
88 } | 89 } |
89 | 90 |
90 } // namespace webrtc_jni | 91 } // namespace webrtc_jni |
OLD | NEW |