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

Unified Diff: media/capture/video/video_capture_device.h

Issue 1815983003: Remove deprecated QTKit Video Capture Support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 9 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.h
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index 71a4f3e6697a41f0d36c2bebc66af88390e991f1..6983865b6802fc0ab50a7ca8f62279fb51221320 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
enum CaptureApiType { MEDIA_FOUNDATION, DIRECT_SHOW, API_TYPE_UNKNOWN };
#elif defined(OS_MACOSX)
// Mac targets Capture Api type: it can only be set on construction.
- enum CaptureApiType { AVFOUNDATION, QTKIT, DECKLINK, API_TYPE_UNKNOWN };
+ enum CaptureApiType { AVFOUNDATION, DECKLINK, API_TYPE_UNKNOWN };
// For AVFoundation Api, identify devices that are built-in or USB.
enum TransportType { USB_OR_BUILT_IN, OTHER_TRANSPORT };
#elif defined(OS_ANDROID)
@@ -133,10 +133,6 @@ class MEDIA_EXPORT VideoCaptureDevice {
#endif // if defined(OS_WIN)
#if defined(OS_MACOSX)
TransportType transport_type() const { return transport_type_; }
- bool is_blacklisted() const { return is_blacklisted_; }
- void set_is_blacklisted(bool is_blacklisted) {
- is_blacklisted_ = is_blacklisted;
- }
#endif // if defined(OS_MACOSX)
private:
@@ -168,8 +164,6 @@ class MEDIA_EXPORT VideoCaptureDevice {
#endif
#if defined(OS_MACOSX)
TransportType transport_type_;
- // Flag used to mark blacklisted devices for QTKit Api.
- bool is_blacklisted_;
#endif
// Allow generated copy constructor and assignment.
};
« no previous file with comments | « media/capture/video/mac/video_capture_device_qtkit_mac.mm ('k') | media/capture/video/video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698