From c9022f508644dc33c01b05cb22ebfc2be145d6b2 Mon Sep 17 00:00:00 2001 From: perkj Date: Thu, 17 Mar 2016 09:57:28 -0700 Subject: [PATCH] Delete empty API files and cleaned up includes. TBR=glaznev@webrtc.org BUG=webrtc:5426 Review URL: https://codereview.webrtc.org/1809053002 Cr-Commit-Position: refs/heads/master@{#12039} --- .../webrtc/objc/RTCPeerConnectionFactory.mm | 1 - .../webrtc/objc/RTCVideoCapturer+Internal.h | 2 +- talk/app/webrtc/objc/RTCVideoSource+Internal.h | 2 +- webrtc/api/api.gyp | 3 --- webrtc/api/java/jni/peerconnection_jni.cc | 1 - webrtc/api/objc/RTCVideoSource+Private.h | 2 +- webrtc/api/peerconnection.cc | 1 - webrtc/api/peerconnection_unittest.cc | 1 - webrtc/api/peerconnectionfactory_unittest.cc | 1 - webrtc/api/remotevideocapturer.cc | 13 ------------- webrtc/api/remotevideocapturer.h | 16 ---------------- webrtc/api/rtpsender.cc | 2 +- webrtc/api/test/peerconnectiontestwrapper.cc | 1 - .../api/videocapturertracksource_unittest.cc | 1 - webrtc/api/videosource.cc | 11 ----------- webrtc/api/videosource.h | 11 ----------- webrtc/api/videosourceinterface.h | 18 ------------------ webrtc/api/videosourceproxy.h | 2 +- webrtc/api/videotrack.h | 2 -- webrtc/api/videotrackrenderers.cc | 13 ------------- webrtc/api/videotrackrenderers.h | 16 ---------------- webrtc/api/videotracksource.h | 2 +- .../peerconnection/client/conductor.cc | 1 - webrtc/media/base/capturemanager.cc | 13 ------------- webrtc/media/base/capturemanager.h | 11 ----------- webrtc/media/base/capturerenderadapter.cc | 11 ----------- webrtc/media/base/capturerenderadapter.h | 11 ----------- webrtc/media/media.gyp | 2 -- 28 files changed, 6 insertions(+), 165 deletions(-) delete mode 100644 webrtc/api/remotevideocapturer.cc delete mode 100644 webrtc/api/remotevideocapturer.h delete mode 100644 webrtc/api/videosource.cc delete mode 100644 webrtc/api/videosource.h delete mode 100644 webrtc/api/videosourceinterface.h delete mode 100644 webrtc/api/videotrackrenderers.cc delete mode 100644 webrtc/api/videotrackrenderers.h delete mode 100644 webrtc/media/base/capturemanager.cc delete mode 100644 webrtc/media/base/capturemanager.h delete mode 100644 webrtc/media/base/capturerenderadapter.cc delete mode 100644 webrtc/media/base/capturerenderadapter.h diff --git a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm index cd81f35e2a..6639797f16 100644 --- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm +++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm @@ -50,7 +50,6 @@ #include "webrtc/api/audiotrack.h" #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/api/videotrack.h" #include "webrtc/base/logging.h" #include "webrtc/base/ssladapter.h" diff --git a/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h b/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h index 37b2452428..799a0274c3 100644 --- a/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h +++ b/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h @@ -27,7 +27,7 @@ #import "RTCVideoCapturer.h" -#include "webrtc/api/videosourceinterface.h" +#include "webrtc/api/mediastreaminterface.h" @interface RTCVideoCapturer (Internal) diff --git a/talk/app/webrtc/objc/RTCVideoSource+Internal.h b/talk/app/webrtc/objc/RTCVideoSource+Internal.h index b1e47d3ab1..a9f9defd6e 100644 --- a/talk/app/webrtc/objc/RTCVideoSource+Internal.h +++ b/talk/app/webrtc/objc/RTCVideoSource+Internal.h @@ -27,7 +27,7 @@ #import "RTCVideoSource.h" -#include "webrtc/api/videosourceinterface.h" +#include "webrtc/api/mediastreaminterface.h" @interface RTCVideoSource (Internal) diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp index 1256a83ad2..aa6ef38e5e 100644 --- a/webrtc/api/api.gyp +++ b/webrtc/api/api.gyp @@ -299,8 +299,6 @@ 'proxy.h', 'remoteaudiosource.cc', 'remoteaudiosource.h', - 'remotevideocapturer.cc', - 'remotevideocapturer.h', 'rtpparameters.h', 'rtpreceiver.cc', 'rtpreceiver.h', @@ -317,7 +315,6 @@ 'streamcollection.h', 'videocapturertracksource.cc', 'videocapturertracksource.h', - 'videosourceinterface.h', 'videosourceproxy.h', 'videotrack.cc', 'videotrack.h', diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc index d614ed6c29..74fb473399 100644 --- a/webrtc/api/java/jni/peerconnection_jni.cc +++ b/webrtc/api/java/jni/peerconnection_jni.cc @@ -55,7 +55,6 @@ #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/api/webrtcsdp.h" #include "webrtc/base/bind.h" #include "webrtc/base/checks.h" diff --git a/webrtc/api/objc/RTCVideoSource+Private.h b/webrtc/api/objc/RTCVideoSource+Private.h index be064bdd9b..7746ba518f 100644 --- a/webrtc/api/objc/RTCVideoSource+Private.h +++ b/webrtc/api/objc/RTCVideoSource+Private.h @@ -10,7 +10,7 @@ #import "RTCVideoSource.h" -#include "webrtc/api/videosourceinterface.h" +#include "webrtc/api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc index 54e76d46c9..691a512b6a 100644 --- a/webrtc/api/peerconnection.cc +++ b/webrtc/api/peerconnection.cc @@ -25,7 +25,6 @@ #include "webrtc/api/mediastreamproxy.h" #include "webrtc/api/mediastreamtrackproxy.h" #include "webrtc/api/remoteaudiosource.h" -#include "webrtc/api/remotevideocapturer.h" #include "webrtc/api/rtpreceiver.h" #include "webrtc/api/rtpsender.h" #include "webrtc/api/streamcollection.h" diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc index dcffd1330f..c6e51a6758 100644 --- a/webrtc/api/peerconnection_unittest.cc +++ b/webrtc/api/peerconnection_unittest.cc @@ -29,7 +29,6 @@ #include "webrtc/api/test/fakeperiodicvideocapturer.h" #include "webrtc/api/test/fakevideotrackrenderer.h" #include "webrtc/api/test/mockpeerconnectionobservers.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/base/gunit.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/scoped_ptr.h" diff --git a/webrtc/api/peerconnectionfactory_unittest.cc b/webrtc/api/peerconnectionfactory_unittest.cc index 2165937945..254e4e0a02 100644 --- a/webrtc/api/peerconnectionfactory_unittest.cc +++ b/webrtc/api/peerconnectionfactory_unittest.cc @@ -18,7 +18,6 @@ #endif #include "webrtc/api/test/fakedtlsidentitystore.h" #include "webrtc/api/test/fakevideotrackrenderer.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" diff --git a/webrtc/api/remotevideocapturer.cc b/webrtc/api/remotevideocapturer.cc deleted file mode 100644 index 177ba54641..0000000000 --- a/webrtc/api/remotevideocapturer.cc +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2013 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. - */ - -#include "webrtc/api/remotevideocapturer.h" - -// TODO(perkj): Remove this file once Chrome gyp file doesn't depend on it. diff --git a/webrtc/api/remotevideocapturer.h b/webrtc/api/remotevideocapturer.h deleted file mode 100644 index 774cb5ac56..0000000000 --- a/webrtc/api/remotevideocapturer.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2013 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. - */ - -#ifndef WEBRTC_API_REMOTEVIDEOCAPTURER_H_ -#define WEBRTC_API_REMOTEVIDEOCAPTURER_H_ - -// TODO(perkj): Remove this file once Chrome gyp file doesn't depend on it. - -#endif // WEBRTC_API_REMOTEVIDEOCAPTURER_H_ diff --git a/webrtc/api/rtpsender.cc b/webrtc/api/rtpsender.cc index 1e28883cf9..a7537867e2 100644 --- a/webrtc/api/rtpsender.cc +++ b/webrtc/api/rtpsender.cc @@ -11,7 +11,7 @@ #include "webrtc/api/rtpsender.h" #include "webrtc/api/localaudiosource.h" -#include "webrtc/api/videosourceinterface.h" +#include "webrtc/api/mediastreaminterface.h" #include "webrtc/base/helpers.h" namespace webrtc { diff --git a/webrtc/api/test/peerconnectiontestwrapper.cc b/webrtc/api/test/peerconnectiontestwrapper.cc index 353f0ee349..2ff9b5d009 100644 --- a/webrtc/api/test/peerconnectiontestwrapper.cc +++ b/webrtc/api/test/peerconnectiontestwrapper.cc @@ -14,7 +14,6 @@ #include "webrtc/api/test/fakeperiodicvideocapturer.h" #include "webrtc/api/test/mockpeerconnectionobservers.h" #include "webrtc/api/test/peerconnectiontestwrapper.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/base/gunit.h" #include "webrtc/p2p/client/fakeportallocator.h" diff --git a/webrtc/api/videocapturertracksource_unittest.cc b/webrtc/api/videocapturertracksource_unittest.cc index 0a0687080c..1a9d3ac5e1 100644 --- a/webrtc/api/videocapturertracksource_unittest.cc +++ b/webrtc/api/videocapturertracksource_unittest.cc @@ -11,7 +11,6 @@ #include #include -#include "webrtc/api/remotevideocapturer.h" #include "webrtc/api/test/fakeconstraints.h" #include "webrtc/api/videocapturertracksource.h" #include "webrtc/base/gunit.h" diff --git a/webrtc/api/videosource.cc b/webrtc/api/videosource.cc deleted file mode 100644 index 08e5422aae..0000000000 --- a/webrtc/api/videosource.cc +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 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. - */ - -// TODO(perkj): Remove this file once Chrome build files doesn't depend on it. diff --git a/webrtc/api/videosource.h b/webrtc/api/videosource.h deleted file mode 100644 index 08e5422aae..0000000000 --- a/webrtc/api/videosource.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 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. - */ - -// TODO(perkj): Remove this file once Chrome build files doesn't depend on it. diff --git a/webrtc/api/videosourceinterface.h b/webrtc/api/videosourceinterface.h deleted file mode 100644 index 10ded41411..0000000000 --- a/webrtc/api/videosourceinterface.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 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. - */ - -#ifndef WEBRTC_API_VIDEOSOURCEINTERFACE_H_ -#define WEBRTC_API_VIDEOSOURCEINTERFACE_H_ - -#include "webrtc/api/mediastreaminterface.h" - -// TODO(perkj): Remove this file once Chrome build files doesn't depend on it. - -#endif // WEBRTC_API_VIDEOSOURCEINTERFACE_H_ diff --git a/webrtc/api/videosourceproxy.h b/webrtc/api/videosourceproxy.h index c251b3687c..ecd0e83912 100644 --- a/webrtc/api/videosourceproxy.h +++ b/webrtc/api/videosourceproxy.h @@ -12,7 +12,7 @@ #define WEBRTC_API_VIDEOSOURCEPROXY_H_ #include "webrtc/api/proxy.h" -#include "webrtc/api/videosourceinterface.h" +#include "webrtc/api/mediastreaminterface.h" namespace webrtc { diff --git a/webrtc/api/videotrack.h b/webrtc/api/videotrack.h index 57bc42fca7..36b03b80e4 100644 --- a/webrtc/api/videotrack.h +++ b/webrtc/api/videotrack.h @@ -15,8 +15,6 @@ #include #include "webrtc/api/mediastreamtrack.h" -#include "webrtc/api/videosourceinterface.h" -#include "webrtc/api/videotrackrenderers.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/thread_checker.h" #include "webrtc/media/base/videosourcebase.h" diff --git a/webrtc/api/videotrackrenderers.cc b/webrtc/api/videotrackrenderers.cc deleted file mode 100644 index a19bc3373b..0000000000 --- a/webrtc/api/videotrackrenderers.cc +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 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. - */ - -#include "webrtc/api/videotrackrenderers.h" - -// TODO(perkj): Remove this file once Chrome builds doesnt depend on it. diff --git a/webrtc/api/videotrackrenderers.h b/webrtc/api/videotrackrenderers.h deleted file mode 100644 index 9c8fcac493..0000000000 --- a/webrtc/api/videotrackrenderers.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 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. - */ - -#ifndef WEBRTC_API_VIDEOTRACKRENDERERS_H_ -#define WEBRTC_API_VIDEOTRACKRENDERERS_H_ - -// TODO(perkj): Remove this file once Chrome builds doesnt depend on it. - -#endif // WEBRTC_API_VIDEOTRACKRENDERERS_H_ diff --git a/webrtc/api/videotracksource.h b/webrtc/api/videotracksource.h index 5e2437c6b0..78577aaba2 100644 --- a/webrtc/api/videotracksource.h +++ b/webrtc/api/videotracksource.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_API_VIDEOTRACKSOURCE_H_ #define WEBRTC_API_VIDEOTRACKSOURCE_H_ +#include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/notifier.h" -#include "webrtc/api/videosourceinterface.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videosinkinterface.h" diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc index ca07ef319c..e26d403248 100644 --- a/webrtc/examples/peerconnection/client/conductor.cc +++ b/webrtc/examples/peerconnection/client/conductor.cc @@ -13,7 +13,6 @@ #include #include -#include "webrtc/api/videosourceinterface.h" #include "webrtc/api/test/fakeconstraints.h" #include "webrtc/base/common.h" #include "webrtc/base/json.h" diff --git a/webrtc/media/base/capturemanager.cc b/webrtc/media/base/capturemanager.cc deleted file mode 100644 index 2824184f67..0000000000 --- a/webrtc/media/base/capturemanager.cc +++ /dev/null @@ -1,13 +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. - */ - -#include "webrtc/media/base/capturemanager.h" - -// TODO(perkj): Remove this file once Chrome's gyp file doesn't depend on it. diff --git a/webrtc/media/base/capturemanager.h b/webrtc/media/base/capturemanager.h deleted file mode 100644 index 8d27d82cfc..0000000000 --- a/webrtc/media/base/capturemanager.h +++ /dev/null @@ -1,11 +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. - */ - -// TODO(perkj): Remove this file once Chrome's gyp file doesn't depend on it. diff --git a/webrtc/media/base/capturerenderadapter.cc b/webrtc/media/base/capturerenderadapter.cc deleted file mode 100644 index 4eb738b0db..0000000000 --- a/webrtc/media/base/capturerenderadapter.cc +++ /dev/null @@ -1,11 +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. - */ - -// TODO(perkj): Remove this dummy file once Chrome is not depending on it. diff --git a/webrtc/media/base/capturerenderadapter.h b/webrtc/media/base/capturerenderadapter.h deleted file mode 100644 index 4eb738b0db..0000000000 --- a/webrtc/media/base/capturerenderadapter.h +++ /dev/null @@ -1,11 +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. - */ - -// TODO(perkj): Remove this dummy file once Chrome is not depending on it. diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index 41d1d08aa0..f80c089d1f 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -33,8 +33,6 @@ 'sources': [ 'base/audioframe.h', 'base/audiosource.h', - 'base/capturemanager.cc', - 'base/capturemanager.h', 'base/codec.cc', 'base/codec.h', 'base/cpuid.cc',