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

Unified Diff: media/cast/audio_receiver/audio_receiver_unittest.cc

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.cc ('k') | media/cast/audio_sender/audio_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 02fe169e9a52b2d3c41582ea5aa1b848da1c3656..573287d5f2f22b8f393156bca02bee24aa8060a4 100644
--- a/media/cast/audio_receiver/audio_receiver_unittest.cc
+++ b/media/cast/audio_receiver/audio_receiver_unittest.cc
@@ -32,11 +32,10 @@
expected_playout_time_ = expected_playout_time;
}
- void DeliverEncodedAudioFrame(
- scoped_ptr<transport::EncodedAudioFrame> audio_frame,
- const base::TimeTicks& playout_time) {
+ void DeliverEncodedAudioFrame(scoped_ptr<EncodedAudioFrame> audio_frame,
+ const base::TimeTicks& playout_time) {
EXPECT_EQ(expected_frame_id_, audio_frame->frame_id);
- EXPECT_EQ(transport::kPcm16, audio_frame->codec);
+ EXPECT_EQ(kPcm16, audio_frame->codec);
EXPECT_EQ(expected_playout_time_, playout_time);
num_called_++;
}
@@ -72,7 +71,7 @@
audio_config_.rtp_payload_type = 127;
audio_config_.frequency = 16000;
audio_config_.channels = 1;
- audio_config_.codec = transport::kPcm16;
+ audio_config_.codec = kPcm16;
audio_config_.use_external_decoder = false;
audio_config_.feedback_ssrc = 1234;
testing_clock_.Advance(
@@ -80,7 +79,7 @@
task_runner_ = new test::FakeTaskRunner(&testing_clock_);
cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
task_runner_, task_runner_, task_runner_, task_runner_,
- task_runner_, GetDefaultCastLoggingConfig());
+ GetDefaultCastLoggingConfig());
test_audio_encoder_callback_ = new TestAudioEncoderCallback();
}
@@ -95,7 +94,7 @@
static void DummyDeletePacket(const uint8* packet) {};
virtual void SetUp() {
- payload_.assign(kMaxIpPacketSize, 0);
+ payload_.assign(kIpPacketSize, 0);
rtp_header_.is_key_frame = true;
rtp_header_.frame_id = 0;
rtp_header_.packet_id = 0;
@@ -122,7 +121,7 @@
receiver_->IncomingParsedRtpPacket(payload_.data(),
payload_.size(), rtp_header_);
- transport::EncodedAudioFrame audio_frame;
+ EncodedAudioFrame audio_frame;
base::TimeTicks playout_time;
test_audio_encoder_callback_->SetExpectedResult(0, testing_clock_.NowTicks());
@@ -149,7 +148,7 @@
receiver_->IncomingParsedRtpPacket(payload_.data(), payload_.size(),
rtp_header_);
- transport::EncodedAudioFrame audio_frame;
+ EncodedAudioFrame audio_frame;
base::TimeTicks playout_time;
test_audio_encoder_callback_->SetExpectedResult(0, testing_clock_.NowTicks());
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.cc ('k') | media/cast/audio_sender/audio_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698