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

Unified Diff: media/cast/video_receiver/video_decoder_unittest.cc

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating chrome/renderer Created 7 years 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: 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 6405d1d7bee06d7997ff9d8defc24a724f0caa6b..d1fbe6e3a238eaeca05055029639a99a42dd843c 100644
--- a/media/cast/video_receiver/video_decoder_unittest.cc
+++ b/media/cast/video_receiver/video_decoder_unittest.cc
@@ -44,10 +44,10 @@ class VideoDecoderTest : public ::testing::Test {
: task_runner_(new test::FakeTaskRunner(&testing_clock_)),
cast_environment_(new CastEnvironment(&testing_clock_, task_runner_,
task_runner_, task_runner_, task_runner_, task_runner_,
- GetDefaultCastLoggingConfig())),
+ task_runner_, GetDefaultCastLoggingConfig())),
test_callback_(new DecodeTestFrameCallback()) {
// Configure to vp8.
- config_.codec = kVp8;
+ config_.codec = transport::kVp8;
config_.use_external_decoder = false;
decoder_.reset(new VideoDecoder(config_, cast_environment_));
testing_clock_.Advance(
@@ -66,9 +66,9 @@ class VideoDecoderTest : public ::testing::Test {
// TODO(pwestin): EXPECT_DEATH tests can not pass valgrind.
TEST_F(VideoDecoderTest, DISABLED_SizeZero) {
- EncodedVideoFrame encoded_frame;
+ transport::EncodedVideoFrame encoded_frame;
base::TimeTicks render_time;
- encoded_frame.codec = kVp8;
+ encoded_frame.codec = transport::kVp8;
EXPECT_DEATH(
decoder_->DecodeVideoFrame(
&encoded_frame, render_time,
@@ -78,10 +78,10 @@ TEST_F(VideoDecoderTest, DISABLED_SizeZero) {
// TODO(pwestin): EXPECT_DEATH tests can not pass valgrind.
TEST_F(VideoDecoderTest, DISABLED_InvalidCodec) {
- EncodedVideoFrame encoded_frame;
+ transport::EncodedVideoFrame encoded_frame;
base::TimeTicks render_time;
encoded_frame.data.assign(kFrameSize, 0);
- encoded_frame.codec = kExternalVideo;
+ encoded_frame.codec = transport::kExternalVideo;
EXPECT_DEATH(
decoder_->DecodeVideoFrame(&encoded_frame, render_time, base::Bind(
&DecodeTestFrameCallback::DecodeComplete, test_callback_)),

Powered by Google App Engine
This is Rietveld 408576698