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

Side by Side Diff: media/cast/audio_receiver/audio_receiver_unittest.cc

Issue 248493002: Cast: Deduplicate packets in paced sender and always send older packets first (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-upping to trick build system Created 6 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/cast/rtcp/rtcp_sender.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/test/simple_test_tick_clock.h" 8 #include "base/test/simple_test_tick_clock.h"
9 #include "media/cast/audio_receiver/audio_receiver.h" 9 #include "media/cast/audio_receiver/audio_receiver.h"
10 #include "media/cast/cast_defines.h" 10 #include "media/cast/cast_defines.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 // Important for the AudioReceiver to be declared last, since its dependencies 113 // Important for the AudioReceiver to be declared last, since its dependencies
114 // must remain alive until after its destruction. 114 // must remain alive until after its destruction.
115 scoped_ptr<AudioReceiver> receiver_; 115 scoped_ptr<AudioReceiver> receiver_;
116 }; 116 };
117 117
118 TEST_F(AudioReceiverTest, GetOnePacketEncodedFrame) { 118 TEST_F(AudioReceiverTest, GetOnePacketEncodedFrame) {
119 SimpleEventSubscriber event_subscriber; 119 SimpleEventSubscriber event_subscriber;
120 cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber); 120 cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber);
121 121
122 EXPECT_CALL(mock_transport_, SendRtcpPacket(_)).Times(1); 122 EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _)).Times(1);
123 123
124 // Enqueue a request for an audio frame. 124 // Enqueue a request for an audio frame.
125 receiver_->GetEncodedAudioFrame( 125 receiver_->GetEncodedAudioFrame(
126 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame, 126 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
127 base::Unretained(&fake_audio_client_))); 127 base::Unretained(&fake_audio_client_)));
128 128
129 // The request should not be satisfied since no packets have been received. 129 // The request should not be satisfied since no packets have been received.
130 task_runner_->RunTasks(); 130 task_runner_->RunTasks();
131 EXPECT_EQ(0, fake_audio_client_.number_times_called()); 131 EXPECT_EQ(0, fake_audio_client_.number_times_called());
132 132
133 // Deliver one audio frame to the receiver and expect to get one frame back. 133 // Deliver one audio frame to the receiver and expect to get one frame back.
134 fake_audio_client_.SetNextExpectedResult(kFirstFrameId, 134 fake_audio_client_.SetNextExpectedResult(kFirstFrameId,
135 testing_clock_->NowTicks()); 135 testing_clock_->NowTicks());
136 FeedOneFrameIntoReceiver(); 136 FeedOneFrameIntoReceiver();
137 task_runner_->RunTasks(); 137 task_runner_->RunTasks();
138 EXPECT_EQ(1, fake_audio_client_.number_times_called()); 138 EXPECT_EQ(1, fake_audio_client_.number_times_called());
139 139
140 std::vector<FrameEvent> frame_events; 140 std::vector<FrameEvent> frame_events;
141 event_subscriber.GetFrameEventsAndReset(&frame_events); 141 event_subscriber.GetFrameEventsAndReset(&frame_events);
142 142
143 ASSERT_TRUE(!frame_events.empty()); 143 ASSERT_TRUE(!frame_events.empty());
144 EXPECT_EQ(kAudioAckSent, frame_events.begin()->type); 144 EXPECT_EQ(kAudioAckSent, frame_events.begin()->type);
145 EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id); 145 EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id);
146 EXPECT_EQ(rtp_header_.rtp_timestamp, frame_events.begin()->rtp_timestamp); 146 EXPECT_EQ(rtp_header_.rtp_timestamp, frame_events.begin()->rtp_timestamp);
147 147
148 cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber); 148 cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
149 } 149 }
150 150
151 TEST_F(AudioReceiverTest, MultiplePendingGetCalls) { 151 TEST_F(AudioReceiverTest, MultiplePendingGetCalls) {
152 EXPECT_CALL(mock_transport_, SendRtcpPacket(_)) 152 EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
153 .WillRepeatedly(testing::Return(true)); 153 .WillRepeatedly(testing::Return(true));
154 154
155 // Enqueue a request for an audio frame. 155 // Enqueue a request for an audio frame.
156 const AudioFrameEncodedCallback frame_encoded_callback = 156 const AudioFrameEncodedCallback frame_encoded_callback =
157 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame, 157 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
158 base::Unretained(&fake_audio_client_)); 158 base::Unretained(&fake_audio_client_));
159 receiver_->GetEncodedAudioFrame(frame_encoded_callback); 159 receiver_->GetEncodedAudioFrame(frame_encoded_callback);
160 task_runner_->RunTasks(); 160 task_runner_->RunTasks();
161 EXPECT_EQ(0, fake_audio_client_.number_times_called()); 161 EXPECT_EQ(0, fake_audio_client_.number_times_called());
162 162
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 // Move forward another 100 ms and run any pending tasks (there should be 224 // Move forward another 100 ms and run any pending tasks (there should be
225 // none). Expect no additional frames where emitted. 225 // none). Expect no additional frames where emitted.
226 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100)); 226 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100));
227 task_runner_->RunTasks(); 227 task_runner_->RunTasks();
228 EXPECT_EQ(3, fake_audio_client_.number_times_called()); 228 EXPECT_EQ(3, fake_audio_client_.number_times_called());
229 } 229 }
230 230
231 } // namespace cast 231 } // namespace cast
232 } // namespace media 232 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/cast/rtcp/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698