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

Unified Diff: media/gpu/video_decode_accelerator_unittest.cc

Issue 2901753002: Make VDA::Config's converting constructor explicit (Closed)
Patch Set: braces for multiline if Created 3 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 | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/video_decode_accelerator_unittest.cc
diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
index 522e61cd3388c25fee117fae90aadf59ee4fb846..991394b37ace2c5fa050def69f3da60a6d9f33f3 100644
--- a/media/gpu/video_decode_accelerator_unittest.cc
+++ b/media/gpu/video_decode_accelerator_unittest.cc
@@ -647,10 +647,12 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
LOG_ASSERT(decoder_deleted());
LOG_ASSERT(!decoder_.get());
+ VideoDecodeAccelerator::Config config(profile_);
+
if (fake_decoder_) {
decoder_.reset(new FakeVideoDecodeAccelerator(
frame_size_, base::Bind(&DoNothingReturnTrue)));
- LOG_ASSERT(decoder_->Initialize(profile_, this));
+ LOG_ASSERT(decoder_->Initialize(config, this));
} else {
if (!vda_factory_) {
vda_factory_ = GpuVideoDecodeAcceleratorFactory::Create(
@@ -660,7 +662,6 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
LOG_ASSERT(vda_factory_);
}
- VideoDecodeAccelerator::Config config(profile_);
if (g_test_import) {
config.output_mode = VideoDecodeAccelerator::Config::OutputMode::IMPORT;
}
« no previous file with comments | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698