| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/blink/webmediaplayer_impl.h" | 5 #include "media/blink/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 RendererFactorySelector::FactoryType::DEFAULT); | 221 RendererFactorySelector::FactoryType::DEFAULT); |
| 222 | 222 |
| 223 wmpi_ = base::MakeUnique<WebMediaPlayerImpl>( | 223 wmpi_ = base::MakeUnique<WebMediaPlayerImpl>( |
| 224 web_local_frame_, &client_, nullptr, &delegate_, | 224 web_local_frame_, &client_, nullptr, &delegate_, |
| 225 std::move(factory_selector), url_index_, | 225 std::move(factory_selector), url_index_, |
| 226 base::MakeUnique<WebMediaPlayerParams>( | 226 base::MakeUnique<WebMediaPlayerParams>( |
| 227 std::move(media_log), WebMediaPlayerParams::DeferLoadCB(), | 227 std::move(media_log), WebMediaPlayerParams::DeferLoadCB(), |
| 228 scoped_refptr<SwitchableAudioRendererSink>(), | 228 scoped_refptr<SwitchableAudioRendererSink>(), |
| 229 media_thread_.task_runner(), message_loop_.task_runner(), | 229 media_thread_.task_runner(), message_loop_.task_runner(), |
| 230 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(), | 230 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(), |
| 231 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr, | 231 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, |
| 232 RequestRoutingTokenCallback(), nullptr, |
| 232 kMaxKeyframeDistanceToDisableBackgroundVideo, | 233 kMaxKeyframeDistanceToDisableBackgroundVideo, |
| 233 kMaxKeyframeDistanceToDisableBackgroundVideoMSE, false, | 234 kMaxKeyframeDistanceToDisableBackgroundVideoMSE, false, |
| 234 allow_suspend, false)); | 235 allow_suspend, false)); |
| 235 } | 236 } |
| 236 | 237 |
| 237 ~WebMediaPlayerImplTest() override { | 238 ~WebMediaPlayerImplTest() override { |
| 238 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that | 239 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that |
| 239 // objects passed to the message loop for destruction are released. | 240 // objects passed to the message loop for destruction are released. |
| 240 // | 241 // |
| 241 // NOTE: This should be done before any other member variables are | 242 // NOTE: This should be done before any other member variables are |
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 WebMediaPlayerImplBackgroundBehaviorTest, | 989 WebMediaPlayerImplBackgroundBehaviorTest, |
| 989 ::testing::Combine(::testing::Bool(), | 990 ::testing::Combine(::testing::Bool(), |
| 990 ::testing::Bool(), | 991 ::testing::Bool(), |
| 991 ::testing::Values(5, 300), | 992 ::testing::Values(5, 300), |
| 992 ::testing::Values(5, 100), | 993 ::testing::Values(5, 100), |
| 993 ::testing::Bool(), | 994 ::testing::Bool(), |
| 994 ::testing::Bool(), | 995 ::testing::Bool(), |
| 995 ::testing::Bool())); | 996 ::testing::Bool())); |
| 996 | 997 |
| 997 } // namespace media | 998 } // namespace media |
| OLD | NEW |