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

Unified Diff: services/video_capture/video_capture_service.cc

Issue 2468663003: [Mojo Video Capture] Add Mojo Typemap for VideoCaptureDeviceDescriptor (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 side-by-side diff with in-line comments
Download patch
Index: services/video_capture/video_capture_service.cc
diff --git a/services/video_capture/video_capture_service.cc b/services/video_capture/video_capture_service.cc
index 78d3f6e9690ebd28313c1e9ba4423b56c91be4a5..20c85df51d90e20f5c1fdc924afaa044fdeb4b2c 100644
--- a/services/video_capture/video_capture_service.cc
+++ b/services/video_capture/video_capture_service.cc
@@ -63,7 +63,7 @@ void VideoCaptureService::ConnectToMockDeviceFactory(
void VideoCaptureService::AddDeviceToMockFactory(
mojom::MockVideoCaptureDevicePtr device,
- mojom::VideoCaptureDeviceDescriptorPtr descriptor,
+ const media::VideoCaptureDeviceDescriptor& descriptor,
const AddDeviceToMockFactoryCallback& callback) {
LazyInitializeMockDeviceFactory();
mock_device_factory_->AddMockDevice(std::move(device), std::move(descriptor));
@@ -82,13 +82,13 @@ void VideoCaptureService::LazyInitializeFakeDeviceFactory() {
return;
fake_device_factory_ = base::MakeUnique<VideoCaptureDeviceFactoryImpl>(
base::Bind(CreateJpegDecoder));
- auto fake_device_descriptor = mojom::VideoCaptureDeviceDescriptor::New();
- fake_device_descriptor->display_name = kFakeDeviceDisplayName;
- fake_device_descriptor->device_id = kFakeDeviceId;
- fake_device_descriptor->model_id = kFakeModelId;
- fake_device_descriptor->capture_api = mojom::VideoCaptureApi::UNKNOWN;
- fake_device_descriptor->transport_type =
- mojom::VideoCaptureTransportType::OTHER_TRANSPORT;
+ media::VideoCaptureDeviceDescriptor fake_device_descriptor;
+ fake_device_descriptor.display_name = kFakeDeviceDisplayName;
+ fake_device_descriptor.device_id = kFakeDeviceId;
+ fake_device_descriptor.model_id = kFakeModelId;
+ fake_device_descriptor.capture_api = media::VideoCaptureApi::UNKNOWN;
+ fake_device_descriptor.transport_type =
+ media::VideoCaptureTransportType::OTHER_TRANSPORT;
fake_device_factory_->AddMediaDevice(
base::MakeUnique<media::FakeVideoCaptureDevice>(
media::FakeVideoCaptureDevice::BufferOwnership::OWN_BUFFERS,

Powered by Google App Engine
This is Rietveld 408576698