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

Side by Side Diff: content/browser/renderer_host/media/video_capture_controller.h

Issue 263323003: Revert of Refactor video capturing code in the render process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/common/media/video_capture.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // VideoCaptureController is the glue between a VideoCaptureDevice and all 5 // VideoCaptureController is the glue between a VideoCaptureDevice and all
6 // VideoCaptureHosts that have connected to it. A controller exists on behalf of 6 // VideoCaptureHosts that have connected to it. A controller exists on behalf of
7 // one (and only one) VideoCaptureDevice; both are owned by the 7 // one (and only one) VideoCaptureDevice; both are owned by the
8 // VideoCaptureManager. 8 // VideoCaptureManager.
9 // 9 //
10 // The VideoCaptureController is responsible for: 10 // The VideoCaptureController is responsible for:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 #include "base/compiler_specific.h" 52 #include "base/compiler_specific.h"
53 #include "base/memory/ref_counted.h" 53 #include "base/memory/ref_counted.h"
54 #include "base/memory/scoped_ptr.h" 54 #include "base/memory/scoped_ptr.h"
55 #include "base/memory/weak_ptr.h" 55 #include "base/memory/weak_ptr.h"
56 #include "base/process/process.h" 56 #include "base/process/process.h"
57 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h" 57 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
58 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h" 58 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
59 #include "content/common/content_export.h" 59 #include "content/common/content_export.h"
60 #include "content/common/media/video_capture.h" 60 #include "content/common/media/video_capture.h"
61 #include "media/video/capture/video_capture.h"
61 #include "media/video/capture/video_capture_device.h" 62 #include "media/video/capture/video_capture_device.h"
62 #include "media/video/capture/video_capture_types.h" 63 #include "media/video/capture/video_capture_types.h"
63 64
64 namespace content { 65 namespace content {
65 class VideoCaptureBufferPool; 66 class VideoCaptureBufferPool;
66 67
67 class CONTENT_EXPORT VideoCaptureController { 68 class CONTENT_EXPORT VideoCaptureController {
68 public: 69 public:
69 VideoCaptureController(); 70 VideoCaptureController();
70 virtual ~VideoCaptureController(); 71 virtual ~VideoCaptureController();
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 media::VideoCaptureFormat video_capture_format_; 150 media::VideoCaptureFormat video_capture_format_;
150 151
151 base::WeakPtrFactory<VideoCaptureController> weak_ptr_factory_; 152 base::WeakPtrFactory<VideoCaptureController> weak_ptr_factory_;
152 153
153 DISALLOW_COPY_AND_ASSIGN(VideoCaptureController); 154 DISALLOW_COPY_AND_ASSIGN(VideoCaptureController);
154 }; 155 };
155 156
156 } // namespace content 157 } // namespace content
157 158
158 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_ 159 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | content/common/media/video_capture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698