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/remoting/remote_renderer_impl.h" | 5 #include "media/remoting/remote_renderer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/callback_helpers.h" | 12 #include "base/callback_helpers.h" |
| 13 #include "base/memory/ptr_util.h" |
13 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
14 #include "base/threading/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
15 #include "base/time/time.h" | 16 #include "base/time/time.h" |
16 #include "media/base/bind_to_current_loop.h" | 17 #include "media/base/bind_to_current_loop.h" |
17 #include "media/base/demuxer_stream_provider.h" | 18 #include "media/base/demuxer_stream_provider.h" |
18 #include "media/remoting/remote_demuxer_stream_adapter.h" | 19 #include "media/remoting/remote_demuxer_stream_adapter.h" |
19 #include "media/remoting/remoting_renderer_controller.h" | 20 #include "media/remoting/remoting_renderer_controller.h" |
20 #include "media/remoting/rpc/proto_enum_utils.h" | 21 #include "media/remoting/rpc/proto_enum_utils.h" |
21 #include "media/remoting/rpc/proto_utils.h" | 22 #include "media/remoting/rpc/proto_utils.h" |
22 | 23 |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 RemotingInterstitialType interstitial_type) { | 646 RemotingInterstitialType interstitial_type) { |
646 DCHECK(media_task_runner_->BelongsToCurrentThread()); | 647 DCHECK(media_task_runner_->BelongsToCurrentThread()); |
647 if (!background_image.drawsNothing()) | 648 if (!background_image.drawsNothing()) |
648 interstitial_background_ = background_image; | 649 interstitial_background_ = background_image; |
649 canvas_size_ = canvas_size; | 650 canvas_size_ = canvas_size; |
650 PaintRemotingInterstitial(interstitial_background_, canvas_size_, | 651 PaintRemotingInterstitial(interstitial_background_, canvas_size_, |
651 interstitial_type, video_renderer_sink_); | 652 interstitial_type, video_renderer_sink_); |
652 } | 653 } |
653 | 654 |
654 } // namespace media | 655 } // namespace media |
OLD | NEW |