From 74097fd3f587c750a0db5e143c028ecf13b6cd46 Mon Sep 17 00:00:00 2001 From: nisse Date: Tue, 25 Oct 2016 00:17:43 -0700 Subject: [PATCH] Delete unused file screencastid.h. BUG=None Review-Url: https://codereview.webrtc.org/2433913003 Cr-Commit-Position: refs/heads/master@{#14757} --- webrtc/media/BUILD.gn | 1 - webrtc/media/base/mediachannel.h | 1 - webrtc/media/base/screencastid.h | 97 ------------------------ webrtc/media/base/videocapturerfactory.h | 9 --- webrtc/media/media.gyp | 1 - webrtc/pc/channel_unittest.cc | 1 - 6 files changed, 110 deletions(-) delete mode 100644 webrtc/media/base/screencastid.h diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index e3a658c3f8..e54ec8b053 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn @@ -66,7 +66,6 @@ rtc_static_library("rtc_media") { "base/rtpdump.h", "base/rtputils.cc", "base/rtputils.h", - "base/screencastid.h", "base/streamparams.cc", "base/streamparams.h", "base/turnutils.cc", diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h index 1243ae776d..f3cebee160 100644 --- a/webrtc/media/base/mediachannel.h +++ b/webrtc/media/base/mediachannel.h @@ -51,7 +51,6 @@ class AudioSinkInterface; namespace cricket { class AudioSource; -class ScreencastId; class VideoCapturer; struct RtpHeader; struct VideoFormat; diff --git a/webrtc/media/base/screencastid.h b/webrtc/media/base/screencastid.h deleted file mode 100644 index fdcfbe6409..0000000000 --- a/webrtc/media/base/screencastid.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -// Author: thorcarpenter@google.com (Thor Carpenter) -// -// Defines variant class ScreencastId that combines WindowId and DesktopId. - -#ifndef WEBRTC_MEDIA_BASE_SCREENCASTID_H_ -#define WEBRTC_MEDIA_BASE_SCREENCASTID_H_ - -#include -#include - -#include "webrtc/base/window.h" -#include "webrtc/base/windowpicker.h" - -namespace cricket { - -class ScreencastId; -typedef std::vector ScreencastIdList; - -// Used for identifying a window or desktop to be screencast. -class ScreencastId { - public: - enum Type { INVALID, WINDOW, DESKTOP }; - - // Default constructor indicates invalid ScreencastId. - ScreencastId() : type_(INVALID) {} - explicit ScreencastId(const rtc::WindowId& id) - : type_(WINDOW), window_(id) { - } - explicit ScreencastId(const rtc::DesktopId& id) - : type_(DESKTOP), desktop_(id) { - } - - Type type() const { return type_; } - const rtc::WindowId& window() const { return window_; } - const rtc::DesktopId& desktop() const { return desktop_; } - - // Title is an optional parameter. - const std::string& title() const { return title_; } - void set_title(const std::string& desc) { title_ = desc; } - - bool IsValid() const { - if (type_ == INVALID) { - return false; - } else if (type_ == WINDOW) { - return window_.IsValid(); - } else { - return desktop_.IsValid(); - } - } - bool IsWindow() const { return type_ == WINDOW; } - bool IsDesktop() const { return type_ == DESKTOP; } - bool EqualsId(const ScreencastId& other) const { - if (type_ != other.type_) { - return false; - } - if (type_ == INVALID) { - return true; - } else if (type_ == WINDOW) { - return window_.Equals(other.window()); - } - return desktop_.Equals(other.desktop()); - } - - // T is assumed to be WindowDescription or DesktopDescription. - template - static cricket::ScreencastIdList Convert(const std::vector& list) { - ScreencastIdList screencast_list; - screencast_list.reserve(list.size()); - for (typename std::vector::const_iterator it = list.begin(); - it != list.end(); ++it) { - ScreencastId id(it->id()); - id.set_title(it->title()); - screencast_list.push_back(id); - } - return screencast_list; - } - - private: - Type type_; - rtc::WindowId window_; - rtc::DesktopId desktop_; - std::string title_; // Optional. -}; - -} // namespace cricket - -#endif // WEBRTC_MEDIA_BASE_SCREENCASTID_H_ diff --git a/webrtc/media/base/videocapturerfactory.h b/webrtc/media/base/videocapturerfactory.h index 86f70421f3..012c4a469b 100644 --- a/webrtc/media/base/videocapturerfactory.h +++ b/webrtc/media/base/videocapturerfactory.h @@ -12,7 +12,6 @@ #define WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ #include "webrtc/media/base/device.h" -#include "webrtc/media/base/screencastid.h" namespace cricket { @@ -26,14 +25,6 @@ class VideoDeviceCapturerFactory { virtual VideoCapturer* Create(const Device& device) = 0; }; -class ScreenCapturerFactory { - public: - ScreenCapturerFactory() {} - virtual ~ScreenCapturerFactory() {} - - virtual VideoCapturer* Create(const ScreencastId& screenid) = 0; -}; - } // namespace cricket #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index af74801ae1..ffc6419143 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -45,7 +45,6 @@ 'base/rtpdump.h', 'base/rtputils.cc', 'base/rtputils.h', - 'base/screencastid.h', 'base/streamparams.cc', 'base/streamparams.h', 'base/turnutils.cc', diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc index 91433a7d9c..0bea6dcad2 100644 --- a/webrtc/pc/channel_unittest.cc +++ b/webrtc/pc/channel_unittest.cc @@ -34,7 +34,6 @@ using cricket::CA_PRANSWER; using cricket::CA_ANSWER; using cricket::CA_UPDATE; using cricket::FakeVoiceMediaChannel; -using cricket::ScreencastId; using cricket::StreamParams; using cricket::TransportChannel;