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

Unified Diff: media/cast/video_sender/external_video_encoder_unittest.cc

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits 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/video_sender/external_video_encoder.cc ('k') | media/cast/video_sender/video_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_sender/external_video_encoder_unittest.cc
diff --git a/media/cast/video_sender/external_video_encoder_unittest.cc b/media/cast/video_sender/external_video_encoder_unittest.cc
index f99569d47e545426641d385e92295a506c270553..b159280c805c3bdb5e3084e9e8e5135d0cb458a2 100644
--- a/media/cast/video_sender/external_video_encoder_unittest.cc
+++ b/media/cast/video_sender/external_video_encoder_unittest.cc
@@ -38,8 +38,9 @@ class TestVideoEncoderCallback :
expected_capture_time_ = expected_capture_time;
}
- void DeliverEncodedVideoFrame(scoped_ptr<EncodedVideoFrame> encoded_frame,
- const base::TimeTicks& capture_time) {
+ void DeliverEncodedVideoFrame(
+ scoped_ptr<transport::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_,
@@ -78,7 +79,7 @@ class ExternalVideoEncoderTest : public ::testing::Test {
video_config_.min_qp = 0;
video_config_.max_frame_rate = 30;
video_config_.max_number_of_video_buffers_used = 3;
- video_config_.codec = kVp8;
+ video_config_.codec = transport::kVp8;
gfx::Size size(video_config_.width, video_config_.height);
video_frame_ = media::VideoFrame::CreateFrame(VideoFrame::I420,
size, gfx::Rect(size), size, base::TimeDelta());
@@ -90,7 +91,7 @@ class ExternalVideoEncoderTest : public ::testing::Test {
virtual void SetUp() {
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_, task_runner_, task_runner_, task_runner_, task_runner_,
GetDefaultCastLoggingConfig());
video_encoder_.reset(new ExternalVideoEncoder(
cast_environment_,
« no previous file with comments | « media/cast/video_sender/external_video_encoder.cc ('k') | media/cast/video_sender/video_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698