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

Side by Side Diff: content/renderer/media/video_track_to_pepper_adapter.cc

Issue 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)
Patch Set: rebase Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
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/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "content/public/renderer/media_stream_video_sink.h" 14 #include "content/public/renderer/media_stream_video_sink.h"
15 #include "content/renderer/media/media_stream.h" 15 #include "content/renderer/media/media_stream.h"
16 #include "content/renderer/media/media_stream_registry_interface.h" 16 #include "content/renderer/media/media_stream_registry_interface.h"
17 #include "media/base/bind_to_current_loop.h" 17 #include "media/base/bind_to_current_loop.h"
18 #include "media/base/video_capture_types.h" 18 #include "media/capture/video_capture_types.h"
19 #include "third_party/WebKit/public/platform/WebMediaStream.h" 19 #include "third_party/WebKit/public/platform/WebMediaStream.h"
20 #include "third_party/WebKit/public/platform/WebURL.h" 20 #include "third_party/WebKit/public/platform/WebURL.h"
21 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 21 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
22 #include "url/gurl.h" 22 #include "url/gurl.h"
23 23
24 namespace content { 24 namespace content {
25 25
26 // PpFrameReceiver implements MediaStreamVideoSink so that it can be attached 26 // PpFrameReceiver implements MediaStreamVideoSink so that it can be attached
27 // to video track to receive captured frames. 27 // to video track to receive captured frames.
28 // It can be attached to a FrameReaderInterface to output the received frame. 28 // It can be attached to a FrameReaderInterface to output the received frame.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 FrameReaderInterface* reader) 134 FrameReaderInterface* reader)
135 : receiver_(new PpFrameReceiver(blink_track)) { 135 : receiver_(new PpFrameReceiver(blink_track)) {
136 receiver_->SetReader(reader); 136 receiver_->SetReader(reader);
137 } 137 }
138 138
139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { 139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() {
140 receiver_->SetReader(NULL); 140 receiver_->SetReader(NULL);
141 } 141 }
142 142
143 } // namespace content 143 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_capture_impl_manager.h ('k') | content/renderer/media/webrtc/webrtc_video_capturer_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698