Revert of Delete empty API files and cleaned up includes. (patchset #2 id:20001 of https://codereview.webrtc.org/1809053002/ )
Reason for revert: Breaks Chromium build. Need to remove the references to the obsolete header files from Chromium and reland. Original issue's description: > Delete empty API files and cleaned up includes. > > TBR=glaznev@webrtc.org > > BUG=webrtc:5426 > > Committed: https://crrev.com/c9022f508644dc33c01b05cb22ebfc2be145d6b2 > Cr-Commit-Position: refs/heads/master@{#12039} TBR=nisse@webrtc.org,glaznev@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5426 Review URL: https://codereview.webrtc.org/1813083002 Cr-Commit-Position: refs/heads/master@{#12042}
This commit is contained in:
parent
4cd331bead
commit
246b527398
@ -50,6 +50,7 @@
|
||||
#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"
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#import "RTCVideoCapturer.h"
|
||||
|
||||
#include "webrtc/api/mediastreaminterface.h"
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
|
||||
@interface RTCVideoCapturer (Internal)
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#import "RTCVideoSource.h"
|
||||
|
||||
#include "webrtc/api/mediastreaminterface.h"
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
|
||||
@interface RTCVideoSource (Internal)
|
||||
|
||||
|
||||
@ -299,6 +299,8 @@
|
||||
'proxy.h',
|
||||
'remoteaudiosource.cc',
|
||||
'remoteaudiosource.h',
|
||||
'remotevideocapturer.cc',
|
||||
'remotevideocapturer.h',
|
||||
'rtpparameters.h',
|
||||
'rtpreceiver.cc',
|
||||
'rtpreceiver.h',
|
||||
@ -315,6 +317,7 @@
|
||||
'streamcollection.h',
|
||||
'videocapturertracksource.cc',
|
||||
'videocapturertracksource.h',
|
||||
'videosourceinterface.h',
|
||||
'videosourceproxy.h',
|
||||
'videotrack.cc',
|
||||
'videotrack.h',
|
||||
|
||||
@ -55,6 +55,7 @@
|
||||
#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"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
#import "RTCVideoSource.h"
|
||||
|
||||
#include "webrtc/api/mediastreaminterface.h"
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#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"
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
#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"
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
#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"
|
||||
|
||||
13
webrtc/api/remotevideocapturer.cc
Normal file
13
webrtc/api/remotevideocapturer.cc
Normal file
@ -0,0 +1,13 @@
|
||||
/*
|
||||
* 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.
|
||||
16
webrtc/api/remotevideocapturer.h
Normal file
16
webrtc/api/remotevideocapturer.h
Normal file
@ -0,0 +1,16 @@
|
||||
/*
|
||||
* 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_
|
||||
@ -11,7 +11,7 @@
|
||||
#include "webrtc/api/rtpsender.h"
|
||||
|
||||
#include "webrtc/api/localaudiosource.h"
|
||||
#include "webrtc/api/mediastreaminterface.h"
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
#include "webrtc/base/helpers.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
#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"
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/api/remotevideocapturer.h"
|
||||
#include "webrtc/api/test/fakeconstraints.h"
|
||||
#include "webrtc/api/videocapturertracksource.h"
|
||||
#include "webrtc/base/gunit.h"
|
||||
|
||||
11
webrtc/api/videosource.cc
Normal file
11
webrtc/api/videosource.cc
Normal file
@ -0,0 +1,11 @@
|
||||
/*
|
||||
* 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.
|
||||
11
webrtc/api/videosource.h
Normal file
11
webrtc/api/videosource.h
Normal file
@ -0,0 +1,11 @@
|
||||
/*
|
||||
* 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.
|
||||
18
webrtc/api/videosourceinterface.h
Normal file
18
webrtc/api/videosourceinterface.h
Normal file
@ -0,0 +1,18 @@
|
||||
/*
|
||||
* 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_
|
||||
@ -12,7 +12,7 @@
|
||||
#define WEBRTC_API_VIDEOSOURCEPROXY_H_
|
||||
|
||||
#include "webrtc/api/proxy.h"
|
||||
#include "webrtc/api/mediastreaminterface.h"
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
|
||||
@ -15,6 +15,8 @@
|
||||
#include <vector>
|
||||
|
||||
#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"
|
||||
|
||||
13
webrtc/api/videotrackrenderers.cc
Normal file
13
webrtc/api/videotrackrenderers.cc
Normal file
@ -0,0 +1,13 @@
|
||||
/*
|
||||
* 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.
|
||||
16
webrtc/api/videotrackrenderers.h
Normal file
16
webrtc/api/videotrackrenderers.h
Normal file
@ -0,0 +1,16 @@
|
||||
/*
|
||||
* 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_
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/api/videosourceinterface.h"
|
||||
#include "webrtc/api/test/fakeconstraints.h"
|
||||
#include "webrtc/base/common.h"
|
||||
#include "webrtc/base/json.h"
|
||||
|
||||
13
webrtc/media/base/capturemanager.cc
Normal file
13
webrtc/media/base/capturemanager.cc
Normal file
@ -0,0 +1,13 @@
|
||||
/*
|
||||
* 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.
|
||||
11
webrtc/media/base/capturemanager.h
Normal file
11
webrtc/media/base/capturemanager.h
Normal file
@ -0,0 +1,11 @@
|
||||
/*
|
||||
* 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.
|
||||
11
webrtc/media/base/capturerenderadapter.cc
Normal file
11
webrtc/media/base/capturerenderadapter.cc
Normal file
@ -0,0 +1,11 @@
|
||||
/*
|
||||
* 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.
|
||||
11
webrtc/media/base/capturerenderadapter.h
Normal file
11
webrtc/media/base/capturerenderadapter.h
Normal file
@ -0,0 +1,11 @@
|
||||
/*
|
||||
* 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.
|
||||
@ -32,6 +32,8 @@
|
||||
'sources': [
|
||||
'base/audioframe.h',
|
||||
'base/audiosource.h',
|
||||
'base/capturemanager.cc',
|
||||
'base/capturemanager.h',
|
||||
'base/codec.cc',
|
||||
'base/codec.h',
|
||||
'base/cpuid.cc',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user