Skip to content

Commit 9e5f1e4

Browse files
youennfphiln
authored andcommitted
Update libwebrtc to M115
https://bugs.webkit.org/show_bug.cgi?id=258208 rdar://107371861 Reviewed by Eric Carlson. Update libwebrtc to M115 branch. This allows enabling a few tests. We have to change a bit RTCDataChannel::didChangeReadyState since connecting is now firing for remote non negotiated channels. Update WebCore call sites to use updated API. In particular, callbaks are now more in use which simplifies our code a bit. * LayoutTests/TestExpectations: * LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpParameters-encodings-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webrtc/RollbackEvents.https-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/msid-generate-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/msid-parse-expected.txt: * Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp: * Source/ThirdParty/libwebrtc/Source/third_party/pffft: Resynced. * Source/ThirdParty/libwebrtc/Source/webrtc: Resynced. * Source/WebCore/Modules/mediastream/RTCDataChannel.cpp: (WebCore::RTCDataChannel::didChangeReadyState): * Source/WebCore/Modules/mediastream/RTCStatsReport.h: * Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp: (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallbackWrapper::create): (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallbackWrapper::process): (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallbackWrapper::RTCCertificateGeneratorCallbackWrapper): (WebCore::LibWebRTCCertificateGenerator::generateCertificate): (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallback::RTCCertificateGeneratorCallback): Deleted. (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallback::AddRef const): Deleted. (WebCore::LibWebRTCCertificateGenerator::RTCCertificateGeneratorCallback::Release const): Deleted. (): Deleted. * Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp: (WebCore::LibWebRTCMediaEndpoint::addTrack): (WebCore::LibWebRTCMediaEndpoint::gatherDecoderImplementationName): (WebCore::LibWebRTCMediaEndpoint::createSourceAndRTCTrack): (WebCore::LibWebRTCMediaEndpoint::OnStatsDelivered): * Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderTransformBackend.cpp: (WebCore::LibWebRTCRtpSenderTransformBackend::requestKeyFrame): * Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpTransformableFrame.cpp: (WebCore::LibWebRTCRtpTransformableFrame::videoMetadata const): * Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp: (WebCore::fillRTCStats): (WebCore::fillRtpStreamStats): (WebCore::fillReceivedRtpStreamStats): (WebCore::fillInboundRtpStreamStats): (WebCore::fillSentRtpStreamStats): (WebCore::fillOutboundRtpStreamStats): (WebCore::initializeRTCStatsReportBackingMap): * Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp: (WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread): (WebCore::LibWebRTCProvider::callOnWebRTCSignalingThread): (WebCore::LibWebRTCProvider::createPeerConnection): (WebCore::ThreadMessageData::ThreadMessageData): Deleted. (WebCore::PeerConnectionFactoryAndThreads::OnMessage): Deleted. * Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp: (WebCore::MockLibWebRTCPeerConnectionFactory::CreateVideoTrack): * Source/WebCore/testing/MockLibWebRTCPeerConnection.h: * Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp: (WebKit::NetworkRTCProvider::callOnRTCNetworkThread): (WebKit::NetworkMessageData::NetworkMessageData): Deleted. (WebKit::NetworkRTCProvider::OnMessage): Deleted. * Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.h: * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCResolver.cpp: (WebKit::LibWebRTCResolver::Start): * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCResolver.h: Canonical link: https://commits.webkit.org/265320@main
1 parent 303f947 commit 9e5f1e4

2,390 files changed

Lines changed: 108210 additions & 103493 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LayoutTests/imported/w3c/web-platform-tests/media-capabilities/decodingInfo.webrtc-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ PASS Test that decodingInfo returns a valid MediaCapabilitiesInfo objects
1111
PASS Test that decodingInfo returns supported, smooth, and powerEfficient set to false for non-webrtc video content type.
1212
PASS Test that decodingInfo returns supported, smooth, and powerEfficient set to false for non-webrtc audio content type.
1313
PASS Test that decodingInfo returns supported true for the codec audio/opus returned by RTCRtpReceiver.getCapabilities()
14-
PASS Test that decodingInfo returns supported true for the codec audio/ISAC returned by RTCRtpReceiver.getCapabilities()
1514
PASS Test that decodingInfo returns supported true for the codec audio/G722 returned by RTCRtpReceiver.getCapabilities()
1615
PASS Test that decodingInfo returns supported true for the codec audio/PCMU returned by RTCRtpReceiver.getCapabilities()
1716
PASS Test that decodingInfo returns supported true for the codec audio/PCMA returned by RTCRtpReceiver.getCapabilities()

