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

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

Issue 2555483005: Add ability to scale to arbitrary factors (Closed)
Patch Set: rebase Created 4 years 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
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 void OnOutputFormatRequest(int width, int height, int fps); 62 void OnOutputFormatRequest(int width, int height, int fps);
63 63
64 rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> 64 rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper>
65 surface_texture_helper() { 65 surface_texture_helper() {
66 return surface_texture_helper_; 66 return surface_texture_helper_;
67 } 67 }
68 68
69 private: 69 private:
70 rtc::Thread* signaling_thread_; 70 rtc::Thread* signaling_thread_;
71 cricket::VideoAdapter video_adapter_;
magjed_webrtc 2016/12/07 13:44:51 Now this class has two adapters. Pass the alignmen
kthelgason 2016/12/08 08:42:03 Thanks, I didn't think of that. Done.
71 rtc::AsyncInvoker invoker_; 72 rtc::AsyncInvoker invoker_;
72 rtc::ThreadChecker camera_thread_checker_; 73 rtc::ThreadChecker camera_thread_checker_;
73 SourceState state_; 74 SourceState state_;
74 rtc::VideoBroadcaster broadcaster_; 75 rtc::VideoBroadcaster broadcaster_;
75 rtc::TimestampAligner timestamp_aligner_; 76 rtc::TimestampAligner timestamp_aligner_;
76 webrtc::NV12ToI420Scaler nv12toi420_scaler_; 77 webrtc::NV12ToI420Scaler nv12toi420_scaler_;
77 webrtc::I420BufferPool buffer_pool_; 78 webrtc::I420BufferPool buffer_pool_;
78 rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_; 79 rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_;
79 const bool is_screencast_; 80 const bool is_screencast_;
80 }; 81 };
81 82
82 } // namespace webrtc 83 } // namespace webrtc
83 84
84 #endif // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ 85 #endif // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698