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

Unified Diff: media/cast/video_receiver/video_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/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_receiver_unittest.cc
diff --git a/media/cast/video_receiver/video_receiver_unittest.cc b/media/cast/video_receiver/video_receiver_unittest.cc
index e9d8bbd907afdc2fe3999d0d039722af23a6eed2..4cc7dd2c0f68e15e23f1eadfd746d917ad55317e 100644
--- a/media/cast/video_receiver/video_receiver_unittest.cc
+++ b/media/cast/video_receiver/video_receiver_unittest.cc
@@ -37,13 +37,11 @@ class FakeVideoClient {
}
void DeliverEncodedVideoFrame(
- scoped_ptr<transport::EncodedVideoFrame> video_frame,
- const base::TimeTicks& playout_time) {
+ scoped_ptr<transport::EncodedFrame> video_frame) {
ASSERT_FALSE(!video_frame)
<< "If at shutdown: There were unsatisfied requests enqueued.";
EXPECT_EQ(expected_frame_id_, video_frame->frame_id);
- EXPECT_EQ(transport::kVp8, video_frame->codec);
- EXPECT_EQ(expected_playout_time_, playout_time);
+ EXPECT_EQ(expected_playout_time_, video_frame->reference_time);
++num_called_;
}
@@ -156,7 +154,7 @@ TEST_F(VideoReceiverTest, MultiplePendingGetCalls) {
.WillRepeatedly(testing::Return(true));
// Enqueue a request for an video frame.
- const VideoFrameEncodedCallback frame_encoded_callback =
+ const FrameEncodedCallback frame_encoded_callback =
base::Bind(&FakeVideoClient::DeliverEncodedVideoFrame,
base::Unretained(&fake_video_client_));
receiver_->GetEncodedVideoFrame(frame_encoded_callback);
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698