Chromium Code Reviews| 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 namespace webrtc { | 15 namespace webrtc { |
| 16 | 16 |
| 17 AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread, | 17 AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread, |
| 18 JNIEnv* jni, | 18 JNIEnv* jni, |
| 19 jobject j_egl_context, | 19 jobject j_egl_context, |
| 20 bool is_screencast) | 20 bool is_screencast) |
| 21 : signaling_thread_(signaling_thread), | 21 : AdaptedVideoTrackSource(2), |
|
magjed_webrtc
2016/12/08 09:08:55
Wasn't alignment to 4 needed to avoid the H264 enc
| |
| 22 signaling_thread_(signaling_thread), | |
| 22 surface_texture_helper_(webrtc_jni::SurfaceTextureHelper::create( | 23 surface_texture_helper_(webrtc_jni::SurfaceTextureHelper::create( |
| 23 jni, | 24 jni, |
| 24 "Camera SurfaceTextureHelper", | 25 "Camera SurfaceTextureHelper", |
| 25 j_egl_context)), | 26 j_egl_context)), |
| 26 is_screencast_(is_screencast) { | 27 is_screencast_(is_screencast) { |
| 27 LOG(LS_INFO) << "AndroidVideoTrackSource ctor"; | 28 LOG(LS_INFO) << "AndroidVideoTrackSource ctor"; |
| 28 camera_thread_checker_.DetachFromThread(); | 29 camera_thread_checker_.DetachFromThread(); |
| 29 } | 30 } |
| 30 | 31 |
| 31 void AndroidVideoTrackSource::SetState(SourceState state) { | 32 void AndroidVideoTrackSource::SetState(SourceState state) { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 | 155 |
| 155 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, | 156 void AndroidVideoTrackSource::OnOutputFormatRequest(int width, |
| 156 int height, | 157 int height, |
| 157 int fps) { | 158 int fps) { |
| 158 cricket::VideoFormat format(width, height, | 159 cricket::VideoFormat format(width, height, |
| 159 cricket::VideoFormat::FpsToInterval(fps), 0); | 160 cricket::VideoFormat::FpsToInterval(fps), 0); |
| 160 video_adapter()->OnOutputFormatRequest(format); | 161 video_adapter()->OnOutputFormatRequest(format); |
| 161 } | 162 } |
| 162 | 163 |
| 163 } // namespace webrtc | 164 } // namespace webrtc |
| OLD | NEW |