Michael Froman
85c6aaaa3d
Upstream commit: https://webrtc.googlesource.com/src/+/8f81183fb9a4f41f3239ebaeae7655ec5888de02 Embed RtpPacketInfo into PacketBuffer::Packet This allows to remove dedicated map for RtpPacketInfos, extra map lookup to find packet info for matching packet, and avoids need for an extra RtpPacketInfo lifetime tracking. Bug: b/510363993, b/510363837 Change-Id: I17a3e58885d055de6dc4ba6fc1917f6cdab36a13 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/493560 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48283}
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 10 Oct 2024 13:42:00 +0000
|
|
Subject: Bug 1921707 - libwebrtc preprocessor, .json, .gni, and *.gn changes
|
|
r=ng,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D224076
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7017edc7cfc880bb19f94115d4f48a8c58920a9b
|
|
---
|
|
.gn | 2 +-
|
|
media/BUILD.gn | 2 +-
|
|
modules/video_coding/BUILD.gn | 2 +-
|
|
webrtc.gni | 4 ++--
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/.gn b/.gn
|
|
index 29f5cd76e4..9962d2845d 100644
|
|
--- a/.gn
|
|
+++ b/.gn
|
|
@@ -18,7 +18,7 @@ script_executable = "python3"
|
|
# The secondary source root is a parallel directory tree where
|
|
# GN build files are placed when they can not be placed directly
|
|
# in the source tree, e.g. for third party source trees.
|
|
-secondary_source = "//build/secondary/"
|
|
+secondary_source = "//libwebrtc/"
|
|
|
|
# These are the targets to skip header checking by default. The files in targets
|
|
# matching these patterns (see "gn help label_pattern" for format) will not have
|
|
diff --git a/media/BUILD.gn b/media/BUILD.gn
|
|
index 0ff8d91df1..a8f2e045b3 100644
|
|
--- a/media/BUILD.gn
|
|
+++ b/media/BUILD.gn
|
|
@@ -7,7 +7,7 @@
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("//build/config/linux/pkg_config.gni")
|
|
-import("//third_party/libaom/options.gni")
|
|
+import("//libwebrtc/third_party/libaom/options.gni")
|
|
import("../webrtc.gni")
|
|
|
|
group("media") {
|
|
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
|
|
index 15339caace..f65ca9d8c2 100644
|
|
--- a/modules/video_coding/BUILD.gn
|
|
+++ b/modules/video_coding/BUILD.gn
|
|
@@ -7,7 +7,7 @@
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("//build/config/linux/pkg_config.gni")
|
|
-import("//third_party/libaom/options.gni")
|
|
+import("//libwebrtc/third_party/libaom/options.gni")
|
|
import("../../webrtc.gni")
|
|
|
|
rtc_library("encoded_frame") {
|
|
diff --git a/webrtc.gni b/webrtc.gni
|
|
index 99f8646a10..a95f00e6ba 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -496,8 +496,8 @@ all_poison_types = [
|
|
"default_neural_residual_echo_estimator",
|
|
]
|
|
|
|
-absl_include_config = "//third_party/abseil-cpp:absl_include_config"
|
|
-absl_define_config = "//third_party/abseil-cpp:absl_define_config"
|
|
+absl_include_config = "//libwebrtc/third_party/abseil-cpp:absl_include_config"
|
|
+absl_define_config = "//libwebrtc/third_party/abseil-cpp:absl_define_config"
|
|
|
|
# Abseil Flags are testonly, so this config will only be applied to WebRTC
|
|
# targets that are testonly.
|