Index: media/cast/audio_receiver/audio_receiver_unittest.cc |
diff --git a/media/cast/audio_receiver/audio_receiver_unittest.cc b/media/cast/audio_receiver/audio_receiver_unittest.cc |
index 573287d5f2f22b8f393156bca02bee24aa8060a4..02fe169e9a52b2d3c41582ea5aa1b848da1c3656 100644 |
--- a/media/cast/audio_receiver/audio_receiver_unittest.cc |
+++ b/media/cast/audio_receiver/audio_receiver_unittest.cc |
@@ -32,10 +32,11 @@ class TestAudioEncoderCallback : |
expected_playout_time_ = expected_playout_time; |
} |
- void DeliverEncodedAudioFrame(scoped_ptr<EncodedAudioFrame> audio_frame, |
- const base::TimeTicks& playout_time) { |
+ void DeliverEncodedAudioFrame( |
+ scoped_ptr<transport::EncodedAudioFrame> audio_frame, |
+ const base::TimeTicks& playout_time) { |
EXPECT_EQ(expected_frame_id_, audio_frame->frame_id); |
- EXPECT_EQ(kPcm16, audio_frame->codec); |
+ EXPECT_EQ(transport::kPcm16, audio_frame->codec); |
EXPECT_EQ(expected_playout_time_, playout_time); |
num_called_++; |
} |
@@ -71,7 +72,7 @@ class AudioReceiverTest : public ::testing::Test { |
audio_config_.rtp_payload_type = 127; |
audio_config_.frequency = 16000; |
audio_config_.channels = 1; |
- audio_config_.codec = kPcm16; |
+ audio_config_.codec = transport::kPcm16; |
audio_config_.use_external_decoder = false; |
audio_config_.feedback_ssrc = 1234; |
testing_clock_.Advance( |
@@ -79,7 +80,7 @@ class AudioReceiverTest : public ::testing::Test { |
task_runner_ = new test::FakeTaskRunner(&testing_clock_); |
cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_, |
task_runner_, task_runner_, task_runner_, task_runner_, |
- GetDefaultCastLoggingConfig()); |
+ task_runner_, GetDefaultCastLoggingConfig()); |
test_audio_encoder_callback_ = new TestAudioEncoderCallback(); |
} |
@@ -94,7 +95,7 @@ class AudioReceiverTest : public ::testing::Test { |
static void DummyDeletePacket(const uint8* packet) {}; |
virtual void SetUp() { |
- payload_.assign(kIpPacketSize, 0); |
+ payload_.assign(kMaxIpPacketSize, 0); |
rtp_header_.is_key_frame = true; |
rtp_header_.frame_id = 0; |
rtp_header_.packet_id = 0; |
@@ -121,7 +122,7 @@ TEST_F(AudioReceiverTest, GetOnePacketEncodedframe) { |
receiver_->IncomingParsedRtpPacket(payload_.data(), |
payload_.size(), rtp_header_); |
- EncodedAudioFrame audio_frame; |
+ transport::EncodedAudioFrame audio_frame; |
base::TimeTicks playout_time; |
test_audio_encoder_callback_->SetExpectedResult(0, testing_clock_.NowTicks()); |
@@ -148,7 +149,7 @@ TEST_F(AudioReceiverTest, MultiplePendingGetCalls) { |
receiver_->IncomingParsedRtpPacket(payload_.data(), payload_.size(), |
rtp_header_); |
- EncodedAudioFrame audio_frame; |
+ transport::EncodedAudioFrame audio_frame; |
base::TimeTicks playout_time; |
test_audio_encoder_callback_->SetExpectedResult(0, testing_clock_.NowTicks()); |