OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/renderer/media/video_track_to_pepper_adapter.h" | 5 #include "content/renderer/media/video_track_to_pepper_adapter.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" |
10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
11 #include "base/synchronization/lock.h" | 12 #include "base/synchronization/lock.h" |
12 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
13 #include "content/public/renderer/media_stream_video_sink.h" | 14 #include "content/public/renderer/media_stream_video_sink.h" |
14 #include "content/renderer/media/media_stream.h" | 15 #include "content/renderer/media/media_stream.h" |
15 #include "content/renderer/media/media_stream_registry_interface.h" | 16 #include "content/renderer/media/media_stream_registry_interface.h" |
16 #include "media/base/bind_to_current_loop.h" | 17 #include "media/base/bind_to_current_loop.h" |
17 #include "media/base/video_capture_types.h" | 18 #include "media/base/video_capture_types.h" |
18 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 19 #include "third_party/WebKit/public/platform/WebMediaStream.h" |
19 #include "third_party/WebKit/public/platform/WebURL.h" | 20 #include "third_party/WebKit/public/platform/WebURL.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 FrameReaderInterface* reader) | 134 FrameReaderInterface* reader) |
134 : receiver_(new PpFrameReceiver(blink_track)) { | 135 : receiver_(new PpFrameReceiver(blink_track)) { |
135 receiver_->SetReader(reader); | 136 receiver_->SetReader(reader); |
136 } | 137 } |
137 | 138 |
138 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { | 139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { |
139 receiver_->SetReader(NULL); | 140 receiver_->SetReader(NULL); |
140 } | 141 } |
141 | 142 |
142 } // namespace content | 143 } // namespace content |
OLD | NEW |