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

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

Issue 2457003002: [Mojo Video Capture] Simplify API and some cleanups (Closed)
Patch Set: 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 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/receiver_mojo_to_media_adapter.h" 11 #include "services/video_capture/receiver_mojo_to_media_adapter.h"
12 12
13 namespace video_capture { 13 namespace video_capture {
14 14
15 VideoCaptureDeviceProxyImpl::VideoCaptureDeviceProxyImpl( 15 VideoCaptureDeviceProxyImpl::VideoCaptureDeviceProxyImpl(
16 std::unique_ptr<media::VideoCaptureDevice> device, 16 std::unique_ptr<media::VideoCaptureDevice> device,
17 const media::VideoCaptureJpegDecoderFactoryCB& 17 const media::VideoCaptureJpegDecoderFactoryCB&
18 jpeg_decoder_factory_callback) 18 jpeg_decoder_factory_callback)
19 : device_(std::move(device)), 19 : device_(std::move(device)),
20 jpeg_decoder_factory_callback_(jpeg_decoder_factory_callback), 20 jpeg_decoder_factory_callback_(jpeg_decoder_factory_callback),
21 device_running_(false) {} 21 device_running_(false) {}
22 22
23 VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() { 23 VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() {
24 if (device_running_) 24 if (device_running_)
25 device_->StopAndDeAllocate(); 25 device_->StopAndDeAllocate();
26 } 26 }
27 27
28 void VideoCaptureDeviceProxyImpl::Start( 28 void VideoCaptureDeviceProxyImpl::Start(
29 const media::VideoCaptureFormat& requested_format, 29 const VideoCaptureSettings& requested_settings,
30 media::ResolutionChangePolicy resolution_change_policy,
31 media::PowerLineFrequency power_line_frequency,
32 mojom::VideoFrameReceiverPtr receiver) { 30 mojom::VideoFrameReceiverPtr receiver) {
33 media::VideoCaptureParams params; 31 media::VideoCaptureParams params;
34 params.requested_format = requested_format; 32 requested_settings.ConvertToMediaVideoCaptureParams(&params);
35 params.resolution_change_policy = resolution_change_policy;
36 params.power_line_frequency = power_line_frequency;
37 receiver.set_connection_error_handler( 33 receiver.set_connection_error_handler(
38 base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose, 34 base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose,
39 base::Unretained(this))); 35 base::Unretained(this)));
40 36
41 auto media_receiver = 37 auto media_receiver =
42 base::MakeUnique<ReceiverMojoToMediaAdapter>(std::move(receiver)); 38 base::MakeUnique<ReceiverMojoToMediaAdapter>(std::move(receiver));
43 39
44 // Create a dedicated buffer pool for the device usage session. 40 // Create a dedicated buffer pool for the device usage session.
45 const int kMaxBufferCount = 2; 41 const int kMaxBufferCount = 2;
46 auto buffer_tracker_factory = base::MakeUnique<BufferTrackerFactoryImpl>(); 42 auto buffer_tracker_factory = base::MakeUnique<BufferTrackerFactoryImpl>();
(...skipping 14 matching lines...) Expand all
61 } 57 }
62 58
63 void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() { 59 void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() {
64 if (device_running_) { 60 if (device_running_) {
65 device_->StopAndDeAllocate(); 61 device_->StopAndDeAllocate();
66 device_running_ = false; 62 device_running_ = false;
67 } 63 }
68 } 64 }
69 65
70 } // namespace video_capture 66 } // 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