Commit f20a51ea authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Move webrtc_video_track_source.h out of the Blink API

BUG=787254, 919392
R=guidou@chromium.org, haraken@chromium.org

Change-Id: Idb9ef67a8a97181eccf9406b46434e30cf2f72ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867489Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#707304}
parent 93e10d47
...@@ -167,7 +167,6 @@ source_set("blink_headers") { ...@@ -167,7 +167,6 @@ source_set("blink_headers") {
"platform/modules/peerconnection/two_keys_adapter_map.h", "platform/modules/peerconnection/two_keys_adapter_map.h",
"platform/modules/peerconnection/webrtc_audio_sink.h", "platform/modules/peerconnection/webrtc_audio_sink.h",
"platform/modules/peerconnection/webrtc_util.h", "platform/modules/peerconnection/webrtc_util.h",
"platform/modules/peerconnection/webrtc_video_track_source.h",
"platform/modules/remoteplayback/web_remote_playback_client.h", "platform/modules/remoteplayback/web_remote_playback_client.h",
"platform/modules/service_worker/web_service_worker_error.h", "platform/modules/service_worker/web_service_worker_error.h",
"platform/modules/service_worker/web_service_worker_network_provider.h", "platform/modules/service_worker/web_service_worker_network_provider.h",
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "media/base/limits.h" #include "media/base/limits.h"
#include "third_party/blink/public/platform/modules/peerconnection/webrtc_video_track_source.h"
#include "third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_constraints_util.h"
#include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h"
#include "third_party/blink/public/web/modules/mediastream/web_media_stream_utils.h" #include "third_party/blink/public/web/modules/mediastream/web_media_stream_utils.h"
#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h" #include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
#include "third_party/blink/renderer/platform/peerconnection/webrtc_video_track_source.h"
#include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h" #include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h"
#include "third_party/webrtc/api/video_track_source_proxy.h" #include "third_party/webrtc/api/video_track_source_proxy.h"
......
...@@ -1286,6 +1286,7 @@ jumbo_component("platform") { ...@@ -1286,6 +1286,7 @@ jumbo_component("platform") {
"peerconnection/video_codec_factory.h", "peerconnection/video_codec_factory.h",
"peerconnection/webrtc_audio_sink.cc", "peerconnection/webrtc_audio_sink.cc",
"peerconnection/webrtc_video_track_source.cc", "peerconnection/webrtc_video_track_source.cc",
"peerconnection/webrtc_video_track_source.h",
"prerender.cc", "prerender.cc",
"prerender.h", "prerender.h",
"prerender_client.h", "prerender_client.h",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "third_party/blink/public/platform/modules/peerconnection/webrtc_video_track_source.h" #include "third_party/blink/renderer/platform/peerconnection/webrtc_video_track_source.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_
#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "base/threading/thread_checker.h" #include "base/threading/thread_checker.h"
#include "media/base/video_frame_pool.h" #include "media/base/video_frame_pool.h"
#include "third_party/blink/public/platform/web_common.h" #include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/webrtc/media/base/adapted_video_track_source.h" #include "third_party/webrtc/media/base/adapted_video_track_source.h"
#include "third_party/webrtc/rtc_base/timestamp_aligner.h" #include "third_party/webrtc/rtc_base/timestamp_aligner.h"
...@@ -18,10 +18,7 @@ namespace blink { ...@@ -18,10 +18,7 @@ namespace blink {
// the webrtc video pipeline, each received a media::VideoFrame is converted to // the webrtc video pipeline, each received a media::VideoFrame is converted to
// a webrtc::VideoFrame, taking any adaptation requested by downstream classes // a webrtc::VideoFrame, taking any adaptation requested by downstream classes
// into account. // into account.
// class PLATFORM_EXPORT WebRtcVideoTrackSource
// TODO(crbug.com/787254): Move this class out of the Blink exposed API when its
// clients get Onion soup'ed.
class BLINK_PLATFORM_EXPORT WebRtcVideoTrackSource
: public rtc::AdaptedVideoTrackSource { : public rtc::AdaptedVideoTrackSource {
public: public:
struct FrameAdaptationParams { struct FrameAdaptationParams {
...@@ -88,4 +85,4 @@ class BLINK_PLATFORM_EXPORT WebRtcVideoTrackSource ...@@ -88,4 +85,4 @@ class BLINK_PLATFORM_EXPORT WebRtcVideoTrackSource
} // namespace blink } // namespace blink
#endif // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_ #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_WEBRTC_VIDEO_TRACK_SOURCE_H_
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "media/base/video_frame.h" #include "media/base/video_frame.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/platform/modules/peerconnection/webrtc_video_track_source.h" #include "third_party/blink/renderer/platform/peerconnection/webrtc_video_track_source.h"
#include "third_party/blink/renderer/platform/testing/video_frame_utils.h" #include "third_party/blink/renderer/platform/testing/video_frame_utils.h"
#include "third_party/webrtc/api/video/video_frame.h" #include "third_party/webrtc/api/video/video_frame.h"
#include "third_party/webrtc/rtc_base/ref_counted_object.h" #include "third_party/webrtc/rtc_base/ref_counted_object.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment