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

Unified Diff: trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc

Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up" (Closed) Base URL: svn://svn.chromium.org/chrome/
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
Index: trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc
===================================================================
--- trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc (revision 243647)
+++ trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc (working copy)
@@ -36,9 +36,8 @@
expected_capture_time_ = expected_capture_time;
}
- void DeliverEncodedVideoFrame(
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
- const base::TimeTicks& capture_time) {
+ void DeliverEncodedVideoFrame(scoped_ptr<EncodedVideoFrame> encoded_frame,
+ const base::TimeTicks& capture_time) {
EXPECT_EQ(expected_key_frame_, encoded_frame->key_frame);
EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id);
EXPECT_EQ(expected_last_referenced_frame_id_,
@@ -76,7 +75,7 @@
video_config_.min_qp = 0;
video_config_.max_frame_rate = 30;
video_config_.max_number_of_video_buffers_used = 3;
- video_config_.codec = transport::kVp8;
+ video_config_.codec = kVp8;
gfx::Size size(video_config_.width, video_config_.height);
video_frame_ = media::VideoFrame::CreateFrame(VideoFrame::I420,
size, gfx::Rect(size), size, base::TimeDelta());
@@ -89,7 +88,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());
}
void Configure(uint8 max_unacked_frames) {
« no previous file with comments | « trunk/src/media/cast/video_sender/video_encoder_impl.cc ('k') | trunk/src/media/cast/video_sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698