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

Remove web_rtc_video_encoder_factory.h from the Blink API

... now that its solely client has been Onion soup'ed [1].

[1] https://crrev.com/c/1778673/

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

Change-Id: Iec6d37197e2899f3381029b0e9b628c8d927722b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1778674
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692769}
parent fdf68776
...@@ -162,7 +162,6 @@ source_set("blink_headers") { ...@@ -162,7 +162,6 @@ source_set("blink_headers") {
"platform/modules/peerconnection/rtc_video_decoder_factory.h", "platform/modules/peerconnection/rtc_video_decoder_factory.h",
"platform/modules/peerconnection/rtc_video_encoder_factory.h", "platform/modules/peerconnection/rtc_video_encoder_factory.h",
"platform/modules/peerconnection/two_keys_adapter_map.h", "platform/modules/peerconnection/two_keys_adapter_map.h",
"platform/modules/peerconnection/web_rtc_video_encoder_factory.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/peerconnection/webrtc_video_track_source.h",
......
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEB_RTC_VIDEO_ENCODER_FACTORY_H_
#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEB_RTC_VIDEO_ENCODER_FACTORY_H_
#include <memory>
#include "media/base/video_codecs.h"
#include "third_party/blink/public/platform/web_common.h"
namespace webrtc {
class VideoEncoder;
}
namespace media {
class GpuVideoAcceleratorFactories;
}
namespace blink {
// TODO(crbug.com/787254): Remove this API when its clients are Onion souped.
BLINK_PLATFORM_EXPORT std::unique_ptr<webrtc::VideoEncoder>
CreateRTCVideoEncoder(media::VideoCodecProfile profile,
media::GpuVideoAcceleratorFactories* gpu_factories);
} // namespace blink
#endif // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_WEB_RTC_VIDEO_ENCODER_FACTORY_H_
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "media/video/h264_parser.h" #include "media/video/h264_parser.h"
#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/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_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"
...@@ -884,12 +883,6 @@ void RTCVideoEncoder::Impl::ReturnEncodedImage( ...@@ -884,12 +883,6 @@ void RTCVideoEncoder::Impl::ReturnEncodedImage(
UseOutputBitstreamBufferId(bitstream_buffer_id); UseOutputBitstreamBufferId(bitstream_buffer_id);
} }
std::unique_ptr<webrtc::VideoEncoder> CreateRTCVideoEncoder(
media::VideoCodecProfile profile,
media::GpuVideoAcceleratorFactories* gpu_factories) {
return std::make_unique<RTCVideoEncoder>(profile, gpu_factories);
}
RTCVideoEncoder::RTCVideoEncoder( RTCVideoEncoder::RTCVideoEncoder(
media::VideoCodecProfile profile, media::VideoCodecProfile profile,
media::GpuVideoAcceleratorFactories* gpu_factories) media::GpuVideoAcceleratorFactories* gpu_factories)
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#include "media/video/gpu_video_accelerator_factories.h" #include "media/video/gpu_video_accelerator_factories.h"
#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/modules/peerconnection/web_rtc_video_encoder_factory.h" #include "third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.h"
#include "third_party/webrtc/api/video_codecs/sdp_video_format.h" #include "third_party/webrtc/api/video_codecs/sdp_video_format.h"
#include "third_party/webrtc/api/video_codecs/video_encoder.h" #include "third_party/webrtc/api/video_codecs/video_encoder.h"
#include "third_party/webrtc/common_video/h264/profile_level_id.h" #include "third_party/webrtc/common_video/h264/profile_level_id.h"
...@@ -124,7 +124,7 @@ RTCVideoEncoderFactory::CreateVideoEncoder( ...@@ -124,7 +124,7 @@ RTCVideoEncoderFactory::CreateVideoEncoder(
const webrtc::SdpVideoFormat& format) { const webrtc::SdpVideoFormat& format) {
for (size_t i = 0; i < supported_formats_.size(); ++i) { for (size_t i = 0; i < supported_formats_.size(); ++i) {
if (IsSameFormat(format, supported_formats_[i])) { if (IsSameFormat(format, supported_formats_[i])) {
return blink::CreateRTCVideoEncoder(profiles_[i], gpu_factories_); return std::make_unique<RTCVideoEncoder>(profiles_[i], gpu_factories_);
} }
} }
return nullptr; return nullptr;
......
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