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

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

Issue 288103002: [Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 f2725ffd5c5f80fb992c110e65a520f60c91fe93..bcb7e3412186d6cbcf1f1a0efc2ed12940c9449e 100644
--- a/media/cast/audio_receiver/audio_receiver_unittest.cc
+++ b/media/cast/audio_receiver/audio_receiver_unittest.cc
@@ -37,13 +37,11 @@ class FakeAudioClient {
}
void DeliverEncodedAudioFrame(
- scoped_ptr<transport::EncodedAudioFrame> audio_frame,
- const base::TimeTicks& playout_time) {
+ scoped_ptr<transport::EncodedFrame> audio_frame) {
ASSERT_FALSE(!audio_frame)
<< "If at shutdown: There were unsatisfied requests enqueued.";
EXPECT_EQ(expected_frame_id_, audio_frame->frame_id);
- EXPECT_EQ(transport::kPcm16, audio_frame->codec);
- EXPECT_EQ(expected_playout_time_, playout_time);
+ EXPECT_EQ(expected_playout_time_, audio_frame->reference_time);
num_called_++;
}
@@ -92,7 +90,7 @@ class AudioReceiverTest : public ::testing::Test {
rtp_header_.frame_id = kFirstFrameId;
rtp_header_.packet_id = 0;
rtp_header_.max_packet_id = 0;
- rtp_header_.reference_frame_id = 0;
+ rtp_header_.reference_frame_id = rtp_header_.frame_id;
rtp_header_.rtp_timestamp = 0;
}
@@ -154,7 +152,7 @@ TEST_F(AudioReceiverTest, MultiplePendingGetCalls) {
.WillRepeatedly(testing::Return(true));
// Enqueue a request for an audio frame.
- const AudioFrameEncodedCallback frame_encoded_callback =
+ const FrameEncodedCallback frame_encoded_callback =
base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
base::Unretained(&fake_audio_client_));
receiver_->GetEncodedAudioFrame(frame_encoded_callback);
« 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