Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: remoting/client/audio_player_unittest.cc

Issue 11697009: Drop audio packets in the chromoting client less agressively. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/audio_player.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/audio_player_unittest.cc
diff --git a/remoting/client/audio_player_unittest.cc b/remoting/client/audio_player_unittest.cc
index 175c5a102617c3ecd459613bb5fc5bdcd6fd9ff6..d68dff1d93ffe0be936e97118fea176fd1881190 100644
--- a/remoting/client/audio_player_unittest.cc
+++ b/remoting/client/audio_player_unittest.cc
@@ -73,12 +73,8 @@ class AudioPlayerTest : public ::testing::Test {
}
}
- void SetQueuedSamples(int num_samples) {
- audio_->queued_samples_ = num_samples;
- }
-
int GetNumQueuedSamples() {
- return audio_->queued_samples_;
+ return audio_->queued_bytes_ / kAudioSampleBytes;
}
int GetNumQueuedPackets() {
@@ -154,20 +150,14 @@ TEST_F(AudioPlayerTest, ChangeSampleRate) {
}
TEST_F(AudioPlayerTest, ExceedLatency) {
- scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(10));
- audio_->ProcessAudioPacket(packet1.Pass());
- ASSERT_EQ(10, GetNumQueuedSamples());
- ASSERT_EQ(1, GetNumQueuedPackets());
-
- // Fake lots of queued samples.
- SetQueuedSamples(20000);
+ // Push about 4 seconds worth of samples.
+ for (int i = 0; i < 100; ++i) {
+ scoped_ptr<AudioPacket> packet1(CreatePacket48000Hz(2000));
+ audio_->ProcessAudioPacket(packet1.Pass());
+ }
- // 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
« no previous file with comments | « remoting/client/audio_player.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698