commit f7cd7a01fc806db5f52b7e0fc61d841b63c8739d
parent 510568f80392b6fdd44c6da44a1ee1fba6dee35c
Author: Michael Froman <mfroman@mozilla.com>
Date: Thu, 9 Oct 2025 14:39:55 -0500
Bug 1993083 - Vendor libwebrtc from 14a96202f3
Upstream commit: https://webrtc.googlesource.com/src/+/14a96202f3e06f8ed493799e8c65e1c0fc35a8ad
IWYU misc files
and rename
modules/module_common_types_unittest.cc
to
modules/module_common_types_public_unittest.cc
Bug: webrtc:42226242
Change-Id: I4799dd775c26ffa1d1a0bb32c2b5db1825dc405d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/400200
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45152}
Diffstat:
10 files changed, 122 insertions(+), 125 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T19:20:29.496217+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T19:39:44.363665+00:00.
# base of lastest vendoring
-5d7a17505c
+14a96202f3
diff --git a/third_party/libwebrtc/api/jsep_ice_candidate.h b/third_party/libwebrtc/api/jsep_ice_candidate.h
@@ -12,6 +12,6 @@
#define API_JSEP_ICE_CANDIDATE_H_
// TODO: webrtc:406795492 - Delete file once no longer #included.
-#include "api/jsep.h"
+#include "api/jsep.h" // IWYU pragma: keep
#endif // API_JSEP_ICE_CANDIDATE_H_
diff --git a/third_party/libwebrtc/modules/BUILD.gn b/third_party/libwebrtc/modules/BUILD.gn
@@ -79,7 +79,7 @@ if (rtc_include_tests && !build_with_chromium) {
rtc_test("modules_unittests") {
testonly = true
defines = []
- sources = [ "module_common_types_unittest.cc" ]
+ sources = [ "module_common_types_public_unittest.cc" ]
deps = [
":module_api",
diff --git a/third_party/libwebrtc/modules/include/module_common_types.h b/third_party/libwebrtc/modules/include/module_common_types.h
@@ -11,8 +11,7 @@
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_H_
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_H_
-#include <stdint.h>
-
+#include <cstdint>
#include <vector>
namespace webrtc {
diff --git a/third_party/libwebrtc/modules/include/module_common_types_public.h b/third_party/libwebrtc/modules/include/module_common_types_public.h
@@ -11,8 +11,8 @@
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+#include <cstdint>
#include <limits>
-#include <optional>
namespace webrtc {
diff --git a/third_party/libwebrtc/modules/module_common_types_public_unittest.cc b/third_party/libwebrtc/modules/module_common_types_public_unittest.cc
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/include/module_common_types_public.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(IsNewerSequenceNumber, Equal) {
+ EXPECT_FALSE(IsNewerSequenceNumber(0x0001, 0x0001));
+}
+
+TEST(IsNewerSequenceNumber, NoWrap) {
+ EXPECT_TRUE(IsNewerSequenceNumber(0xFFFF, 0xFFFE));
+ EXPECT_TRUE(IsNewerSequenceNumber(0x0001, 0x0000));
+ EXPECT_TRUE(IsNewerSequenceNumber(0x0100, 0x00FF));
+}
+
+TEST(IsNewerSequenceNumber, ForwardWrap) {
+ EXPECT_TRUE(IsNewerSequenceNumber(0x0000, 0xFFFF));
+ EXPECT_TRUE(IsNewerSequenceNumber(0x0000, 0xFF00));
+ EXPECT_TRUE(IsNewerSequenceNumber(0x00FF, 0xFFFF));
+ EXPECT_TRUE(IsNewerSequenceNumber(0x00FF, 0xFF00));
+}
+
+TEST(IsNewerSequenceNumber, BackwardWrap) {
+ EXPECT_FALSE(IsNewerSequenceNumber(0xFFFF, 0x0000));
+ EXPECT_FALSE(IsNewerSequenceNumber(0xFF00, 0x0000));
+ EXPECT_FALSE(IsNewerSequenceNumber(0xFFFF, 0x00FF));
+ EXPECT_FALSE(IsNewerSequenceNumber(0xFF00, 0x00FF));
+}
+
+TEST(IsNewerSequenceNumber, HalfWayApart) {
+ EXPECT_TRUE(IsNewerSequenceNumber(0x8000, 0x0000));
+ EXPECT_FALSE(IsNewerSequenceNumber(0x0000, 0x8000));
+}
+
+TEST(IsNewerTimestamp, Equal) {
+ EXPECT_FALSE(IsNewerTimestamp(0x00000001, 0x000000001));
+}
+
+TEST(IsNewerTimestamp, NoWrap) {
+ EXPECT_TRUE(IsNewerTimestamp(0xFFFFFFFF, 0xFFFFFFFE));
+ EXPECT_TRUE(IsNewerTimestamp(0x00000001, 0x00000000));
+ EXPECT_TRUE(IsNewerTimestamp(0x00010000, 0x0000FFFF));
+}
+
+TEST(IsNewerTimestamp, ForwardWrap) {
+ EXPECT_TRUE(IsNewerTimestamp(0x00000000, 0xFFFFFFFF));
+ EXPECT_TRUE(IsNewerTimestamp(0x00000000, 0xFFFF0000));
+ EXPECT_TRUE(IsNewerTimestamp(0x0000FFFF, 0xFFFFFFFF));
+ EXPECT_TRUE(IsNewerTimestamp(0x0000FFFF, 0xFFFF0000));
+}
+
+TEST(IsNewerTimestamp, BackwardWrap) {
+ EXPECT_FALSE(IsNewerTimestamp(0xFFFFFFFF, 0x00000000));
+ EXPECT_FALSE(IsNewerTimestamp(0xFFFF0000, 0x00000000));
+ EXPECT_FALSE(IsNewerTimestamp(0xFFFFFFFF, 0x0000FFFF));
+ EXPECT_FALSE(IsNewerTimestamp(0xFFFF0000, 0x0000FFFF));
+}
+
+TEST(IsNewerTimestamp, HalfWayApart) {
+ EXPECT_TRUE(IsNewerTimestamp(0x80000000, 0x00000000));
+ EXPECT_FALSE(IsNewerTimestamp(0x00000000, 0x80000000));
+}
+
+TEST(LatestSequenceNumber, NoWrap) {
+ EXPECT_EQ(0xFFFFu, LatestSequenceNumber(0xFFFF, 0xFFFE));
+ EXPECT_EQ(0x0001u, LatestSequenceNumber(0x0001, 0x0000));
+ EXPECT_EQ(0x0100u, LatestSequenceNumber(0x0100, 0x00FF));
+
+ EXPECT_EQ(0xFFFFu, LatestSequenceNumber(0xFFFE, 0xFFFF));
+ EXPECT_EQ(0x0001u, LatestSequenceNumber(0x0000, 0x0001));
+ EXPECT_EQ(0x0100u, LatestSequenceNumber(0x00FF, 0x0100));
+}
+
+TEST(LatestSequenceNumber, Wrap) {
+ EXPECT_EQ(0x0000u, LatestSequenceNumber(0x0000, 0xFFFF));
+ EXPECT_EQ(0x0000u, LatestSequenceNumber(0x0000, 0xFF00));
+ EXPECT_EQ(0x00FFu, LatestSequenceNumber(0x00FF, 0xFFFF));
+ EXPECT_EQ(0x00FFu, LatestSequenceNumber(0x00FF, 0xFF00));
+
+ EXPECT_EQ(0x0000u, LatestSequenceNumber(0xFFFF, 0x0000));
+ EXPECT_EQ(0x0000u, LatestSequenceNumber(0xFF00, 0x0000));
+ EXPECT_EQ(0x00FFu, LatestSequenceNumber(0xFFFF, 0x00FF));
+ EXPECT_EQ(0x00FFu, LatestSequenceNumber(0xFF00, 0x00FF));
+}
+
+TEST(LatestTimestamp, NoWrap) {
+ EXPECT_EQ(0xFFFFFFFFu, LatestTimestamp(0xFFFFFFFF, 0xFFFFFFFE));
+ EXPECT_EQ(0x00000001u, LatestTimestamp(0x00000001, 0x00000000));
+ EXPECT_EQ(0x00010000u, LatestTimestamp(0x00010000, 0x0000FFFF));
+}
+
+TEST(LatestTimestamp, Wrap) {
+ EXPECT_EQ(0x00000000u, LatestTimestamp(0x00000000, 0xFFFFFFFF));
+ EXPECT_EQ(0x00000000u, LatestTimestamp(0x00000000, 0xFFFF0000));
+ EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0x0000FFFF, 0xFFFFFFFF));
+ EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0x0000FFFF, 0xFFFF0000));
+
+ EXPECT_EQ(0x00000000u, LatestTimestamp(0xFFFFFFFF, 0x00000000));
+ EXPECT_EQ(0x00000000u, LatestTimestamp(0xFFFF0000, 0x00000000));
+ EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0xFFFFFFFF, 0x0000FFFF));
+ EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0xFFFF0000, 0x0000FFFF));
+}
+
+} // namespace webrtc
diff --git a/third_party/libwebrtc/modules/module_common_types_unittest.cc b/third_party/libwebrtc/modules/module_common_types_unittest.cc
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/include/module_common_types.h"
-
-#include "modules/include/module_common_types_public.h"
-#include "test/gtest.h"
-
-namespace webrtc {
-
-TEST(IsNewerSequenceNumber, Equal) {
- EXPECT_FALSE(IsNewerSequenceNumber(0x0001, 0x0001));
-}
-
-TEST(IsNewerSequenceNumber, NoWrap) {
- EXPECT_TRUE(IsNewerSequenceNumber(0xFFFF, 0xFFFE));
- EXPECT_TRUE(IsNewerSequenceNumber(0x0001, 0x0000));
- EXPECT_TRUE(IsNewerSequenceNumber(0x0100, 0x00FF));
-}
-
-TEST(IsNewerSequenceNumber, ForwardWrap) {
- EXPECT_TRUE(IsNewerSequenceNumber(0x0000, 0xFFFF));
- EXPECT_TRUE(IsNewerSequenceNumber(0x0000, 0xFF00));
- EXPECT_TRUE(IsNewerSequenceNumber(0x00FF, 0xFFFF));
- EXPECT_TRUE(IsNewerSequenceNumber(0x00FF, 0xFF00));
-}
-
-TEST(IsNewerSequenceNumber, BackwardWrap) {
- EXPECT_FALSE(IsNewerSequenceNumber(0xFFFF, 0x0000));
- EXPECT_FALSE(IsNewerSequenceNumber(0xFF00, 0x0000));
- EXPECT_FALSE(IsNewerSequenceNumber(0xFFFF, 0x00FF));
- EXPECT_FALSE(IsNewerSequenceNumber(0xFF00, 0x00FF));
-}
-
-TEST(IsNewerSequenceNumber, HalfWayApart) {
- EXPECT_TRUE(IsNewerSequenceNumber(0x8000, 0x0000));
- EXPECT_FALSE(IsNewerSequenceNumber(0x0000, 0x8000));
-}
-
-TEST(IsNewerTimestamp, Equal) {
- EXPECT_FALSE(IsNewerTimestamp(0x00000001, 0x000000001));
-}
-
-TEST(IsNewerTimestamp, NoWrap) {
- EXPECT_TRUE(IsNewerTimestamp(0xFFFFFFFF, 0xFFFFFFFE));
- EXPECT_TRUE(IsNewerTimestamp(0x00000001, 0x00000000));
- EXPECT_TRUE(IsNewerTimestamp(0x00010000, 0x0000FFFF));
-}
-
-TEST(IsNewerTimestamp, ForwardWrap) {
- EXPECT_TRUE(IsNewerTimestamp(0x00000000, 0xFFFFFFFF));
- EXPECT_TRUE(IsNewerTimestamp(0x00000000, 0xFFFF0000));
- EXPECT_TRUE(IsNewerTimestamp(0x0000FFFF, 0xFFFFFFFF));
- EXPECT_TRUE(IsNewerTimestamp(0x0000FFFF, 0xFFFF0000));
-}
-
-TEST(IsNewerTimestamp, BackwardWrap) {
- EXPECT_FALSE(IsNewerTimestamp(0xFFFFFFFF, 0x00000000));
- EXPECT_FALSE(IsNewerTimestamp(0xFFFF0000, 0x00000000));
- EXPECT_FALSE(IsNewerTimestamp(0xFFFFFFFF, 0x0000FFFF));
- EXPECT_FALSE(IsNewerTimestamp(0xFFFF0000, 0x0000FFFF));
-}
-
-TEST(IsNewerTimestamp, HalfWayApart) {
- EXPECT_TRUE(IsNewerTimestamp(0x80000000, 0x00000000));
- EXPECT_FALSE(IsNewerTimestamp(0x00000000, 0x80000000));
-}
-
-TEST(LatestSequenceNumber, NoWrap) {
- EXPECT_EQ(0xFFFFu, LatestSequenceNumber(0xFFFF, 0xFFFE));
- EXPECT_EQ(0x0001u, LatestSequenceNumber(0x0001, 0x0000));
- EXPECT_EQ(0x0100u, LatestSequenceNumber(0x0100, 0x00FF));
-
- EXPECT_EQ(0xFFFFu, LatestSequenceNumber(0xFFFE, 0xFFFF));
- EXPECT_EQ(0x0001u, LatestSequenceNumber(0x0000, 0x0001));
- EXPECT_EQ(0x0100u, LatestSequenceNumber(0x00FF, 0x0100));
-}
-
-TEST(LatestSequenceNumber, Wrap) {
- EXPECT_EQ(0x0000u, LatestSequenceNumber(0x0000, 0xFFFF));
- EXPECT_EQ(0x0000u, LatestSequenceNumber(0x0000, 0xFF00));
- EXPECT_EQ(0x00FFu, LatestSequenceNumber(0x00FF, 0xFFFF));
- EXPECT_EQ(0x00FFu, LatestSequenceNumber(0x00FF, 0xFF00));
-
- EXPECT_EQ(0x0000u, LatestSequenceNumber(0xFFFF, 0x0000));
- EXPECT_EQ(0x0000u, LatestSequenceNumber(0xFF00, 0x0000));
- EXPECT_EQ(0x00FFu, LatestSequenceNumber(0xFFFF, 0x00FF));
- EXPECT_EQ(0x00FFu, LatestSequenceNumber(0xFF00, 0x00FF));
-}
-
-TEST(LatestTimestamp, NoWrap) {
- EXPECT_EQ(0xFFFFFFFFu, LatestTimestamp(0xFFFFFFFF, 0xFFFFFFFE));
- EXPECT_EQ(0x00000001u, LatestTimestamp(0x00000001, 0x00000000));
- EXPECT_EQ(0x00010000u, LatestTimestamp(0x00010000, 0x0000FFFF));
-}
-
-TEST(LatestTimestamp, Wrap) {
- EXPECT_EQ(0x00000000u, LatestTimestamp(0x00000000, 0xFFFFFFFF));
- EXPECT_EQ(0x00000000u, LatestTimestamp(0x00000000, 0xFFFF0000));
- EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0x0000FFFF, 0xFFFFFFFF));
- EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0x0000FFFF, 0xFFFF0000));
-
- EXPECT_EQ(0x00000000u, LatestTimestamp(0xFFFFFFFF, 0x00000000));
- EXPECT_EQ(0x00000000u, LatestTimestamp(0xFFFF0000, 0x00000000));
- EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0xFFFFFFFF, 0x0000FFFF));
- EXPECT_EQ(0x0000FFFFu, LatestTimestamp(0xFFFF0000, 0x0000FFFF));
-}
-
-} // namespace webrtc
diff --git a/third_party/libwebrtc/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc b/third_party/libwebrtc/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc
@@ -22,7 +22,6 @@
#include "api/units/time_delta.h"
#include "logging/rtc_event_log/rtc_event_log_parser.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/protobuf_utils.h"
#include "rtc_tools/rtc_event_log_visualizer/analyzer.h"
#include "rtc_tools/rtc_event_log_visualizer/analyzer_common.h"
#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
diff --git a/third_party/libwebrtc/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc b/third_party/libwebrtc/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc
@@ -17,7 +17,6 @@
#include <string>
#include <vector>
-#include "rtc_base/protobuf_utils.h"
#include "rtc_base/system/file_wrapper.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/third_party/libwebrtc/test/testsupport/jpeg_frame_writer.cc b/third_party/libwebrtc/test/testsupport/jpeg_frame_writer.cc
@@ -24,6 +24,7 @@ extern "C" {
#else
// Include directory supplied by gn
#include "jpeglib.h" // NOLINT
+#include "jpeglibmangler.h"
#endif
}
