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

Side by Side Diff: webrtc/sdk/android/src/jni/androidvideotracksource.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/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" 15 #include "webrtc/rtc_base/logging.h"
16 16
17 namespace { 17 namespace {
18 // MediaCodec wants resolution to be divisible by 2. 18 // MediaCodec wants resolution to be divisible by 2.
19 const int kRequiredResolutionAlignment = 2; 19 const int kRequiredResolutionAlignment = 2;
20 } 20 }
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 AndroidVideoTrackSource::AndroidVideoTrackSource( 24 AndroidVideoTrackSource::AndroidVideoTrackSource(
25 rtc::Thread* signaling_thread, 25 rtc::Thread* signaling_thread,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, 155 void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
156 int height, 156 int height,
157 int fps) { 157 int fps) {
158 cricket::VideoFormat format(width, height, 158 cricket::VideoFormat format(width, height,
159 cricket::VideoFormat::FpsToInterval(fps), 0); 159 cricket::VideoFormat::FpsToInterval(fps), 0);
160 video_adapter()->OnOutputFormatRequest(format); 160 video_adapter()->OnOutputFormatRequest(format);
161 } 161 }
162 162
163 } // namespace webrtc 163 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidvideotracksource.h ('k') | webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698