Skip to content

GitLab

T
tangled
Commit bbf05dbd authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot
Browse files
Options

Move webrtc_video_frame_adapter.h out of the Blink exposed API 

All its clients have been Onion soup'ed.

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

Change-Id: Ibbef921caf036d9224de6195371b700057193add
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1778661
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692184}
parent 5c9bb13b
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
third_party/blink/public/BUILD.gn
View file @ bbf05dbd
...@@ -175,7 +175,6 @@ source_set("blink_headers") { ...@@ -175,7 +175,6 @@ source_set("blink_headers") {
"platform/modules/webrtc/track_observer.h", "platform/modules/webrtc/track_observer.h",
"platform/modules/webrtc/webrtc_logging.h", "platform/modules/webrtc/webrtc_logging.h",
"platform/modules/webrtc/webrtc_source.h", "platform/modules/webrtc/webrtc_source.h",
"platform/modules/webrtc/webrtc_video_frame_adapter.h",
"platform/platform.h", "platform/platform.h",
"platform/pointer_id.h", "platform/pointer_id.h",
"platform/pointer_properties.h", "platform/pointer_properties.h",
......
third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc
View file @ bbf05dbd
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "media/base/video_util.h" #include "media/base/video_util.h"
#include "third_party/blink/public/mojom/mediastream/media_stream.mojom-blink.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-blink.h"
#include "third_party/blink/public/platform/modules/webrtc/track_observer.h" #include "third_party/blink/public/platform/modules/webrtc/track_observer.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h" #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
#include "third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/renderer/platform/webrtc/webrtc_video_utils.h" #include "third_party/blink/renderer/platform/webrtc/webrtc_video_utils.h"
#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
#include "third_party/blink/renderer/platform/wtf/functional.h" #include "third_party/blink/renderer/platform/wtf/functional.h"
......
third_party/blink/renderer/platform/BUILD.gn
View file @ bbf05dbd
...@@ -1378,6 +1378,7 @@ jumbo_component("platform") { ...@@ -1378,6 +1378,7 @@ jumbo_component("platform") {
"webrtc/track_observer.cc", "webrtc/track_observer.cc",
"webrtc/webrtc_logging.cc", "webrtc/webrtc_logging.cc",
"webrtc/webrtc_video_frame_adapter.cc", "webrtc/webrtc_video_frame_adapter.cc",
"webrtc/webrtc_video_frame_adapter.h",
"webrtc/webrtc_video_utils.cc", "webrtc/webrtc_video_utils.cc",
"webrtc/webrtc_video_utils.h", "webrtc/webrtc_video_utils.h",
"windows_keyboard_codes.h", "windows_keyboard_codes.h",
......
third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.cc
View file @ bbf05dbd
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "media/video/gpu_video_accelerator_factories.h" #include "media/video/gpu_video_accelerator_factories.h"
#include "media/video/video_decode_accelerator.h" #include "media/video/video_decode_accelerator.h"
#include "third_party/blink/public/platform/modules/peerconnection/web_rtc_video_frame_adapter_factory.h" #include "third_party/blink/public/platform/modules/peerconnection/web_rtc_video_frame_adapter_factory.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/renderer/platform/webrtc/webrtc_video_utils.h" #include "third_party/blink/renderer/platform/webrtc/webrtc_video_utils.h"
#include "third_party/webrtc/api/video/video_frame.h" #include "third_party/webrtc/api/video/video_frame.h"
#include "third_party/webrtc/media/base/vp9_profile.h" #include "third_party/webrtc/media/base/vp9_profile.h"
......
third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc
View file @ bbf05dbd
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "media/video/video_encode_accelerator.h" #include "media/video/video_encode_accelerator.h"
#include "mojo/public/cpp/base/shared_memory_utils.h" #include "mojo/public/cpp/base/shared_memory_utils.h"
#include "third_party/blink/public/platform/modules/peerconnection/web_rtc_video_encoder_factory.h" #include "third_party/blink/public/platform/modules/peerconnection/web_rtc_video_encoder_factory.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h" #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
#include "third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
#include "third_party/blink/renderer/platform/wtf/deque.h" #include "third_party/blink/renderer/platform/wtf/deque.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
......
third_party/blink/renderer/platform/peerconnection/webrtc_video_track_source.cc
View file @ bbf05dbd
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "third_party/blink/public/platform/modules/webrtc/webrtc_video_frame_adapter.h" #include "third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h"
#include "third_party/libyuv/include/libyuv/scale.h" #include "third_party/libyuv/include/libyuv/scale.h"
#include "third_party/webrtc/rtc_base/ref_counted_object.h" #include "third_party/webrtc/rtc_base/ref_counted_object.h"
......
third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.cc
View file @ bbf05dbd
...@@ -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/webrtc/webrtc_video_frame_adapter.h" #include "third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h"
#include "base/logging.h" #include "base/logging.h"
#include "third_party/webrtc/common_video/include/video_frame_buffer.h" #include "third_party/webrtc/common_video/include/video_frame_buffer.h"
......
third_party/blink/public/platform/modules/webrtc/webrtc_video_frame_adapter.h → third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h
View file @ bbf05dbd
...@@ -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_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
#include <stdint.h> #include <stdint.h>
#include "media/base/video_frame.h" #include "media/base/video_frame.h"
#include "third_party/blink/public/platform/web_common.h" #include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/webrtc/api/video/video_frame_buffer.h" #include "third_party/webrtc/api/video/video_frame_buffer.h"
namespace blink { namespace blink {
...@@ -16,10 +16,7 @@ namespace blink { ...@@ -16,10 +16,7 @@ namespace blink {
// implementation is read-only and will return null if trying to get a // implementation is read-only and will return null if trying to get a
// non-const pointer to the pixel data. This object will be accessed from // non-const pointer to the pixel data. This object will be accessed from
// different threads, but that's safe since it's read-only. // different threads, but that's safe since it's read-only.
// class PLATFORM_EXPORT WebRtcVideoFrameAdapter
// TODO(crbug.com/704136): Move the class below out of the Blink exposed
// API when all users of it have been Onion souped.
class BLINK_PLATFORM_EXPORT WebRtcVideoFrameAdapter
: public webrtc::VideoFrameBuffer { : public webrtc::VideoFrameBuffer {
public: public:
explicit WebRtcVideoFrameAdapter(scoped_refptr<media::VideoFrame> frame); explicit WebRtcVideoFrameAdapter(scoped_refptr<media::VideoFrame> frame);
...@@ -48,4 +45,4 @@ class BLINK_PLATFORM_EXPORT WebRtcVideoFrameAdapter ...@@ -48,4 +45,4 @@ class BLINK_PLATFORM_EXPORT WebRtcVideoFrameAdapter
} // namespace blink } // namespace blink
#endif // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_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