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

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

Issue 306783002: [Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed kFakeSoftwareAudio in AudioCodec enum, per hclam@. 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 4d731ea99aad4c189af4e1bfa3126f1da87754b1..2ca28b070ce66ede54b8c41bbd33e0b2074f21f6 100644
--- a/media/cast/video_receiver/video_decoder_unittest.cc
+++ b/media/cast/video_receiver/video_decoder_unittest.cc
@@ -10,6 +10,7 @@
#include "base/synchronization/lock.h"
#include "base/time/time.h"
#include "media/cast/cast_config.h"
+#include "media/cast/test/utility/default_config.h"
#include "media/cast/test/utility/standalone_cast_environment.h"
#include "media/cast/test/utility/video_utility.h"
#include "media/cast/video_receiver/video_decoder.h"
@@ -47,9 +48,8 @@ class VideoDecoderTest
protected:
virtual void SetUp() OVERRIDE {
- VideoReceiverConfig decoder_config;
- decoder_config.use_external_decoder = false;
- decoder_config.codec = GetParam();
+ FrameReceiverConfig decoder_config = GetDefaultVideoReceiverConfig();
+ decoder_config.codec.video = GetParam();
video_decoder_.reset(new VideoDecoder(cast_environment_, decoder_config));
CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult());
« 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