Drop audio packets in the chromoting client less agressively.

remoting/client/audio_player_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/audio_player.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 55 matching lines @@
     int i = 0;
     for (; i < num_bytes; i++) {
       ASSERT_EQ(kDummyAudioData, *(buffer + i));
     }
     // Rest of audio frame must be filled with '0's.
     for (; i < kAudioFrameBytes; i++) {
       ASSERT_EQ(0, *(buffer + i));
     }
   }
 
-  void SetQueuedSamples(int num_samples) {
-    audio_->queued_samples_ = num_samples;
-  }
-
   int GetNumQueuedSamples() {
-    return audio_->queued_samples_;
+    return audio_->queued_bytes_ / kAudioSampleBytes;
   }
 
   int GetNumQueuedPackets() {
     return static_cast<int>(audio_->queued_packets_.size());
   }
 
   int GetBytesConsumed() {
     return static_cast<int>(audio_->bytes_consumed_);
   }
 
@@ skipping 55 matching lines @@
 
   // New packet with different sampling rate causes previous samples to
   // be removed.
   scoped_ptr<AudioPacket> packet2(CreatePacket48000Hz(20));
   audio_->ProcessAudioPacket(packet2.Pass());
   ASSERT_EQ(20, GetNumQueuedSamples());
   ASSERT_EQ(1, GetNumQueuedPackets());
 }
 
 TEST_F(AudioPlayerTest, ExceedLatency) {
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(10));
-  audio_->ProcessAudioPacket(packet1.Pass());
-  ASSERT_EQ(10, GetNumQueuedSamples());
-  ASSERT_EQ(1, GetNumQueuedPackets());
+  // Push about 4 seconds worth of samples.
+  for (int i = 0; i < 100; ++i) {
+    scoped_ptr<AudioPacket> packet1(CreatePacket48000Hz(2000));
+    audio_->ProcessAudioPacket(packet1.Pass());
+  }
 
-  // Fake lots of queued samples.
-  SetQueuedSamples(20000);
-
-  // Previous sample should have been deleted because of latency (too many
-  // unprocessed samples).
-  scoped_ptr<AudioPacket> packet2(CreatePacket44100Hz(20));
-  audio_->ProcessAudioPacket(packet2.Pass());
-  ASSERT_EQ(20, GetNumQueuedSamples());
-  ASSERT_EQ(1, GetNumQueuedPackets());
+  // Verify that we don't have more than 0.5s.
+  EXPECT_LT(GetNumQueuedSamples(), 24000);
 }
 
 // Incoming packets: 100
 // Consume: 25 (w/ 75 remaining, offset 25 into packet)
 TEST_F(AudioPlayerTest, ConsumePartialPacket) {
   int total_samples = 0;
   int bytes_consumed = 0;
 
   // Process 100 samples.
   int packet1_samples = 100;
@@ skipping 147 matching lines @@
 
   // Attempt to consume a frame of 25 samples.
   ConsumeAudioFrame();
   ASSERT_EQ(0, GetNumQueuedSamples());
   ASSERT_EQ(0, GetNumQueuedPackets());
   ASSERT_EQ(0, GetBytesConsumed());
   CheckAudioFrameBytes(packet1_samples * kAudioSampleBytes);
 }
 
 }  // namespace remoting