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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 1433393002: Add separate send-side UMA stats for screenshare and video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed use-after-free in test Created 5 years, 1 month 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 namespace internal { 110 namespace internal {
111 VideoSendStream::VideoSendStream( 111 VideoSendStream::VideoSendStream(
112 int num_cpu_cores, 112 int num_cpu_cores,
113 ProcessThread* module_process_thread, 113 ProcessThread* module_process_thread,
114 CallStats* call_stats, 114 CallStats* call_stats,
115 CongestionController* congestion_controller, 115 CongestionController* congestion_controller,
116 BitrateAllocator* bitrate_allocator, 116 BitrateAllocator* bitrate_allocator,
117 const VideoSendStream::Config& config, 117 const VideoSendStream::Config& config,
118 const VideoEncoderConfig& encoder_config, 118 const VideoEncoderConfig& encoder_config,
119 const std::map<uint32_t, RtpState>& suspended_ssrcs) 119 const std::map<uint32_t, RtpState>& suspended_ssrcs)
120 : stats_proxy_(Clock::GetRealTimeClock(), config), 120 : stats_proxy_(Clock::GetRealTimeClock(), config, encoder_config),
121 transport_adapter_(config.send_transport), 121 transport_adapter_(config.send_transport),
122 encoded_frame_proxy_(config.post_encode_callback), 122 encoded_frame_proxy_(config.post_encode_callback),
123 config_(config), 123 config_(config),
124 suspended_ssrcs_(suspended_ssrcs), 124 suspended_ssrcs_(suspended_ssrcs),
125 module_process_thread_(module_process_thread), 125 module_process_thread_(module_process_thread),
126 call_stats_(call_stats), 126 call_stats_(call_stats),
127 congestion_controller_(congestion_controller), 127 congestion_controller_(congestion_controller),
128 encoder_feedback_(new EncoderStateFeedback()), 128 encoder_feedback_(new EncoderStateFeedback()),
129 use_config_bitrate_(true) { 129 use_config_bitrate_(true) {
130 LOG(LS_INFO) << "VideoSendStream: " << config_.ToString(); 130 LOG(LS_INFO) << "VideoSendStream: " << config_.ToString();
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 vie_encoder_->SetSsrcs(used_ssrcs); 571 vie_encoder_->SetSsrcs(used_ssrcs);
572 572
573 // Restart the media flow 573 // Restart the media flow
574 vie_encoder_->Restart(); 574 vie_encoder_->Restart();
575 575
576 return true; 576 return true;
577 } 577 }
578 578
579 } // namespace internal 579 } // namespace internal
580 } // namespace webrtc 580 } // namespace webrtc
OLDNEW
« talk/media/webrtc/webrtcvideoengine2.cc ('K') | « webrtc/video/video_capture_input_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698