diff --git a/media/BUILD.gn b/media/BUILD.gn index f9e2dc1771..9cce4de2aa 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -95,7 +95,6 @@ rtc_static_library("rtc_media_base") { "base/videosinkinterface.h", "base/videosourcebase.cc", "base/videosourcebase.h", - "base/videosourceinterface.h", ] if (!build_with_chromium && is_clang) { diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index f4753ec4c1..ed59acfb1f 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -24,11 +24,11 @@ #include "api/video/video_content_type.h" #include "api/video/video_timing.h" #include "api/videosinkinterface.h" +#include "api/videosourceinterface.h" #include "call/video_config.h" #include "media/base/codec.h" #include "media/base/mediaconstants.h" #include "media/base/streamparams.h" -#include "media/base/videosourceinterface.h" #include "modules/audio_processing/include/audio_processing_statistics.h" #include "rtc_base/asyncpacketsocket.h" #include "rtc_base/basictypes.h" diff --git a/media/base/videocapturer.h b/media/base/videocapturer.h index 684f8730bd..219e03643f 100644 --- a/media/base/videocapturer.h +++ b/media/base/videocapturer.h @@ -20,10 +20,10 @@ #include #include +#include "api/videosourceinterface.h" #include "media/base/videoadapter.h" #include "media/base/videobroadcaster.h" #include "media/base/videocommon.h" -#include "media/base/videosourceinterface.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/sigslot.h" diff --git a/media/base/videosourcebase.h b/media/base/videosourcebase.h index f19d8fb587..35f85bb530 100644 --- a/media/base/videosourcebase.h +++ b/media/base/videosourcebase.h @@ -14,7 +14,7 @@ #include #include "api/video/video_frame.h" -#include "media/base/videosourceinterface.h" +#include "api/videosourceinterface.h" #include "rtc_base/thread_checker.h" namespace rtc { diff --git a/media/base/videosourceinterface.cc b/media/base/videosourceinterface.cc deleted file mode 100644 index 42ea04ea62..0000000000 --- a/media/base/videosourceinterface.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2017 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 "media/base/videosourceinterface.h" -namespace rtc { - -VideoSinkWants::VideoSinkWants() = default; -VideoSinkWants::~VideoSinkWants() = default; - -} // namespace rtc diff --git a/media/base/videosourceinterface.h b/media/base/videosourceinterface.h deleted file mode 100644 index 8ef24c502e..0000000000 --- a/media/base/videosourceinterface.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2016 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 MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ -#define MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ - -// TODO(bugs.webrtc.org/6828): remove this file after downstream is updated. -#include "api/videosourceinterface.h" - -#endif // MEDIA_BASE_VIDEOSOURCEINTERFACE_H_