Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / rtp_rtcp / source / rtp_sender_unittest.cc

diff --git a/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 7b62d0b..2a49477 100644 (file)
--- a/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -64,14 +64,14 @@ class LoopbackTransportTest : public webrtc::Transport {
  public:
   LoopbackTransportTest()
       : packets_sent_(0), last_sent_packet_len_(0), total_bytes_sent_(0) {}
-  virtual int SendPacket(int channel, const void *data, int len) {
+  virtual int SendPacket(int channel, const void *data, int len) OVERRIDE {
     packets_sent_++;
     memcpy(last_sent_packet_, data, len);
     last_sent_packet_len_ = len;
     total_bytes_sent_ += static_cast<size_t>(len);
     return len;
   }
-  virtual int SendRTCPPacket(int channel, const void *data, int len) {
+  virtual int SendRTCPPacket(int channel, const void *data, int len) OVERRIDE {
     return -1;
   }
   int packets_sent_;
@@ -93,7 +93,7 @@ class RtpSenderTest : public ::testing::Test {
         SendPacket(_, _, _, _, _, _)).WillRepeatedly(testing::Return(true));
   }
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     rtp_sender_.reset(new RTPSender(0, false, &fake_clock_, &transport_, NULL,
                                     &mock_paced_sender_, NULL, NULL, NULL));
     rtp_sender_->SetSequenceNumber(kSeqNum);
@@ -799,7 +799,7 @@ TEST_F(RtpSenderTest, FrameCountCallbacks) {
 
     virtual void FrameCountUpdated(FrameType frame_type,
                                    uint32_t frame_count,
-                                   const unsigned int ssrc) {
+                                   const unsigned int ssrc) OVERRIDE {
       ++num_calls_;
       ssrc_ = ssrc;
       switch (frame_type) {
@@ -855,19 +855,22 @@ TEST_F(RtpSenderTest, FrameCountCallbacks) {
 TEST_F(RtpSenderTest, BitrateCallbacks) {
   class TestCallback : public BitrateStatisticsObserver {
    public:
-    TestCallback()
-        : BitrateStatisticsObserver(), num_calls_(0), ssrc_(0), bitrate_() {}
+    TestCallback() : BitrateStatisticsObserver(), num_calls_(0), ssrc_(0) {}
     virtual ~TestCallback() {}
 
-    virtual void Notify(const BitrateStatistics& stats, uint32_t ssrc) {
+    virtual void Notify(const BitrateStatistics& total_stats,
+                        const BitrateStatistics& retransmit_stats,
+                        uint32_t ssrc) OVERRIDE {
       ++num_calls_;
       ssrc_ = ssrc;
-      bitrate_ = stats;
+      total_stats_ = total_stats;
+      retransmit_stats_ = retransmit_stats;
     }
 
     uint32_t num_calls_;
     uint32_t ssrc_;
-    BitrateStatistics bitrate_;
+    BitrateStatistics total_stats_;
+    BitrateStatistics retransmit_stats_;
   } callback;
   rtp_sender_.reset(new RTPSender(0, false, &fake_clock_, &transport_, NULL,
                                   &mock_paced_sender_, &callback, NULL, NULL));
@@ -908,13 +911,15 @@ TEST_F(RtpSenderTest, BitrateCallbacks) {
 
   const uint32_t expected_packet_rate = 1000 / kPacketInterval;
 
-  EXPECT_EQ(1U, callback.num_calls_);
+  // We get one call for every stats updated, thus two calls since both the
+  // stream stats and the retransmit stats are updated once.
+  EXPECT_EQ(2u, callback.num_calls_);
   EXPECT_EQ(ssrc, callback.ssrc_);
   EXPECT_EQ(start_time + (kNumPackets * kPacketInterval),
-            callback.bitrate_.timestamp_ms);
-  EXPECT_EQ(expected_packet_rate, callback.bitrate_.packet_rate);
+            callback.total_stats_.timestamp_ms);
+  EXPECT_EQ(expected_packet_rate, callback.total_stats_.packet_rate);
   EXPECT_EQ((kPacketOverhead + sizeof(payload)) * 8 * expected_packet_rate,
-            callback.bitrate_.bitrate_bps);
+            callback.total_stats_.bitrate_bps);
 
   rtp_sender_.reset();
 }
@@ -923,7 +928,7 @@ class RtpSenderAudioTest : public RtpSenderTest {
  protected:
   RtpSenderAudioTest() {}
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     payload_ = kAudioPayload;
     rtp_sender_.reset(new RTPSender(0, true, &fake_clock_, &transport_, NULL,
                                     &mock_paced_sender_, NULL, NULL, NULL));
@@ -939,7 +944,7 @@ TEST_F(RtpSenderTest, StreamDataCountersCallbacks) {
     virtual ~TestCallback() {}
 
     virtual void DataCountersUpdated(const StreamDataCounters& counters,
-                                     uint32_t ssrc) {
+                                     uint32_t ssrc) OVERRIDE {
       ssrc_ = ssrc;
       counters_ = counters;
     }