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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.h

Issue 2643763002: Revert of Add experimental simulcast screen content mode (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « webrtc/media/engine/simulcast.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 rtc::AsyncInvoker invoker_; 323 rtc::AsyncInvoker invoker_;
324 rtc::Thread* worker_thread_; 324 rtc::Thread* worker_thread_;
325 const std::vector<uint32_t> ssrcs_ ACCESS_ON(&thread_checker_); 325 const std::vector<uint32_t> ssrcs_ ACCESS_ON(&thread_checker_);
326 const std::vector<SsrcGroup> ssrc_groups_ ACCESS_ON(&thread_checker_); 326 const std::vector<SsrcGroup> ssrc_groups_ ACCESS_ON(&thread_checker_);
327 webrtc::Call* const call_; 327 webrtc::Call* const call_;
328 const bool enable_cpu_overuse_detection_; 328 const bool enable_cpu_overuse_detection_;
329 rtc::VideoSourceInterface<webrtc::VideoFrame>* source_ 329 rtc::VideoSourceInterface<webrtc::VideoFrame>* source_
330 ACCESS_ON(&thread_checker_); 330 ACCESS_ON(&thread_checker_);
331 WebRtcVideoEncoderFactory* const external_encoder_factory_ 331 WebRtcVideoEncoderFactory* const external_encoder_factory_
332 ACCESS_ON(&thread_checker_); 332 ACCESS_ON(&thread_checker_);
333 const std::unique_ptr<WebRtcVideoEncoderFactory> internal_encoder_factory_
334 ACCESS_ON(&thread_checker_);
335 333
336 webrtc::VideoSendStream* stream_ ACCESS_ON(&thread_checker_); 334 webrtc::VideoSendStream* stream_ ACCESS_ON(&thread_checker_);
337 rtc::VideoSinkInterface<webrtc::VideoFrame>* encoder_sink_ 335 rtc::VideoSinkInterface<webrtc::VideoFrame>* encoder_sink_
338 ACCESS_ON(&thread_checker_); 336 ACCESS_ON(&thread_checker_);
339 // Contains settings that are the same for all streams in the MediaChannel, 337 // Contains settings that are the same for all streams in the MediaChannel,
340 // such as codecs, header extensions, and the global bitrate limit for the 338 // such as codecs, header extensions, and the global bitrate limit for the
341 // entire channel. 339 // entire channel.
342 VideoSendStreamParameters parameters_ ACCESS_ON(&thread_checker_); 340 VideoSendStreamParameters parameters_ ACCESS_ON(&thread_checker_);
343 // Contains settings that are unique for each stream, such as max_bitrate. 341 // Contains settings that are unique for each stream, such as max_bitrate.
344 // Does *not* contain codecs, however. 342 // Does *not* contain codecs, however.
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 // send_params/recv_params, rtp_extensions, options, etc. 488 // send_params/recv_params, rtp_extensions, options, etc.
491 VideoSendParameters send_params_; 489 VideoSendParameters send_params_;
492 VideoOptions default_send_options_; 490 VideoOptions default_send_options_;
493 VideoRecvParameters recv_params_; 491 VideoRecvParameters recv_params_;
494 int64_t last_stats_log_ms_; 492 int64_t last_stats_log_ms_;
495 }; 493 };
496 494
497 } // namespace cricket 495 } // namespace cricket
498 496
499 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 497 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/simulcast.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698