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

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

Issue 1686323003: Use std::vector in the PayloadRouter interface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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
11 #include "webrtc/video/payload_router.h" 11 #include "webrtc/video/payload_router.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 14 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
15 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 15 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 PayloadRouter::PayloadRouter() 19 PayloadRouter::PayloadRouter()
20 : active_(false) {} 20 : active_(false) {}
21 21
22 PayloadRouter::~PayloadRouter() {} 22 PayloadRouter::~PayloadRouter() {}
23 23
24 size_t PayloadRouter::DefaultMaxPayloadLength() { 24 size_t PayloadRouter::DefaultMaxPayloadLength() {
25 const size_t kIpUdpSrtpLength = 44; 25 const size_t kIpUdpSrtpLength = 44;
26 return IP_PACKET_SIZE - kIpUdpSrtpLength; 26 return IP_PACKET_SIZE - kIpUdpSrtpLength;
27 } 27 }
28 28
29 void PayloadRouter::SetSendingRtpModules( 29 void PayloadRouter::SetSendingRtpModules(
30 const std::list<RtpRtcp*>& rtp_modules) { 30 const std::vector<RtpRtcp*>& rtp_modules) {
31 rtc::CritScope lock(&crit_); 31 rtc::CritScope lock(&crit_);
32 rtp_modules_.clear(); 32 rtp_modules_ = rtp_modules;
33 rtp_modules_.reserve(rtp_modules.size());
34 for (auto* rtp_module : rtp_modules) {
35 rtp_modules_.push_back(rtp_module);
36 }
37 } 33 }
38 34
39 void PayloadRouter::set_active(bool active) { 35 void PayloadRouter::set_active(bool active) {
40 rtc::CritScope lock(&crit_); 36 rtc::CritScope lock(&crit_);
41 active_ = active; 37 active_ = active;
42 } 38 }
43 39
44 bool PayloadRouter::active() { 40 bool PayloadRouter::active() {
45 rtc::CritScope lock(&crit_); 41 rtc::CritScope lock(&crit_);
46 return active_ && !rtp_modules_.empty(); 42 return active_ && !rtp_modules_.empty();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 rtc::CritScope lock(&crit_); 86 rtc::CritScope lock(&crit_);
91 for (auto* rtp_module : rtp_modules_) { 87 for (auto* rtp_module : rtp_modules_) {
92 size_t module_payload_length = rtp_module->MaxDataPayloadLength(); 88 size_t module_payload_length = rtp_module->MaxDataPayloadLength();
93 if (module_payload_length < min_payload_length) 89 if (module_payload_length < min_payload_length)
94 min_payload_length = module_payload_length; 90 min_payload_length = module_payload_length;
95 } 91 }
96 return min_payload_length; 92 return min_payload_length;
97 } 93 }
98 94
99 } // namespace webrtc 95 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698