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

Side by Side Diff: webrtc/video_engine/vie_channel.cc

Issue 1442003002: Remove BitrateController dependency fromVideoReceiveStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove intra_frame_observer null check. 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
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | no next file » | 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 pre_render_callback_(NULL), 115 pre_render_callback_(NULL),
116 report_block_stats_sender_(new ReportBlockStats()), 116 report_block_stats_sender_(new ReportBlockStats()),
117 time_of_first_rtt_ms_(-1), 117 time_of_first_rtt_ms_(-1),
118 rtt_sum_ms_(0), 118 rtt_sum_ms_(0),
119 last_rtt_ms_(0), 119 last_rtt_ms_(0),
120 num_rtts_(0), 120 num_rtts_(0),
121 rtp_rtcp_modules_( 121 rtp_rtcp_modules_(
122 CreateRtpRtcpModules(!sender, 122 CreateRtpRtcpModules(!sender,
123 vie_receiver_.GetReceiveStatistics(), 123 vie_receiver_.GetReceiveStatistics(),
124 transport, 124 transport,
125 sender ? intra_frame_observer_ : nullptr, 125 intra_frame_observer_,
126 sender ? bandwidth_observer_.get() : nullptr, 126 bandwidth_observer_.get(),
127 transport_feedback_observer_, 127 transport_feedback_observer_,
128 rtt_stats_, 128 rtt_stats_,
129 &rtcp_packet_type_counter_observer_, 129 &rtcp_packet_type_counter_observer_,
130 remote_bitrate_estimator, 130 remote_bitrate_estimator,
131 paced_sender_, 131 paced_sender_,
132 packet_router_, 132 packet_router_,
133 &send_bitrate_observer_, 133 &send_bitrate_observer_,
134 &send_frame_count_observer_, 134 &send_frame_count_observer_,
135 &send_side_delay_observer_, 135 &send_side_delay_observer_,
136 max_rtp_streams)), 136 max_rtp_streams)),
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 CriticalSectionScoped cs(crit_.get()); 1219 CriticalSectionScoped cs(crit_.get());
1220 receive_stats_callback_ = receive_statistics_proxy; 1220 receive_stats_callback_ = receive_statistics_proxy;
1221 } 1221 }
1222 1222
1223 void ViEChannel::SetIncomingVideoStream( 1223 void ViEChannel::SetIncomingVideoStream(
1224 IncomingVideoStream* incoming_video_stream) { 1224 IncomingVideoStream* incoming_video_stream) {
1225 CriticalSectionScoped cs(crit_.get()); 1225 CriticalSectionScoped cs(crit_.get());
1226 incoming_video_stream_ = incoming_video_stream; 1226 incoming_video_stream_ = incoming_video_stream;
1227 } 1227 }
1228 } // namespace webrtc 1228 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698