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

Replace uses of blink::Platform::GetRtpSenderCapabilities

.. by calling PeerConnectionDependencyFactory::GetSenderCapabilities() directly.

This is now possible, after [1], where
peer_connection_dependency_factory.cc|h is moved to Blink.

As a bonus, blink::Platform::GetRtpReceiverCapabilities was not being
used and got removed.

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

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

Change-Id: I8614838651a388d81d2d913fbd3657b31a195f7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1807157
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706386}
parent b04cbc16
...@@ -592,26 +592,6 @@ RendererBlinkPlatformImpl::CreateWebRtcAsyncResolverFactory() { ...@@ -592,26 +592,6 @@ RendererBlinkPlatformImpl::CreateWebRtcAsyncResolverFactory() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
std::unique_ptr<webrtc::RtpCapabilities>
RendererBlinkPlatformImpl::GetRtpSenderCapabilities(
const blink::WebString& kind) {
auto* pc_dependency_factory =
blink::PeerConnectionDependencyFactory::GetInstance();
pc_dependency_factory->EnsureInitialized();
return pc_dependency_factory->GetSenderCapabilities(kind.Utf8());
}
std::unique_ptr<webrtc::RtpCapabilities>
RendererBlinkPlatformImpl::GetRtpReceiverCapabilities(
const blink::WebString& kind) {
auto* pc_dependency_factory =
blink::PeerConnectionDependencyFactory::GetInstance();
pc_dependency_factory->EnsureInitialized();
return pc_dependency_factory->GetReceiverCapabilities(kind.Utf8());
}
//------------------------------------------------------------------------------
base::Optional<double> base::Optional<double>
RendererBlinkPlatformImpl::GetWebRtcMaxCaptureFrameRate() { RendererBlinkPlatformImpl::GetWebRtcMaxCaptureFrameRate() {
const std::string max_fps_str = const std::string max_fps_str =
......
...@@ -138,10 +138,6 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { ...@@ -138,10 +138,6 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebLocalFrame* frame) override; blink::WebLocalFrame* frame) override;
std::unique_ptr<webrtc::AsyncResolverFactory> std::unique_ptr<webrtc::AsyncResolverFactory>
CreateWebRtcAsyncResolverFactory() override; CreateWebRtcAsyncResolverFactory() override;
std::unique_ptr<webrtc::RtpCapabilities> GetRtpSenderCapabilities(
const blink::WebString& kind) override;
std::unique_ptr<webrtc::RtpCapabilities> GetRtpReceiverCapabilities(
const blink::WebString& kind) override;
base::Optional<double> GetWebRtcMaxCaptureFrameRate() override; base::Optional<double> GetWebRtcMaxCaptureFrameRate() override;
scoped_refptr<media::AudioRendererSink> NewAudioRendererSink( scoped_refptr<media::AudioRendererSink> NewAudioRendererSink(
blink::WebAudioDeviceSourceType source_type, blink::WebAudioDeviceSourceType source_type,
......
...@@ -106,7 +106,6 @@ class ContextProvider; ...@@ -106,7 +106,6 @@ class ContextProvider;
} }
namespace webrtc { namespace webrtc {
struct RtpCapabilities;
class AsyncResolverFactory; class AsyncResolverFactory;
} }
...@@ -599,13 +598,6 @@ class BLINK_PLATFORM_EXPORT Platform { ...@@ -599,13 +598,6 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual std::unique_ptr<webrtc::AsyncResolverFactory> virtual std::unique_ptr<webrtc::AsyncResolverFactory>
CreateWebRtcAsyncResolverFactory(); CreateWebRtcAsyncResolverFactory();
// Returns the most optimistic view of the capabilities of the system for
// sending or receiving media of the given kind ("audio" or "video").
virtual std::unique_ptr<webrtc::RtpCapabilities> GetRtpSenderCapabilities(
const WebString& kind);
virtual std::unique_ptr<webrtc::RtpCapabilities> GetRtpReceiverCapabilities(
const WebString& kind);
// Checks if the default minimum starting volume value for the AGC is // Checks if the default minimum starting volume value for the AGC is
// overridden on the command line. // overridden on the command line.
virtual base::Optional<double> GetWebRtcMaxCaptureFrameRate() { virtual base::Optional<double> GetWebRtcMaxCaptureFrameRate() {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "third_party/blink/public/platform/web_media_stream.h" #include "third_party/blink/public/platform/web_media_stream.h"
#include "third_party/blink/public/platform/web_media_stream_track.h" #include "third_party/blink/public/platform/web_media_stream_track.h"
#include "third_party/blink/public/platform/web_rtc_rtp_source.h" #include "third_party/blink/public/platform/web_rtc_rtp_source.h"
#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
#include "third_party/blink/renderer/core/loader/document_loader.h" #include "third_party/blink/renderer/core/loader/document_loader.h"
#include "third_party/blink/renderer/modules/peerconnection/rtc_dtls_transport.h" #include "third_party/blink/renderer/modules/peerconnection/rtc_dtls_transport.h"
#include "third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h" #include "third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h"
...@@ -188,7 +189,8 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(const String& kind) { ...@@ -188,7 +189,8 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(const String& kind) {
HeapVector<Member<RTCRtpHeaderExtensionCapability>>()); HeapVector<Member<RTCRtpHeaderExtensionCapability>>());
std::unique_ptr<webrtc::RtpCapabilities> rtc_capabilities = std::unique_ptr<webrtc::RtpCapabilities> rtc_capabilities =
blink::Platform::Current()->GetRtpSenderCapabilities(kind); PeerConnectionDependencyFactory::GetInstance()->GetSenderCapabilities(
kind.Utf8());
HeapVector<Member<RTCRtpCodecCapability>> codecs; HeapVector<Member<RTCRtpCodecCapability>> codecs;
codecs.ReserveInitialCapacity( codecs.ReserveInitialCapacity(
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <tuple> #include <tuple>
#include <utility> #include <utility>
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/web_rtc_dtmf_sender_handler.h" #include "third_party/blink/public/platform/web_rtc_dtmf_sender_handler.h"
#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/core/dom/dom_exception.h" #include "third_party/blink/renderer/core/dom/dom_exception.h"
#include "third_party/blink/renderer/modules/mediastream/media_stream_track.h" #include "third_party/blink/renderer/modules/mediastream/media_stream_track.h"
...@@ -574,7 +574,8 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(const String& kind) { ...@@ -574,7 +574,8 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(const String& kind) {
HeapVector<Member<RTCRtpHeaderExtensionCapability>>()); HeapVector<Member<RTCRtpHeaderExtensionCapability>>());
std::unique_ptr<webrtc::RtpCapabilities> rtc_capabilities = std::unique_ptr<webrtc::RtpCapabilities> rtc_capabilities =
blink::Platform::Current()->GetRtpSenderCapabilities(kind); PeerConnectionDependencyFactory::GetInstance()->GetSenderCapabilities(
kind.Utf8());
HeapVector<Member<RTCRtpCodecCapability>> codecs; HeapVector<Member<RTCRtpCodecCapability>> codecs;
codecs.ReserveInitialCapacity( codecs.ReserveInitialCapacity(
......
...@@ -352,14 +352,4 @@ Platform::CreateWebRtcAsyncResolverFactory() { ...@@ -352,14 +352,4 @@ Platform::CreateWebRtcAsyncResolverFactory() {
return nullptr; return nullptr;
} }
std::unique_ptr<webrtc::RtpCapabilities> Platform::GetRtpSenderCapabilities(
const WebString& kind) {
return nullptr;
}
std::unique_ptr<webrtc::RtpCapabilities> Platform::GetRtpReceiverCapabilities(
const WebString& kind) {
return nullptr;
}
} // namespace blink } // namespace blink
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