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/sdk/android/src/jni/androidvideotracksource.h" | 11 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" |
12 | 12 |
13 #include <utility> | 13 #include <utility> |
14 | 14 |
| 15 #include "webrtc/base/logging.h" |
| 16 |
15 namespace { | 17 namespace { |
16 // MediaCodec wants resolution to be divisible by 2. | 18 // MediaCodec wants resolution to be divisible by 2. |
17 const int kRequiredResolutionAlignment = 2; | 19 const int kRequiredResolutionAlignment = 2; |
18 } | 20 } |
19 | 21 |
20 namespace webrtc { | 22 namespace webrtc { |
21 | 23 |
22 AndroidVideoTrackSource::AndroidVideoTrackSource( | 24 AndroidVideoTrackSource::AndroidVideoTrackSource( |
23 rtc::Thread* signaling_thread, | 25 rtc::Thread* signaling_thread, |
24 JNIEnv* jni, | 26 JNIEnv* jni, |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 163 |
162 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, | 164 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, |
163 int height, | 165 int height, |
164 int fps) { | 166 int fps) { |
165 cricket::VideoFormat format(width, height, | 167 cricket::VideoFormat format(width, height, |
166 cricket::VideoFormat::FpsToInterval(fps), 0); | 168 cricket::VideoFormat::FpsToInterval(fps), 0); |
167 video_adapter()->OnOutputFormatRequest(format); | 169 video_adapter()->OnOutputFormatRequest(format); |
168 } | 170 } |
169 | 171 |
170 } // namespace webrtc | 172 } // namespace webrtc |
OLD | NEW |