LayoutTests/imported/w3c/web-platform-tests/media-capabilities/encodingInfo.webrtc-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ PASS Test that encodingInfo returns a valid MediaCapabilitiesInfo objects
1111
PASS Test that encodingInfo returns supported, smooth, and powerEfficient set to false for non-webrtc video content type.
1212
PASS Test that encodingInfo returns supported, smooth, and powerEfficient set to false for non-webrtc audio content type.
1313
PASS Test that encodingInfo returns supported true for the codec audio/opus returned by RTCRtpSender.getCapabilities()
14-
PASS Test that encodingInfo returns supported true for the codec audio/ISAC returned by RTCRtpSender.getCapabilities()
1514
PASS Test that encodingInfo returns supported true for the codec audio/G722 returned by RTCRtpSender.getCapabilities()
1615
PASS Test that encodingInfo returns supported true for the codec audio/PCMU returned by RTCRtpSender.getCapabilities()
1716
PASS Test that encodingInfo returns supported true for the codec audio/PCMA returned by RTCRtpSender.getCapabilities()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
Harness Error (TIMEOUT), message = null
3+
4+
TIMEOUT Capturing a video element and sending it via PeerConnection Test timed out
5+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
PASS Remote reanswer altering rids does not throw an exception.
3+
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
FAIL sRD(simulcast answer) can narrow the simulcast envelope when interrupted by a setParameters promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to set parameters since getParameters() has never been called on this sender"
3+
FAIL sRD(simulcast offer) can narrow the simulcast envelope when interrupted by a setParameters promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to set parameters since getParameters() has never been called on this sender"
4+
PASS a simulcast setParameters followed by a sRD(unicast answer) results in keeping the first encoding
5+
FAIL sRD(unicast answer) interrupted by setParameters(simulcast) results in keeping the first encoding promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to set parameters since getParameters() has never been called on this sender"
6+
FAIL sRD(unicast reoffer) interrupted by setParameters(simulcast) results in keeping the first encoding promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to set parameters since getParameters() has never been called on this sender"
7+
FAIL sRD(simulcast answer) interrupted by a setParameters does not result in losing modifications from the setParameters to the encodings that remain promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to set parameters since getParameters() has never been called on this sender"
8+
FAIL addTrack, then a unicast setParameters, then sRD(simulcast offer) results in simulcast without the settings from setParameters assert_array_equals: lengths differ, expected array ["foo", "bar"] length 2, got [""] length 1
9+
FAIL addTrack, then sRD(simulcast offer) interrupted by a unicast setParameters results in simulcast without the settings from setParameters assert_array_equals: lengths differ, expected array ["foo", "bar"] length 2, got [""] length 1
10+
PASS getParameters, then sLD(unicast answer) interrupted by a simulcast setParameters results in unicast
11+
FAIL Success task for setLocalDescription(answer) clears [[LastReturnedParameters]] assert_unreached: Should have rejected: undefined Reached unreachable code
12+
FAIL Success task for setRemoteDescription(offer) clears [[LastReturnedParameters]] assert_unreached: Should have rejected: undefined Reached unreachable code
13+
FAIL Success task for setRemoteDescription(answer) clears [[LastReturnedParameters]] assert_unreached: Should have rejected: undefined Reached unreachable code
14+
FAIL addTrack, then rollback of sRD(simulcast offer), brings us back to having a single encoding without any previously set parameters assert_array_equals: lengths differ, expected array ["foo", "bar"] length 2, got [""] length 1
15+
FAIL rollback of a remote offer that disabled a previously negotiated simulcast should restore simulcast along with any previously set parameters assert_array_equals: lengths differ, expected array ["foo", "bar"] length 2, got ["foo"] length 1
16+
FAIL rollback of sRD(simulcast offer) interrupted by setParameters(simulcast) brings us back to having a single encoding without any previously set parameters assert_array_equals: lengths differ, expected array ["foo", "bar"] length 2, got [""] length 1
17+

Source/ThirdParty/libwebrtc/Source/third_party/pffft/BUILD.gn

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019 The Chromium Authors. All rights reserved.
1+
# Copyright 2019 The Chromium Authors
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

@@ -7,6 +7,8 @@ import("//testing/libfuzzer/fuzzer_test.gni")
77
import("//testing/test.gni")
88

99
config("common_config") {
10+
cflags = [ "-Wno-shadow" ]
11+
1012
if (is_win) {
1113
defines = [
1214
# Required to use math constants from math.h.
@@ -17,7 +19,8 @@ config("common_config") {
1719
# PFFFT doesn't support SIMD on some cpus, so build a scalar version.
1820
if ((current_cpu == "arm" && !arm_use_neon) || current_cpu == "mipsel" ||
1921
current_cpu == "mips64el" || current_cpu == "ppc64" ||
20-
current_cpu == "s390x") {
22+
current_cpu == "riscv64" || current_cpu == "s390x" ||
23+
current_cpu == "loong64") {
2124
defines = [ "PFFFT_SIMD_DISABLE" ]
2225
}
2326
}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
maxmorin@chromium.org
2-
olka@chromium.org
1+
alessiob@chromium.org
2+
peah@chromium.org
3+
saza@chromium.org

Source/ThirdParty/libwebrtc/Source/third_party/pffft/generate_seed_corpus.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright 2019 The Chromium Authors. All rights reserved.
2+
# Copyright 2019 The Chromium Authors
33
# Use of this source code is governed by a BSD-style license that can be
44
# found in the LICENSE file.
55

Source/ThirdParty/libwebrtc/Source/third_party/pffft/pffft_fuzzer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 The Chromium Authors. All rights reserved.
1+
// Copyright 2019 The Chromium Authors
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

Source/ThirdParty/libwebrtc/Source/third_party/pffft/pffft_unittest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 The Chromium Authors. All rights reserved.
1+
// Copyright 2019 The Chromium Authors
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

0 commit comments

Comments
 (0)