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

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

Issue 2854123003: Build WebRTC with data channel only. (Closed)
Patch Set: Fix the issues. Make it ready for another round of review. Add a test. Created 3 years, 7 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"
sakal 2017/05/23 09:33:19 Are these new includes needed?
Zhi Huang 2017/05/23 18:49:46 Yes. We use LOG(LS_...) in this file. We used to r
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(rtc::Thread* signaling_thread, 24 AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread,
23 JNIEnv* jni, 25 JNIEnv* jni,
24 jobject j_egl_context, 26 jobject j_egl_context,
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 162
161 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, 163 void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
162 int height, 164 int height,
163 int fps) { 165 int fps) {
164 cricket::VideoFormat format(width, height, 166 cricket::VideoFormat format(width, height,
165 cricket::VideoFormat::FpsToInterval(fps), 0); 167 cricket::VideoFormat::FpsToInterval(fps), 0);
166 video_adapter()->OnOutputFormatRequest(format); 168 video_adapter()->OnOutputFormatRequest(format);
167 } 169 }
168 170
169 } // namespace webrtc 171 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698