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

Unified Diff: media/cast/video_receiver/video_decoder_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_decoder.cc ('k') | media/cast/video_receiver/video_receiver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_decoder_unittest.cc
diff --git a/media/cast/video_receiver/video_decoder_unittest.cc b/media/cast/video_receiver/video_decoder_unittest.cc
index aa6b7ac058c9df3605d49685df77f676e43f1795..4d731ea99aad4c189af4e1bfa3126f1da87754b1 100644
--- a/media/cast/video_receiver/video_decoder_unittest.cc
+++ b/media/cast/video_receiver/video_decoder_unittest.cc
@@ -61,10 +61,10 @@ class VideoDecoderTest
total_video_frames_decoded_ = 0;
}
- // Called from the unit test thread to create another EncodedVideoFrame and
- // push it into the decoding pipeline.
+ // Called from the unit test thread to create another EncodedFrame and push it
+ // into the decoding pipeline.
void FeedMoreVideo(int num_dropped_frames) {
- // Prepare a simulated EncodedVideoFrame to feed into the VideoDecoder.
+ // Prepare a simulated EncodedFrame to feed into the VideoDecoder.
const gfx::Size frame_size(kWidth, kHeight);
const scoped_refptr<VideoFrame> video_frame =
@@ -77,11 +77,10 @@ class VideoDecoderTest
PopulateVideoFrame(video_frame, 0);
// Encode |frame| into |encoded_frame->data|.
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame(
- new transport::EncodedVideoFrame());
+ scoped_ptr<transport::EncodedFrame> encoded_frame(
+ new transport::EncodedFrame());
CHECK_EQ(transport::kVp8, GetParam()); // Only support VP8 test currently.
vp8_encoder_.Encode(video_frame, encoded_frame.get());
- encoded_frame->codec = GetParam();
encoded_frame->frame_id = last_frame_id_ + 1 + num_dropped_frames;
last_frame_id_ = encoded_frame->frame_id;
« no previous file with comments | « media/cast/video_receiver/video_decoder.cc ('k') | media/cast/video_receiver/video_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698