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

Side by Side Diff: services/video_capture/video_capture_device_proxy_impl.cc

Issue 2386183002: Replace manual conversions with Mojo type mappings
Patch Set: Created 4 years, 2 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 "services/video_capture/video_capture_device_proxy_impl.h" 5 #include "services/video_capture/video_capture_device_proxy_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/capture/video/video_capture_buffer_pool_impl.h" 8 #include "media/capture/video/video_capture_buffer_pool_impl.h"
9 #include "media/capture/video/video_capture_jpeg_decoder.h" 9 #include "media/capture/video/video_capture_jpeg_decoder.h"
10 #include "services/video_capture/buffer_tracker_factory_impl.h" 10 #include "services/video_capture/buffer_tracker_factory_impl.h"
11 #include "services/video_capture/mojo_media_conversions.h"
12 #include "services/video_capture/receiver_mojo_to_media_adapter.h" 11 #include "services/video_capture/receiver_mojo_to_media_adapter.h"
13 12
14 namespace video_capture { 13 namespace video_capture {
15 14
16 VideoCaptureDeviceProxyImpl::VideoCaptureDeviceProxyImpl( 15 VideoCaptureDeviceProxyImpl::VideoCaptureDeviceProxyImpl(
17 std::unique_ptr<media::VideoCaptureDevice> device, 16 std::unique_ptr<media::VideoCaptureDevice> device,
18 const media::VideoCaptureJpegDecoderFactoryCB& 17 const media::VideoCaptureJpegDecoderFactoryCB&
19 jpeg_decoder_factory_callback) 18 jpeg_decoder_factory_callback)
20 : device_(std::move(device)), 19 : device_(std::move(device)),
21 jpeg_decoder_factory_callback_(jpeg_decoder_factory_callback), 20 jpeg_decoder_factory_callback_(jpeg_decoder_factory_callback),
22 device_running_(false) {} 21 device_running_(false) {}
23 22
24 VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() { 23 VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() {
25 if (device_running_) 24 if (device_running_)
26 device_->StopAndDeAllocate(); 25 device_->StopAndDeAllocate();
27 } 26 }
28 27
29 void VideoCaptureDeviceProxyImpl::Start( 28 void VideoCaptureDeviceProxyImpl::Start(
30 mojom::VideoCaptureSettingsPtr requested_settings, 29 const media::VideoCaptureParams& requested_settings,
31 mojom::VideoFrameReceiverPtr receiver) { 30 mojom::VideoFrameReceiverPtr receiver) {
32 media::VideoCaptureParams params; 31 media::VideoCaptureParams params;
33 ConvertMojoVideoCaptureSettingsToMediaVideoCaptureParams( 32 ConvertMojoVideoCaptureSettingsToMediaVideoCaptureParams(
34 std::move(requested_settings), &params); 33 std::move(requested_settings), &params);
35 34
36 receiver.set_connection_error_handler( 35 receiver.set_connection_error_handler(
37 base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose, 36 base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose,
38 base::Unretained(this))); 37 base::Unretained(this)));
39 38
40 auto media_receiver = 39 auto media_receiver =
(...skipping 19 matching lines...) Expand all
60 } 59 }
61 60
62 void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() { 61 void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() {
63 if (device_running_) { 62 if (device_running_) {
64 device_->StopAndDeAllocate(); 63 device_->StopAndDeAllocate();
65 device_running_ = false; 64 device_running_ = false;
66 } 65 }
67 } 66 }
68 67
69 } // namespace video_capture 68 } // namespace video_capture
OLDNEW
« no previous file with comments | « services/video_capture/video_capture_device_proxy_impl.h ('k') | services/video_capture/video_capture_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698