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

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

Issue 2720693007: Minor FlexFEC fixes. (Closed)
Patch Set: Comment. Created 3 years, 9 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/modules/rtp_rtcp/include/flexfec_sender.h ('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) 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 #include "webrtc/video/video_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 ss << ", ulpfec: " << ulpfec.ToString(); 187 ss << ", ulpfec: " << ulpfec.ToString();
188 188
189 ss << ", flexfec: {payload_type: " << flexfec.payload_type; 189 ss << ", flexfec: {payload_type: " << flexfec.payload_type;
190 ss << ", ssrc: " << flexfec.ssrc; 190 ss << ", ssrc: " << flexfec.ssrc;
191 ss << ", protected_media_ssrcs: ["; 191 ss << ", protected_media_ssrcs: [";
192 for (size_t i = 0; i < flexfec.protected_media_ssrcs.size(); ++i) { 192 for (size_t i = 0; i < flexfec.protected_media_ssrcs.size(); ++i) {
193 ss << flexfec.protected_media_ssrcs[i]; 193 ss << flexfec.protected_media_ssrcs[i];
194 if (i != flexfec.protected_media_ssrcs.size() - 1) 194 if (i != flexfec.protected_media_ssrcs.size() - 1)
195 ss << ", "; 195 ss << ", ";
196 } 196 }
197 ss << ']'; 197 ss << "]}";
198 198
199 ss << ", rtx: " << rtx.ToString(); 199 ss << ", rtx: " << rtx.ToString();
200 ss << ", c_name: " << c_name; 200 ss << ", c_name: " << c_name;
201 ss << '}'; 201 ss << '}';
202 return ss.str(); 202 return ss.str();
203 } 203 }
204 204
205 std::string VideoSendStream::Config::ToString() const { 205 std::string VideoSendStream::Config::ToString() const {
206 std::stringstream ss; 206 std::stringstream ss;
207 ss << "{encoder_settings: " << encoder_settings.ToString(); 207 ss << "{encoder_settings: " << encoder_settings.ToString();
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 rtc::CriticalSection encoder_activity_crit_sect_; 409 rtc::CriticalSection encoder_activity_crit_sect_;
410 CheckEncoderActivityTask* check_encoder_activity_task_ 410 CheckEncoderActivityTask* check_encoder_activity_task_
411 GUARDED_BY(encoder_activity_crit_sect_); 411 GUARDED_BY(encoder_activity_crit_sect_);
412 412
413 CallStats* const call_stats_; 413 CallStats* const call_stats_;
414 CongestionController* const congestion_controller_; 414 CongestionController* const congestion_controller_;
415 PacketRouter* const packet_router_; 415 PacketRouter* const packet_router_;
416 BitrateAllocator* const bitrate_allocator_; 416 BitrateAllocator* const bitrate_allocator_;
417 VieRemb* const remb_; 417 VieRemb* const remb_;
418 418
419 // TODO(brandtr): Consider moving this to a new FlexfecSendStream class. 419 // TODO(brandtr): Move ownership to PayloadRouter.
420 std::unique_ptr<FlexfecSender> flexfec_sender_; 420 std::unique_ptr<FlexfecSender> flexfec_sender_;
421 421
422 rtc::CriticalSection ivf_writers_crit_; 422 rtc::CriticalSection ivf_writers_crit_;
423 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY( 423 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY(
424 ivf_writers_crit_); 424 ivf_writers_crit_);
425 425
426 int max_padding_bitrate_; 426 int max_padding_bitrate_;
427 int encoder_min_bitrate_bps_; 427 int encoder_min_bitrate_bps_;
428 uint32_t encoder_max_bitrate_bps_; 428 uint32_t encoder_max_bitrate_bps_;
429 uint32_t encoder_target_rate_bps_; 429 uint32_t encoder_target_rate_bps_;
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 std::min(config_->rtp.max_packet_size, 1341 std::min(config_->rtp.max_packet_size,
1342 kPathMTU - transport_overhead_bytes_per_packet_); 1342 kPathMTU - transport_overhead_bytes_per_packet_);
1343 1343
1344 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1344 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1345 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size); 1345 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size);
1346 } 1346 }
1347 } 1347 }
1348 1348
1349 } // namespace internal 1349 } // namespace internal
1350 } // namespace webrtc 1350 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/flexfec_sender.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698