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

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

Issue 214273003: [Cast] Remove AudioDecoder's dependency on WebRTC, and refactor/clean-up AudioReceiver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One moar Windows compile fix. 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 | Annotate | Revision Log
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.gypi ('k') | media/cast/cast_receiver.h » ('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"
11 #include "media/cast/cast_environment.h" 11 #include "media/cast/cast_environment.h"
12 #include "media/cast/logging/simple_event_subscriber.h" 12 #include "media/cast/logging/simple_event_subscriber.h"
13 #include "media/cast/rtcp/test_rtcp_packet_builder.h" 13 #include "media/cast/rtcp/test_rtcp_packet_builder.h"
14 #include "media/cast/test/fake_single_thread_task_runner.h" 14 #include "media/cast/test/fake_single_thread_task_runner.h"
15 #include "media/cast/transport/pacing/mock_paced_packet_sender.h" 15 #include "media/cast/transport/pacing/mock_paced_packet_sender.h"
16 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
17 17
18 namespace media { 18 namespace media {
19 namespace cast { 19 namespace cast {
20 20
21 static const int64 kStartMillisecond = GG_INT64_C(12345678900000); 21 static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
22 22
23 namespace { 23 namespace {
24 class TestAudioEncoderCallback 24 class FakeAudioClient {
25 : public base::RefCountedThreadSafe<TestAudioEncoderCallback> {
26 public: 25 public:
27 TestAudioEncoderCallback() : num_called_(0) {} 26 FakeAudioClient() : num_called_(0) {}
27 virtual ~FakeAudioClient() {}
28 28
29 void SetExpectedResult(uint8 expected_frame_id, 29 void SetNextExpectedResult(uint8 expected_frame_id,
30 const base::TimeTicks& expected_playout_time) { 30 const base::TimeTicks& expected_playout_time) {
31 expected_frame_id_ = expected_frame_id; 31 expected_frame_id_ = expected_frame_id;
32 expected_playout_time_ = expected_playout_time; 32 expected_playout_time_ = expected_playout_time;
33 } 33 }
34 34
35 void DeliverEncodedAudioFrame( 35 void DeliverEncodedAudioFrame(
36 scoped_ptr<transport::EncodedAudioFrame> audio_frame, 36 scoped_ptr<transport::EncodedAudioFrame> audio_frame,
37 const base::TimeTicks& playout_time) { 37 const base::TimeTicks& playout_time) {
38 ASSERT_FALSE(!audio_frame)
39 << "If at shutdown: There were unsatisfied requests enqueued.";
38 EXPECT_EQ(expected_frame_id_, audio_frame->frame_id); 40 EXPECT_EQ(expected_frame_id_, audio_frame->frame_id);
39 EXPECT_EQ(transport::kPcm16, audio_frame->codec); 41 EXPECT_EQ(transport::kPcm16, audio_frame->codec);
40 EXPECT_EQ(expected_playout_time_, playout_time); 42 EXPECT_EQ(expected_playout_time_, playout_time);
41 num_called_++; 43 num_called_++;
42 } 44 }
43 45
44 int number_times_called() const { return num_called_; } 46 int number_times_called() const { return num_called_; }
45 47
46 protected:
47 virtual ~TestAudioEncoderCallback() {}
48
49 private: 48 private:
50 friend class base::RefCountedThreadSafe<TestAudioEncoderCallback>;
51
52 int num_called_; 49 int num_called_;
53 uint8 expected_frame_id_; 50 uint8 expected_frame_id_;
54 base::TimeTicks expected_playout_time_; 51 base::TimeTicks expected_playout_time_;
55 52
56 DISALLOW_COPY_AND_ASSIGN(TestAudioEncoderCallback); 53 DISALLOW_COPY_AND_ASSIGN(FakeAudioClient);
57 }; 54 };
58 } // namespace 55 } // namespace
59 56
60 class AudioReceiverTest : public ::testing::Test { 57 class AudioReceiverTest : public ::testing::Test {
61 protected: 58 protected:
62 AudioReceiverTest() { 59 AudioReceiverTest() {
63 // Configure the audio receiver to use PCM16. 60 // Configure the audio receiver to use PCM16.
64 audio_config_.rtp_payload_type = 127; 61 audio_config_.rtp_payload_type = 127;
65 audio_config_.frequency = 16000; 62 audio_config_.frequency = 16000;
66 audio_config_.channels = 1; 63 audio_config_.channels = 1;
67 audio_config_.codec = transport::kPcm16; 64 audio_config_.codec = transport::kPcm16;
68 audio_config_.use_external_decoder = false; 65 audio_config_.use_external_decoder = false;
69 audio_config_.feedback_ssrc = 1234; 66 audio_config_.feedback_ssrc = 1234;
70 testing_clock_ = new base::SimpleTestTickClock(); 67 testing_clock_ = new base::SimpleTestTickClock();
71 testing_clock_->Advance( 68 testing_clock_->Advance(
72 base::TimeDelta::FromMilliseconds(kStartMillisecond)); 69 base::TimeDelta::FromMilliseconds(kStartMillisecond));
73 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); 70 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
74 71
75 cast_environment_ = new CastEnvironment( 72 cast_environment_ = new CastEnvironment(
76 scoped_ptr<base::TickClock>(testing_clock_).Pass(), 73 scoped_ptr<base::TickClock>(testing_clock_).Pass(),
77 task_runner_, 74 task_runner_,
78 task_runner_, 75 task_runner_,
79 task_runner_); 76 task_runner_);
80
81 test_audio_encoder_callback_ = new TestAudioEncoderCallback();
82 } 77 }
83 78
84 void Configure(bool use_external_decoder) { 79 void Configure(bool use_external_decoder) {
85 audio_config_.use_external_decoder = use_external_decoder; 80 audio_config_.use_external_decoder = use_external_decoder;
86 receiver_.reset(new AudioReceiver(cast_environment_, audio_config_, 81 receiver_.reset(new AudioReceiver(cast_environment_, audio_config_,
87 &mock_transport_)); 82 &mock_transport_));
88 } 83 }
89 84
90 virtual ~AudioReceiverTest() {} 85 virtual ~AudioReceiverTest() {}
91 86
92 static void DummyDeletePacket(const uint8* packet) {};
93
94 virtual void SetUp() { 87 virtual void SetUp() {
95 payload_.assign(kMaxIpPacketSize, 0); 88 payload_.assign(kMaxIpPacketSize, 0);
96 rtp_header_.is_key_frame = true; 89 rtp_header_.is_key_frame = true;
97 rtp_header_.frame_id = 0; 90 rtp_header_.frame_id = 0;
98 rtp_header_.packet_id = 0; 91 rtp_header_.packet_id = 0;
99 rtp_header_.max_packet_id = 0; 92 rtp_header_.max_packet_id = 0;
100 rtp_header_.is_reference = false; 93 rtp_header_.is_reference = false;
101 rtp_header_.reference_frame_id = 0; 94 rtp_header_.reference_frame_id = 0;
102 rtp_header_.webrtc.header.timestamp = 0; 95 rtp_header_.webrtc.header.timestamp = 0;
103 } 96 }
104 97
98 void FeedOneFrameIntoReceiver() {
99 receiver_->OnReceivedPayloadData(
100 payload_.data(), payload_.size(), rtp_header_);
101 }
102
105 AudioReceiverConfig audio_config_; 103 AudioReceiverConfig audio_config_;
106 std::vector<uint8> payload_; 104 std::vector<uint8> payload_;
107 RtpCastHeader rtp_header_; 105 RtpCastHeader rtp_header_;
108 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 106 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
109 transport::MockPacedPacketSender mock_transport_; 107 transport::MockPacedPacketSender mock_transport_;
110 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; 108 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
109 scoped_refptr<CastEnvironment> cast_environment_;
110 FakeAudioClient fake_audio_client_;
111
112 // Important for the AudioReceiver to be declared last, since its dependencies
113 // must remain alive until after its destruction.
111 scoped_ptr<AudioReceiver> receiver_; 114 scoped_ptr<AudioReceiver> receiver_;
112 scoped_refptr<CastEnvironment> cast_environment_;
113 scoped_refptr<TestAudioEncoderCallback> test_audio_encoder_callback_;
114 }; 115 };
115 116
116 TEST_F(AudioReceiverTest, GetOnePacketEncodedframe) { 117 TEST_F(AudioReceiverTest, GetOnePacketEncodedframe) {
117 SimpleEventSubscriber event_subscriber; 118 SimpleEventSubscriber event_subscriber;
118 cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber); 119 cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber);
119 120
120 Configure(true); 121 Configure(true);
121 EXPECT_CALL(mock_transport_, SendRtcpPacket(testing::_)).Times(1); 122 EXPECT_CALL(mock_transport_, SendRtcpPacket(testing::_)).Times(1);
122 123
123 receiver_->OnReceivedPayloadData( 124 // Enqueue a request for an audio frame.
124 payload_.data(), payload_.size(), rtp_header_); 125 receiver_->GetEncodedAudioFrame(
125 transport::EncodedAudioFrame audio_frame; 126 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
126 base::TimeTicks playout_time; 127 base::Unretained(&fake_audio_client_)));
127 test_audio_encoder_callback_->SetExpectedResult(0,
128 testing_clock_->NowTicks());
129 128
130 AudioFrameEncodedCallback frame_encoded_callback = 129 // The request should not be satisfied since no packets have been received.
131 base::Bind(&TestAudioEncoderCallback::DeliverEncodedAudioFrame, 130 task_runner_->RunTasks();
132 test_audio_encoder_callback_.get()); 131 EXPECT_EQ(0, fake_audio_client_.number_times_called());
133 132
134 receiver_->GetEncodedAudioFrame(frame_encoded_callback); 133 // Deliver one audio frame to the receiver and expect to get one frame back.
134 fake_audio_client_.SetNextExpectedResult(0, testing_clock_->NowTicks());
135 FeedOneFrameIntoReceiver();
135 task_runner_->RunTasks(); 136 task_runner_->RunTasks();
136 EXPECT_EQ(1, test_audio_encoder_callback_->number_times_called()); 137 EXPECT_EQ(1, fake_audio_client_.number_times_called());
137 138
138 std::vector<FrameEvent> frame_events; 139 std::vector<FrameEvent> frame_events;
139 event_subscriber.GetFrameEventsAndReset(&frame_events); 140 event_subscriber.GetFrameEventsAndReset(&frame_events);
140 141
141 ASSERT_TRUE(!frame_events.empty()); 142 ASSERT_TRUE(!frame_events.empty());
142 EXPECT_EQ(kAudioAckSent, frame_events.begin()->type); 143 EXPECT_EQ(kAudioAckSent, frame_events.begin()->type);
143 EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id); 144 EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id);
144 EXPECT_EQ(rtp_header_.webrtc.header.timestamp, 145 EXPECT_EQ(rtp_header_.webrtc.header.timestamp,
145 frame_events.begin()->rtp_timestamp); 146 frame_events.begin()->rtp_timestamp);
146 147
147 cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber); 148 cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
148 } 149 }
149 150
150 TEST_F(AudioReceiverTest, MultiplePendingGetCalls) { 151 TEST_F(AudioReceiverTest, MultiplePendingGetCalls) {
151 Configure(true); 152 Configure(true);
152 EXPECT_CALL(mock_transport_, SendRtcpPacket(testing::_)) 153 EXPECT_CALL(mock_transport_, SendRtcpPacket(testing::_))
153 .WillRepeatedly(testing::Return(true)); 154 .WillRepeatedly(testing::Return(true));
154 155
155 AudioFrameEncodedCallback frame_encoded_callback = 156 // Enqueue a request for an audio frame.
156 base::Bind(&TestAudioEncoderCallback::DeliverEncodedAudioFrame, 157 const AudioFrameEncodedCallback frame_encoded_callback =
157 test_audio_encoder_callback_.get()); 158 base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
159 base::Unretained(&fake_audio_client_));
160 receiver_->GetEncodedAudioFrame(frame_encoded_callback);
161 task_runner_->RunTasks();
162 EXPECT_EQ(0, fake_audio_client_.number_times_called());
158 163
159 receiver_->GetEncodedAudioFrame(frame_encoded_callback); 164 // Receive one audio frame and expect to see the first request satisfied.
160 165 fake_audio_client_.SetNextExpectedResult(0, testing_clock_->NowTicks());
161 receiver_->OnReceivedPayloadData( 166 FeedOneFrameIntoReceiver();
162 payload_.data(), payload_.size(), rtp_header_);
163
164 transport::EncodedAudioFrame audio_frame;
165 base::TimeTicks playout_time;
166 test_audio_encoder_callback_->SetExpectedResult(0,
167 testing_clock_->NowTicks());
168
169 task_runner_->RunTasks(); 167 task_runner_->RunTasks();
170 EXPECT_EQ(1, test_audio_encoder_callback_->number_times_called()); 168 EXPECT_EQ(1, fake_audio_client_.number_times_called());
171 169
172 TestRtcpPacketBuilder rtcp_packet; 170 TestRtcpPacketBuilder rtcp_packet;
173 171
174 uint32 ntp_high; 172 uint32 ntp_high;
175 uint32 ntp_low; 173 uint32 ntp_low;
176 ConvertTimeTicksToNtp(testing_clock_->NowTicks(), &ntp_high, &ntp_low); 174 ConvertTimeTicksToNtp(testing_clock_->NowTicks(), &ntp_high, &ntp_low);
177 rtcp_packet.AddSrWithNtp(audio_config_.feedback_ssrc, ntp_high, ntp_low, 175 rtcp_packet.AddSrWithNtp(audio_config_.feedback_ssrc, ntp_high, ntp_low,
178 rtp_header_.webrtc.header.timestamp); 176 rtp_header_.webrtc.header.timestamp);
179 177
180 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20)); 178 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20));
181 179
182 receiver_->IncomingPacket(rtcp_packet.GetPacket().Pass()); 180 receiver_->IncomingPacket(rtcp_packet.GetPacket().Pass());
183 181
184 // Make sure that we are not continuous and that the RTP timestamp represent a 182 // Enqueue a second request for an audio frame, but it should not be
185 // time in the future. 183 // fulfilled yet.
184 receiver_->GetEncodedAudioFrame(frame_encoded_callback);
185 task_runner_->RunTasks();
186 EXPECT_EQ(1, fake_audio_client_.number_times_called());
187
188 // Receive one audio frame out-of-order: Make sure that we are not continuous
189 // and that the RTP timestamp represents a time in the future.
186 rtp_header_.is_key_frame = false; 190 rtp_header_.is_key_frame = false;
187 rtp_header_.frame_id = 2; 191 rtp_header_.frame_id = 2;
188 rtp_header_.is_reference = true; 192 rtp_header_.is_reference = true;
189 rtp_header_.reference_frame_id = 0; 193 rtp_header_.reference_frame_id = 0;
190 rtp_header_.webrtc.header.timestamp = 960; 194 rtp_header_.webrtc.header.timestamp = 960;
191 test_audio_encoder_callback_->SetExpectedResult( 195 fake_audio_client_.SetNextExpectedResult(
192 2, testing_clock_->NowTicks() + base::TimeDelta::FromMilliseconds(100)); 196 2, testing_clock_->NowTicks() + base::TimeDelta::FromMilliseconds(100));
197 FeedOneFrameIntoReceiver();
193 198
194 receiver_->OnReceivedPayloadData( 199 // Frame 2 should not come out at this point in time.
195 payload_.data(), payload_.size(), rtp_header_); 200 task_runner_->RunTasks();
201 EXPECT_EQ(1, fake_audio_client_.number_times_called());
202
203 // Enqueue a third request for an audio frame.
196 receiver_->GetEncodedAudioFrame(frame_encoded_callback); 204 receiver_->GetEncodedAudioFrame(frame_encoded_callback);
197 task_runner_->RunTasks(); 205 task_runner_->RunTasks();
206 EXPECT_EQ(1, fake_audio_client_.number_times_called());
198 207
199 // Frame 2 should not come out at this point in time. 208 // After 100 ms has elapsed, Frame 2 is emitted (to satisfy the second
200 EXPECT_EQ(1, test_audio_encoder_callback_->number_times_called()); 209 // request) because a decision was made to skip over the no-show Frame 1.
210 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100));
211 task_runner_->RunTasks();
212 EXPECT_EQ(2, fake_audio_client_.number_times_called());
201 213
202 // Through on one more pending callback. 214 // Receive Frame 3 and expect it to fulfill the third request immediately.
203 receiver_->GetEncodedAudioFrame(frame_encoded_callback);
204
205 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100));
206
207 task_runner_->RunTasks();
208 EXPECT_EQ(2, test_audio_encoder_callback_->number_times_called());
209
210 test_audio_encoder_callback_->SetExpectedResult(3,
211 testing_clock_->NowTicks());
212
213 // Through on one more pending audio frame.
214 rtp_header_.frame_id = 3; 215 rtp_header_.frame_id = 3;
215 rtp_header_.is_reference = false; 216 rtp_header_.is_reference = false;
216 rtp_header_.reference_frame_id = 0; 217 rtp_header_.reference_frame_id = 0;
217 rtp_header_.webrtc.header.timestamp = 1280; 218 rtp_header_.webrtc.header.timestamp = 1280;
218 receiver_->OnReceivedPayloadData( 219 fake_audio_client_.SetNextExpectedResult(3, testing_clock_->NowTicks());
219 payload_.data(), payload_.size(), rtp_header_); 220 FeedOneFrameIntoReceiver();
221 task_runner_->RunTasks();
222 EXPECT_EQ(3, fake_audio_client_.number_times_called());
220 223
221 receiver_->GetEncodedAudioFrame(frame_encoded_callback); 224 // Move forward another 100 ms and run any pending tasks (there should be
225 // none). Expect no additional frames where emitted.
226 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100));
222 task_runner_->RunTasks(); 227 task_runner_->RunTasks();
223 EXPECT_EQ(3, test_audio_encoder_callback_->number_times_called()); 228 EXPECT_EQ(3, fake_audio_client_.number_times_called());
224 } 229 }
225 230
226 // TODO(mikhal): Add encoded frames.
227 TEST_F(AudioReceiverTest, GetRawFrame) {}
228
229 } // namespace cast 231 } // namespace cast
230 } // namespace media 232 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.gypi ('k') | media/cast/cast_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698