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

Replace DataSize and DataRate factories with newer versions

Browse Source 
This is search and replace change:
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataSize::Bytes<\(.*\)>()/DataSize::Bytes(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataSize::bytes/DataSize::Bytes/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::BitsPerSec<\(.*\)>()/DataRate::BitsPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::BytesPerSec<\(.*\)>()/DataRate::BytesPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::KilobitsPerSec<\(.*\)>()/DataRate::KilobitsPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::bps/DataRate::BitsPerSec/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::kbps/DataRate::KilobitsPerSec/g"
git cl format

Bug: webrtc:9709
Change-Id: I65aaca69474ba038c1fe2dd8dc30d3f8e7b94c29
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168647
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30545}
This commit is contained in:
Danil Chapovalov
2020-02-17 18:46:07 +01:00
committed by Commit Bot
parent 701bd172d8
commit cad3e0e2fa
102 changed files with 947 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc
View File

@ -25,7 +25,7 @@ namespace {
static constexpr int kFieldValueSize = 3;
static constexpr int kFieldSize = 1 + kFieldValueSize;
static constexpr DataRate kDataRateResolution = DataRate::KilobitsPerSec<1>();
static constexpr DataRate kDataRateResolution = DataRate::KilobitsPerSec(1);
constexpr int64_t kMaxEncoded = (1 << (kFieldValueSize * 8)) - 1;
class DataRateSerializer {

10
modules/rtp_rtcp/source/rtcp_packet/remote_estimate_unittest.cc
View File

@ -15,8 +15,8 @@ namespace webrtc {
namespace rtcp {
TEST(RemoteEstimateTest, EncodesCapacityBounds) {
NetworkStateEstimate src;
src.link_capacity_lower = DataRate::kbps(10);
src.link_capacity_upper = DataRate::kbps(1000000);
src.link_capacity_lower = DataRate::KilobitsPerSec(10);
src.link_capacity_upper = DataRate::KilobitsPerSec(1000000);
rtc::Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
NetworkStateEstimate dst;
EXPECT_TRUE(GetRemoteEstimateSerializer()->Parse(data, &dst));
@ -28,7 +28,7 @@ TEST(RemoteEstimateTest, ExpandsToPlusInfinity) {
NetworkStateEstimate src;
// White box testing: We know that the value is stored in an unsigned 24 int
// with kbps resolution. We expected it be represented as plus infinity.
src.link_capacity_lower = DataRate::kbps(2 << 24);
src.link_capacity_lower = DataRate::KilobitsPerSec(2 << 24);
src.link_capacity_upper = DataRate::PlusInfinity();
rtc::Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
@ -46,10 +46,10 @@ TEST(RemoteEstimateTest, DoesNotEncodeNegative) {
// Since MinusInfinity can't be represented, the buffer should be empty.
EXPECT_EQ(data.size(), 0u);
NetworkStateEstimate dst;
dst.link_capacity_lower = DataRate::kbps(300);
dst.link_capacity_lower = DataRate::KilobitsPerSec(300);
EXPECT_TRUE(GetRemoteEstimateSerializer()->Parse(data, &dst));
// The fields will be left unchanged by the parser as they were not encoded.
EXPECT_EQ(dst.link_capacity_lower, DataRate::kbps(300));
EXPECT_EQ(dst.link_capacity_lower, DataRate::KilobitsPerSec(300));
EXPECT_TRUE(dst.link_capacity_upper.IsMinusInfinity());
}
} // namespace rtcp