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

Unified Diff: media/capture/video/video_capture_device_descriptor.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 side-by-side diff with in-line comments
Download patch
Index: media/capture/video/video_capture_device_descriptor.cc
diff --git a/media/capture/video/video_capture_device_descriptor.cc b/media/capture/video/video_capture_device_descriptor.cc
deleted file mode 100644
index be9477631cd1ba2652b49a2efe9f812c8f3f4fa4..0000000000000000000000000000000000000000
--- a/media/capture/video/video_capture_device_descriptor.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "media/capture/video/video_capture_device_descriptor.h"
-
-#include "base/logging.h"
-
-namespace media {
-
-VideoCaptureDeviceDescriptor::VideoCaptureDeviceDescriptor()
- : capture_api(VideoCaptureApi::UNKNOWN),
- transport_type(VideoCaptureTransportType::OTHER_TRANSPORT) {}
-
-VideoCaptureDeviceDescriptor::VideoCaptureDeviceDescriptor(
- const std::string& display_name,
- const std::string& device_id,
- VideoCaptureApi capture_api,
- VideoCaptureTransportType transport_type)
- : display_name(display_name),
- device_id(device_id),
- capture_api(capture_api),
- transport_type(transport_type) {}
-
-VideoCaptureDeviceDescriptor::VideoCaptureDeviceDescriptor(
- const std::string& display_name,
- const std::string& device_id,
- const std::string& model_id,
- VideoCaptureApi capture_api,
- VideoCaptureTransportType transport_type)
- : display_name(display_name),
- device_id(device_id),
- model_id(model_id),
- capture_api(capture_api),
- transport_type(transport_type) {}
-
-VideoCaptureDeviceDescriptor::~VideoCaptureDeviceDescriptor() {}
-
-VideoCaptureDeviceDescriptor::VideoCaptureDeviceDescriptor(
- const VideoCaptureDeviceDescriptor& other) = default;
-
-const char* VideoCaptureDeviceDescriptor::GetCaptureApiTypeString() const {
- switch (capture_api) {
- case VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE:
- return "V4L2 SPLANE";
- case VideoCaptureApi::WIN_MEDIA_FOUNDATION:
- return "Media Foundation";
- case VideoCaptureApi::WIN_DIRECT_SHOW:
- return "Direct Show";
- case VideoCaptureApi::MACOSX_AVFOUNDATION:
- return "AV Foundation";
- case VideoCaptureApi::MACOSX_DECKLINK:
- return "DeckLink";
- case VideoCaptureApi::ANDROID_API1:
- return "Camera API1";
- case VideoCaptureApi::ANDROID_API2_LEGACY:
- return "Camera API2 Legacy";
- case VideoCaptureApi::ANDROID_API2_FULL:
- return "Camera API2 Full";
- case VideoCaptureApi::ANDROID_API2_LIMITED:
- return "Camera API2 Limited";
- case VideoCaptureApi::ANDROID_TANGO:
- return "Tango API";
- default:
- NOTREACHED() << "Unknown Video Capture API type: "
- << static_cast<int>(capture_api);
- return "Unknown API";
- }
-}
-
-std::string VideoCaptureDeviceDescriptor::GetNameAndModel() const {
- if (model_id.empty())
- return display_name;
- return display_name + " (" + model_id + ")";
-}
-
-} // namespace media
« no previous file with comments | « media/capture/video/video_capture_device_descriptor.h ('k') | media/capture/video/video_capture_device_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698