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

Side by Side Diff: content/browser/media/capture/image_capture_impl.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
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 "content/browser/media/capture/image_capture_impl.h" 5 #include "content/browser/media/capture/image_capture_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "content/browser/browser_main_loop.h" 10 #include "content/browser/browser_main_loop.h"
11 #include "content/browser/renderer_host/media/media_stream_manager.h" 11 #include "content/browser/renderer_host/media/media_stream_manager.h"
12 #include "content/browser/renderer_host/media/video_capture_manager.h" 12 #include "content/browser/renderer_host/media/video_capture_manager.h"
13 #include "content/common/media/media_stream_options.h" 13 #include "content/common/media/media_stream_options.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "device/capture/video/video_capture_device.h"
15 #include "media/base/bind_to_current_loop.h" 16 #include "media/base/bind_to_current_loop.h"
16 #include "media/capture/video/video_capture_device.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 namespace { 20 namespace {
21 21
22 void RunGetCapabilitiesCallbackOnUIThread( 22 void RunGetCapabilitiesCallbackOnUIThread(
23 const ImageCaptureImpl::GetCapabilitiesCallback& callback, 23 const ImageCaptureImpl::GetCapabilitiesCallback& callback,
24 media::mojom::PhotoCapabilitiesPtr capabilities) { 24 media::mojom::PhotoCapabilitiesPtr capabilities) {
25 BrowserThread::PostTask( 25 BrowserThread::PostTask(
26 BrowserThread::UI, FROM_HERE, 26 BrowserThread::UI, FROM_HERE,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) { 63 void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) {
64 DCHECK_CURRENTLY_ON(BrowserThread::UI); 64 DCHECK_CURRENTLY_ON(BrowserThread::UI);
65 cb.Run(media::mojom::Blob::New()); 65 cb.Run(media::mojom::Blob::New());
66 } 66 }
67 67
68 void GetCapabilitiesOnIOThread( 68 void GetCapabilitiesOnIOThread(
69 const std::string& source_id, 69 const std::string& source_id,
70 MediaStreamManager* media_stream_manager, 70 MediaStreamManager* media_stream_manager,
71 media::ScopedResultCallback<ImageCaptureImpl::GetCapabilitiesCallback> 71 device::ScopedResultCallback<ImageCaptureImpl::GetCapabilitiesCallback>
72 callback) { 72 callback) {
73 DCHECK_CURRENTLY_ON(BrowserThread::IO); 73 DCHECK_CURRENTLY_ON(BrowserThread::IO);
74 74
75 const int session_id = 75 const int session_id =
76 media_stream_manager->VideoDeviceIdToSessionId(source_id); 76 media_stream_manager->VideoDeviceIdToSessionId(source_id);
77 77
78 if (session_id == StreamDeviceInfo::kNoId) 78 if (session_id == StreamDeviceInfo::kNoId)
79 return; 79 return;
80 media_stream_manager->video_capture_manager()->GetPhotoCapabilities( 80 media_stream_manager->video_capture_manager()->GetPhotoCapabilities(
81 session_id, std::move(callback)); 81 session_id, std::move(callback));
82 } 82 }
83 83
84 void SetOptionsOnIOThread( 84 void SetOptionsOnIOThread(
85 const std::string& source_id, 85 const std::string& source_id,
86 MediaStreamManager* media_stream_manager, 86 MediaStreamManager* media_stream_manager,
87 media::mojom::PhotoSettingsPtr settings, 87 media::mojom::PhotoSettingsPtr settings,
88 media::ScopedResultCallback<ImageCaptureImpl::SetOptionsCallback> 88 device::ScopedResultCallback<ImageCaptureImpl::SetOptionsCallback>
89 callback) { 89 callback) {
90 DCHECK_CURRENTLY_ON(BrowserThread::IO); 90 DCHECK_CURRENTLY_ON(BrowserThread::IO);
91 91
92 const int session_id = 92 const int session_id =
93 media_stream_manager->VideoDeviceIdToSessionId(source_id); 93 media_stream_manager->VideoDeviceIdToSessionId(source_id);
94 94
95 if (session_id == StreamDeviceInfo::kNoId) 95 if (session_id == StreamDeviceInfo::kNoId)
96 return; 96 return;
97 media_stream_manager->video_capture_manager()->SetPhotoOptions( 97 media_stream_manager->video_capture_manager()->SetPhotoOptions(
98 session_id, std::move(settings), std::move(callback)); 98 session_id, std::move(settings), std::move(callback));
99 } 99 }
100 100
101 void TakePhotoOnIOThread( 101 void TakePhotoOnIOThread(
102 const std::string& source_id, 102 const std::string& source_id,
103 MediaStreamManager* media_stream_manager, 103 MediaStreamManager* media_stream_manager,
104 media::ScopedResultCallback<ImageCaptureImpl::TakePhotoCallback> callback) { 104 device::ScopedResultCallback<ImageCaptureImpl::TakePhotoCallback>
105 callback) {
105 DCHECK_CURRENTLY_ON(BrowserThread::IO); 106 DCHECK_CURRENTLY_ON(BrowserThread::IO);
106 107
107 const int session_id = 108 const int session_id =
108 media_stream_manager->VideoDeviceIdToSessionId(source_id); 109 media_stream_manager->VideoDeviceIdToSessionId(source_id);
109 110
110 if (session_id == StreamDeviceInfo::kNoId) 111 if (session_id == StreamDeviceInfo::kNoId)
111 return; 112 return;
112 media_stream_manager->video_capture_manager()->TakePhoto(session_id, 113 media_stream_manager->video_capture_manager()->TakePhoto(session_id,
113 std::move(callback)); 114 std::move(callback));
114 } 115 }
115 116
116 } // anonymous namespace 117 } // anonymous namespace
117 118
118 // static 119 // static
119 void ImageCaptureImpl::Create( 120 void ImageCaptureImpl::Create(
120 mojo::InterfaceRequest<media::mojom::ImageCapture> request) { 121 mojo::InterfaceRequest<media::mojom::ImageCapture> request) {
121 // |binding_| will take ownership of ImageCaptureImpl. 122 // |binding_| will take ownership of ImageCaptureImpl.
122 new ImageCaptureImpl(std::move(request)); 123 new ImageCaptureImpl(std::move(request));
123 } 124 }
124 125
125 ImageCaptureImpl::~ImageCaptureImpl() {} 126 ImageCaptureImpl::~ImageCaptureImpl() {}
126 127
127 void ImageCaptureImpl::GetCapabilities( 128 void ImageCaptureImpl::GetCapabilities(
128 const std::string& source_id, 129 const std::string& source_id,
129 const GetCapabilitiesCallback& callback) { 130 const GetCapabilitiesCallback& callback) {
130 DCHECK_CURRENTLY_ON(BrowserThread::UI); 131 DCHECK_CURRENTLY_ON(BrowserThread::UI);
131 132
132 media::ScopedResultCallback<GetCapabilitiesCallback> scoped_callback( 133 device::ScopedResultCallback<GetCapabilitiesCallback> scoped_callback(
133 base::Bind(&RunGetCapabilitiesCallbackOnUIThread, callback), 134 base::Bind(&RunGetCapabilitiesCallbackOnUIThread, callback),
134 media::BindToCurrentLoop(base::Bind(&RunFailedGetCapabilitiesCallback))); 135 media::BindToCurrentLoop(base::Bind(&RunFailedGetCapabilitiesCallback)));
135 136
136 BrowserThread::PostTask( 137 BrowserThread::PostTask(
137 BrowserThread::IO, FROM_HERE, 138 BrowserThread::IO, FROM_HERE,
138 base::Bind(&GetCapabilitiesOnIOThread, source_id, 139 base::Bind(&GetCapabilitiesOnIOThread, source_id,
139 BrowserMainLoop::GetInstance()->media_stream_manager(), 140 BrowserMainLoop::GetInstance()->media_stream_manager(),
140 base::Passed(&scoped_callback))); 141 base::Passed(&scoped_callback)));
141 } 142 }
142 143
143 void ImageCaptureImpl::SetOptions(const std::string& source_id, 144 void ImageCaptureImpl::SetOptions(const std::string& source_id,
144 media::mojom::PhotoSettingsPtr settings, 145 media::mojom::PhotoSettingsPtr settings,
145 const SetOptionsCallback& callback) { 146 const SetOptionsCallback& callback) {
146 DCHECK_CURRENTLY_ON(BrowserThread::UI); 147 DCHECK_CURRENTLY_ON(BrowserThread::UI);
147 148
148 media::ScopedResultCallback<SetOptionsCallback> scoped_callback( 149 device::ScopedResultCallback<SetOptionsCallback> scoped_callback(
149 base::Bind(&RunSetOptionsCallbackOnUIThread, callback), 150 base::Bind(&RunSetOptionsCallbackOnUIThread, callback),
150 media::BindToCurrentLoop(base::Bind(&RunFailedSetOptionsCallback))); 151 media::BindToCurrentLoop(base::Bind(&RunFailedSetOptionsCallback)));
151 152
152 BrowserThread::PostTask( 153 BrowserThread::PostTask(
153 BrowserThread::IO, FROM_HERE, 154 BrowserThread::IO, FROM_HERE,
154 base::Bind(&SetOptionsOnIOThread, source_id, 155 base::Bind(&SetOptionsOnIOThread, source_id,
155 BrowserMainLoop::GetInstance()->media_stream_manager(), 156 BrowserMainLoop::GetInstance()->media_stream_manager(),
156 base::Passed(&settings), base::Passed(&scoped_callback))); 157 base::Passed(&settings), base::Passed(&scoped_callback)));
157 } 158 }
158 159
159 void ImageCaptureImpl::TakePhoto(const std::string& source_id, 160 void ImageCaptureImpl::TakePhoto(const std::string& source_id,
160 const TakePhotoCallback& callback) { 161 const TakePhotoCallback& callback) {
161 DCHECK_CURRENTLY_ON(BrowserThread::UI); 162 DCHECK_CURRENTLY_ON(BrowserThread::UI);
162 163
163 media::ScopedResultCallback<TakePhotoCallback> scoped_callback( 164 device::ScopedResultCallback<TakePhotoCallback> scoped_callback(
164 base::Bind(&RunTakePhotoCallbackOnUIThread, callback), 165 base::Bind(&RunTakePhotoCallbackOnUIThread, callback),
165 media::BindToCurrentLoop(base::Bind(&RunFailedTakePhotoCallback))); 166 media::BindToCurrentLoop(base::Bind(&RunFailedTakePhotoCallback)));
166 167
167 BrowserThread::PostTask( 168 BrowserThread::PostTask(
168 BrowserThread::IO, FROM_HERE, 169 BrowserThread::IO, FROM_HERE,
169 base::Bind(&TakePhotoOnIOThread, source_id, 170 base::Bind(&TakePhotoOnIOThread, source_id,
170 BrowserMainLoop::GetInstance()->media_stream_manager(), 171 BrowserMainLoop::GetInstance()->media_stream_manager(),
171 base::Passed(&scoped_callback))); 172 base::Passed(&scoped_callback)));
172 } 173 }
173 174
174 ImageCaptureImpl::ImageCaptureImpl( 175 ImageCaptureImpl::ImageCaptureImpl(
175 mojo::InterfaceRequest<media::mojom::ImageCapture> request) 176 mojo::InterfaceRequest<media::mojom::ImageCapture> request)
176 : binding_(this, std::move(request)) {} 177 : binding_(this, std::move(request)) {}
177 178
178 } // namespace content 179 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698