Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information. This CL was reviewed and approved in pieces in the following CLs: https://webrtc-codereview.appspot.com/24209004/ https://webrtc-codereview.appspot.com/24229004/ https://webrtc-codereview.appspot.com/24259004/ https://webrtc-codereview.appspot.com/25109004/ https://webrtc-codereview.appspot.com/26099004/ https://webrtc-codereview.appspot.com/27069004/ https://webrtc-codereview.appspot.com/27969004/ https://webrtc-codereview.appspot.com/27989004/ https://webrtc-codereview.appspot.com/29009004/ https://webrtc-codereview.appspot.com/30929004/ https://webrtc-codereview.appspot.com/30939004/ https://webrtc-codereview.appspot.com/31999004/ Committing as TBR to the original reviewers. BUG=chromium:81439 TEST=none TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom Review URL: https://webrtc-codereview.appspot.com/23129004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -16,8 +16,8 @@
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
const int kPacketSize1 = 100;
|
||||
const int kPacketSize2 = 300;
|
||||
const size_t kPacketSize1 = 100;
|
||||
const size_t kPacketSize2 = 300;
|
||||
const uint32_t kSsrc1 = 1;
|
||||
const uint32_t kSsrc2 = 2;
|
||||
|
||||
@@ -56,7 +56,7 @@ TEST_F(ReceiveStatisticsTest, TwoIncomingSsrcs) {
|
||||
receive_statistics_->GetStatistician(kSsrc1);
|
||||
ASSERT_TRUE(statistician != NULL);
|
||||
EXPECT_GT(statistician->BitrateReceived(), 0u);
|
||||
uint32_t bytes_received = 0;
|
||||
size_t bytes_received = 0;
|
||||
uint32_t packets_received = 0;
|
||||
statistician->GetDataCounters(&bytes_received, &packets_received);
|
||||
EXPECT_EQ(200u, bytes_received);
|
||||
@@ -125,7 +125,7 @@ TEST_F(ReceiveStatisticsTest, ActiveStatisticians) {
|
||||
StreamStatistician* statistician =
|
||||
receive_statistics_->GetStatistician(kSsrc1);
|
||||
ASSERT_TRUE(statistician != NULL);
|
||||
uint32_t bytes_received = 0;
|
||||
size_t bytes_received = 0;
|
||||
uint32_t packets_received = 0;
|
||||
statistician->GetDataCounters(&bytes_received, &packets_received);
|
||||
EXPECT_EQ(200u, bytes_received);
|
||||
@@ -234,8 +234,8 @@ class RtpTestCallback : public StreamDataCountersCallback {
|
||||
|
||||
void ExpectMatches(uint32_t num_calls,
|
||||
uint32_t ssrc,
|
||||
uint32_t bytes,
|
||||
uint32_t padding,
|
||||
size_t bytes,
|
||||
size_t padding,
|
||||
uint32_t packets,
|
||||
uint32_t retransmits,
|
||||
uint32_t fec) {
|
||||
@@ -257,8 +257,8 @@ TEST_F(ReceiveStatisticsTest, RtpCallbacks) {
|
||||
RtpTestCallback callback;
|
||||
receive_statistics_->RegisterRtpStatisticsCallback(&callback);
|
||||
|
||||
const uint32_t kHeaderLength = 20;
|
||||
const uint32_t kPaddingLength = 9;
|
||||
const size_t kHeaderLength = 20;
|
||||
const size_t kPaddingLength = 9;
|
||||
|
||||
// One packet of size kPacketSize1.
|
||||
header1_.headerLength = kHeaderLength;
|
||||
|
||||
Reference in New Issue
Block a user