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

Side by Side Diff: media/cast/sender/audio_sender_unittest.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « media/cast/sender/audio_sender.cc ('k') | media/cast/sender/external_video_encoder.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/cast/sender/audio_sender.h"
6
5 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility>
6 9
7 #include "base/bind.h" 10 #include "base/bind.h"
8 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
9 #include "base/macros.h" 12 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "base/test/simple_test_tick_clock.h" 14 #include "base/test/simple_test_tick_clock.h"
12 #include "base/values.h" 15 #include "base/values.h"
13 #include "media/base/media.h" 16 #include "media/base/media.h"
14 #include "media/cast/cast_config.h" 17 #include "media/cast/cast_config.h"
15 #include "media/cast/cast_environment.h" 18 #include "media/cast/cast_environment.h"
16 #include "media/cast/constants.h" 19 #include "media/cast/constants.h"
17 #include "media/cast/net/cast_transport_config.h" 20 #include "media/cast/net/cast_transport_config.h"
18 #include "media/cast/net/cast_transport_sender_impl.h" 21 #include "media/cast/net/cast_transport_sender_impl.h"
19 #include "media/cast/sender/audio_sender.h"
20 #include "media/cast/test/fake_single_thread_task_runner.h" 22 #include "media/cast/test/fake_single_thread_task_runner.h"
21 #include "media/cast/test/utility/audio_utility.h" 23 #include "media/cast/test/utility/audio_utility.h"
22 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
23 25
24 namespace media { 26 namespace media {
25 namespace cast { 27 namespace cast {
26 28
27 namespace { 29 namespace {
28 30
29 void SaveOperationalStatus(OperationalStatus* out_status, 31 void SaveOperationalStatus(OperationalStatus* out_status,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 }; 70 };
69 71
70 class AudioSenderTest : public ::testing::Test { 72 class AudioSenderTest : public ::testing::Test {
71 protected: 73 protected:
72 AudioSenderTest() { 74 AudioSenderTest() {
73 InitializeMediaLibrary(); 75 InitializeMediaLibrary();
74 testing_clock_ = new base::SimpleTestTickClock(); 76 testing_clock_ = new base::SimpleTestTickClock();
75 testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks()); 77 testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
76 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); 78 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
77 cast_environment_ = 79 cast_environment_ =
78 new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(), 80 new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_),
79 task_runner_, 81 task_runner_, task_runner_, task_runner_);
80 task_runner_,
81 task_runner_);
82 audio_config_.codec = CODEC_AUDIO_OPUS; 82 audio_config_.codec = CODEC_AUDIO_OPUS;
83 audio_config_.use_external_encoder = false; 83 audio_config_.use_external_encoder = false;
84 audio_config_.frequency = kDefaultAudioSamplingRate; 84 audio_config_.frequency = kDefaultAudioSamplingRate;
85 audio_config_.channels = 2; 85 audio_config_.channels = 2;
86 audio_config_.bitrate = kDefaultAudioEncoderBitrate; 86 audio_config_.bitrate = kDefaultAudioEncoderBitrate;
87 audio_config_.rtp_payload_type = 127; 87 audio_config_.rtp_payload_type = 127;
88 88
89 net::IPEndPoint dummy_endpoint; 89 net::IPEndPoint dummy_endpoint;
90 90
91 transport_sender_.reset(new CastTransportSenderImpl( 91 transport_sender_.reset(new CastTransportSenderImpl(
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 }; 126 };
127 127
128 TEST_F(AudioSenderTest, Encode20ms) { 128 TEST_F(AudioSenderTest, Encode20ms) {
129 const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20); 129 const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
130 scoped_ptr<AudioBus> bus( 130 scoped_ptr<AudioBus> bus(
131 TestAudioBusFactory(audio_config_.channels, 131 TestAudioBusFactory(audio_config_.channels,
132 audio_config_.frequency, 132 audio_config_.frequency,
133 TestAudioBusFactory::kMiddleANoteFreq, 133 TestAudioBusFactory::kMiddleANoteFreq,
134 0.5f).NextAudioBus(kDuration)); 134 0.5f).NextAudioBus(kDuration));
135 135
136 audio_sender_->InsertAudio(bus.Pass(), testing_clock_->NowTicks()); 136 audio_sender_->InsertAudio(std::move(bus), testing_clock_->NowTicks());
137 task_runner_->RunTasks(); 137 task_runner_->RunTasks();
138 EXPECT_LE(1, transport_.number_of_rtp_packets()); 138 EXPECT_LE(1, transport_.number_of_rtp_packets());
139 EXPECT_LE(1, transport_.number_of_rtcp_packets()); 139 EXPECT_LE(1, transport_.number_of_rtcp_packets());
140 } 140 }
141 141
142 TEST_F(AudioSenderTest, RtcpTimer) { 142 TEST_F(AudioSenderTest, RtcpTimer) {
143 const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20); 143 const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
144 scoped_ptr<AudioBus> bus( 144 scoped_ptr<AudioBus> bus(
145 TestAudioBusFactory(audio_config_.channels, 145 TestAudioBusFactory(audio_config_.channels,
146 audio_config_.frequency, 146 audio_config_.frequency,
147 TestAudioBusFactory::kMiddleANoteFreq, 147 TestAudioBusFactory::kMiddleANoteFreq,
148 0.5f).NextAudioBus(kDuration)); 148 0.5f).NextAudioBus(kDuration));
149 149
150 audio_sender_->InsertAudio(bus.Pass(), testing_clock_->NowTicks()); 150 audio_sender_->InsertAudio(std::move(bus), testing_clock_->NowTicks());
151 task_runner_->RunTasks(); 151 task_runner_->RunTasks();
152 152
153 // Make sure that we send at least one RTCP packet. 153 // Make sure that we send at least one RTCP packet.
154 base::TimeDelta max_rtcp_timeout = 154 base::TimeDelta max_rtcp_timeout =
155 base::TimeDelta::FromMilliseconds(1 + kRtcpReportIntervalMs * 3 / 2); 155 base::TimeDelta::FromMilliseconds(1 + kRtcpReportIntervalMs * 3 / 2);
156 testing_clock_->Advance(max_rtcp_timeout); 156 testing_clock_->Advance(max_rtcp_timeout);
157 task_runner_->RunTasks(); 157 task_runner_->RunTasks();
158 EXPECT_LE(1, transport_.number_of_rtp_packets()); 158 EXPECT_LE(1, transport_.number_of_rtp_packets());
159 EXPECT_LE(1, transport_.number_of_rtcp_packets()); 159 EXPECT_LE(1, transport_.number_of_rtcp_packets());
160 } 160 }
161 161
162 } // namespace cast 162 } // namespace cast
163 } // namespace media 163 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/audio_sender.cc ('k') | media/cast/sender/external_video_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698