zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use default value if field trial switch is set to an invalid number

Browse Source 
Bug: webrtc:9851
Change-Id: I195e2e9b30905bd65f703098db9a1e7e44eac073
Reviewed-on: https://webrtc-review.googlesource.com/c/107620
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25354}
This commit is contained in:
Johannes Kron
2018-10-24 00:53:39 +02:00
committed by Commit Bot
parent 273c851799
commit 487e694782
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
video/rtp_video_stream_receiver.cc
View File

@ -154,15 +154,16 @@ RtpVideoStreamReceiver::RtpVideoStreamReceiver(
process_thread_->RegisterModule(nack_module_.get(), RTC_FROM_HERE); process_thread_->RegisterModule(nack_module_.get(), RTC_FROM_HERE);
} }
// The group here can be either a positive integer with an explicit size, in // The group here must be a positive power of 2, in which case that is used as
// which case that is used as size. All other values shall result in the // size. All other values shall result in the default value being used.
// default value being used.
const std::string group_name = const std::string group_name =
webrtc::field_trial::FindFullName("WebRTC-PacketBufferMaxSize"); webrtc::field_trial::FindFullName("WebRTC-PacketBufferMaxSize");
int packet_buffer_max_size = kPacketBufferMaxSize; int packet_buffer_max_size = kPacketBufferMaxSize;
if (!group_name.empty() && if (!group_name.empty() &&
(sscanf(group_name.c_str(), "%d", &packet_buffer_max_size) != 1 || (sscanf(group_name.c_str(), "%d", &packet_buffer_max_size) != 1 ||
packet_buffer_max_size <= 0)) { packet_buffer_max_size <= 0 ||
// Verify that the number is a positive power of 2.
(packet_buffer_max_size & (packet_buffer_max_size - 1)) != 0)) {
RTC_LOG(LS_WARNING) << "Invalid packet buffer max size: " << group_name; RTC_LOG(LS_WARNING) << "Invalid packet buffer max size: " << group_name;
packet_buffer_max_size = kPacketBufferMaxSize; packet_buffer_max_size = kPacketBufferMaxSize;
} }