From bb78fef7233c4eb381bffd571403257a0490c691 Mon Sep 17 00:00:00 2001 From: melpon Date: Wed, 24 Jul 2024 00:57:35 +0000 Subject: [PATCH 01/10] [create] Create new branch feature/m128.6613 --- VERSION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index c67b53c..74e81a5 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -WEBRTC_BUILD_VERSION=126.6478.1.0 -WEBRTC_VERSION=126.6478.1 -WEBRTC_READABLE_VERSION=M126.6478@{#1} -WEBRTC_COMMIT=a18e38fed2307edd6382760213fa3ddf199fa181 +WEBRTC_BUILD_VERSION=128.6613.0.0 +WEBRTC_VERSION=128.6613.0 +WEBRTC_READABLE_VERSION=M128.6613@{#0} +WEBRTC_COMMIT=1ac162ee20a214bf97f6594a7effcbbc21f1effb From e85936c9cc8bfa3506bc726fcff37256de6a417a Mon Sep 17 00:00:00 2001 From: melpon Date: Wed, 31 Jul 2024 00:47:03 +0000 Subject: [PATCH 02/10] [update] Update version m128.6613.0 to m128.6613.1 --- VERSION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 74e81a5..d1a19e8 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -WEBRTC_BUILD_VERSION=128.6613.0.0 -WEBRTC_VERSION=128.6613.0 -WEBRTC_READABLE_VERSION=M128.6613@{#0} -WEBRTC_COMMIT=1ac162ee20a214bf97f6594a7effcbbc21f1effb +WEBRTC_BUILD_VERSION=128.6613.1.0 +WEBRTC_VERSION=128.6613.1 +WEBRTC_READABLE_VERSION=M128.6613@{#1} +WEBRTC_COMMIT=bef5d63112748d963af30b7ac39bf3628b6ce9ef From b8507e7f3e9c3551304f1bc759b3fc35b7266083 Mon Sep 17 00:00:00 2001 From: melpon Date: Wed, 14 Aug 2024 00:12:04 +0000 Subject: [PATCH 03/10] [update] Update version m128.6613.1 to m128.6613.2 --- VERSION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index d1a19e8..7ddf497 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -WEBRTC_BUILD_VERSION=128.6613.1.0 -WEBRTC_VERSION=128.6613.1 -WEBRTC_READABLE_VERSION=M128.6613@{#1} -WEBRTC_COMMIT=bef5d63112748d963af30b7ac39bf3628b6ce9ef +WEBRTC_BUILD_VERSION=128.6613.2.0 +WEBRTC_VERSION=128.6613.2 +WEBRTC_READABLE_VERSION=M128.6613@{#2} +WEBRTC_COMMIT=e7686023a186ac233ed1284da45cc166c0df4e1a From 427b5bb6183ddf70a086a415314fbcfecfc429ab Mon Sep 17 00:00:00 2001 From: tnoho Date: Wed, 14 Aug 2024 22:59:29 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=E3=83=91=E3=83=83=E3=83=81=E3=81=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E5=88=86=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/h265.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/patches/h265.patch b/patches/h265.patch index 5e37211..7f6b115 100644 --- a/patches/h265.patch +++ b/patches/h265.patch @@ -131,21 +131,6 @@ index c793996bc1..6b7ac9dbd7 100644 }; // Unpack RBSP and parse VPS state from the supplied buffer. -diff --git a/modules/rtp_rtcp/source/rtp_packetizer_h265.cc b/modules/rtp_rtcp/source/rtp_packetizer_h265.cc -index 5f10120d81..775c50c38e 100644 ---- a/modules/rtp_rtcp/source/rtp_packetizer_h265.cc -+++ b/modules/rtp_rtcp/source/rtp_packetizer_h265.cc -@@ -26,6 +26,10 @@ RtpPacketizerH265::RtpPacketizerH265(rtc::ArrayView payload, - : limits_(limits), num_packets_left_(0) { - for (const auto& nalu : - H264::FindNaluIndices(payload.data(), payload.size())) { -+ if (!nalu.payload_size) { -+ input_fragments_.clear(); -+ return; -+ } - input_fragments_.push_back( - payload.subview(nalu.payload_start_offset, nalu.payload_size)); - } diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc index ae9cb190a0..e875a5e109 100644 --- a/video/rtp_video_stream_receiver2.cc From 3ed5f3e1503969930db87f0f037fb0930e28fab7 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 15 Aug 2024 21:08:00 +0900 Subject: [PATCH 05/10] =?UTF-8?q?dav1d=20=E3=81=AE=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=88=A9=E7=94=A8=E3=82=92=20apple=20=E7=B3=BB=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/dav1d_config_change.patch | 15 +++++++++ patches/revert_asm_changes.patch | 55 ------------------------------- run.py | 4 +-- 3 files changed, 17 insertions(+), 57 deletions(-) create mode 100644 patches/dav1d_config_change.patch delete mode 100644 patches/revert_asm_changes.patch diff --git a/patches/dav1d_config_change.patch b/patches/dav1d_config_change.patch new file mode 100644 index 0000000..2dae03e --- /dev/null +++ b/patches/dav1d_config_change.patch @@ -0,0 +1,15 @@ +diff --git a/third_party/dav1d/config/apple/arm64/config.h b/third_party/dav1d/config/apple/arm64/config.h +index 9a15fc5393f..83a88db75b7 100644 +--- a/third_party/dav1d/config/apple/arm64/config.h ++++ b/third_party/dav1d/config/apple/arm64/config.h +@@ -43,9 +43,9 @@ + + #define HAVE_ASM 1 + +-#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 1 ++#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 0 + +-#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 1 ++#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 0 + + #define HAVE_AS_ARCHEXT_SVE2_DIRECTIVE 1 diff --git a/patches/revert_asm_changes.patch b/patches/revert_asm_changes.patch deleted file mode 100644 index 411310c..0000000 --- a/patches/revert_asm_changes.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/third_party/dav1d/libdav1d/src/arm/asm.S b/third_party/dav1d/libdav1d/src/arm/asm.S -index fed73b3..dc50415 100644 ---- a/third_party/dav1d/libdav1d/src/arm/asm.S -+++ b/third_party/dav1d/libdav1d/src/arm/asm.S -@@ -34,50 +34,6 @@ - #define x18 do_not_use_x18 - #define w18 do_not_use_w18 - --#if HAVE_AS_ARCH_DIRECTIVE -- .arch AS_ARCH_LEVEL --#endif -- --#if HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE --#define ENABLE_DOTPROD .arch_extension dotprod --#define DISABLE_DOTPROD .arch_extension nodotprod --#else --#define ENABLE_DOTPROD --#define DISABLE_DOTPROD --#endif --#if HAVE_AS_ARCHEXT_I8MM_DIRECTIVE --#define ENABLE_I8MM .arch_extension i8mm --#define DISABLE_I8MM .arch_extension noi8mm --#else --#define ENABLE_I8MM --#define DISABLE_I8MM --#endif --#if HAVE_AS_ARCHEXT_SVE_DIRECTIVE --#define ENABLE_SVE .arch_extension sve --#define DISABLE_SVE .arch_extension nosve --#else --#define ENABLE_SVE --#define DISABLE_SVE --#endif --#if HAVE_AS_ARCHEXT_SVE2_DIRECTIVE --#define ENABLE_SVE2 .arch_extension sve2 --#define DISABLE_SVE2 .arch_extension nosve2 --#else --#define ENABLE_SVE2 --#define DISABLE_SVE2 --#endif -- --/* If we do support the .arch_extension directives, disable support for all -- * the extensions that we may use, in case they were implicitly enabled by -- * the .arch level. This makes it clear if we try to assemble an instruction -- * from an unintended extension set; we only allow assmbling such instructions -- * within regions where we explicitly enable those extensions. */ --DISABLE_DOTPROD --DISABLE_I8MM --DISABLE_SVE --DISABLE_SVE2 -- -- - /* Support macros for - * - Armv8.3-A Pointer Authentication and - * - Armv8.5-A Branch Target Identification \ No newline at end of file diff --git a/run.py b/run.py index 11b5915..9482678 100644 --- a/run.py +++ b/run.py @@ -223,7 +223,7 @@ def get_depot_tools(source_dir, fetch=False): "h265.patch", "h265_ios.patch", "arm_neon_sve_bridge.patch", - "revert_asm_changes.patch", + "dav1d_config_change.patch", "fix_perfetto.patch", ], "ios": [ @@ -240,7 +240,7 @@ def get_depot_tools(source_dir, fetch=False): "h265.patch", "h265_ios.patch", "arm_neon_sve_bridge.patch", - "revert_asm_changes.patch", + "dav1d_config_change.patch", "fix_perfetto.patch", ], "android": [ From 58e0801bdf1b2f48dc422e0fc893273f0b996152 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 15 Aug 2024 22:27:34 +0900 Subject: [PATCH 06/10] =?UTF-8?q?MACOS=5FDEPLOYMENT=5FTARGET=20=E3=82=92?= =?UTF-8?q?=2012.3=20=E3=81=BE=E3=81=A7=E3=81=82=E3=81=92=E3=81=A6?= =?UTF-8?q?=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index ded1ec2..6ab70cb 100644 --- a/DEPS +++ b/DEPS @@ -1 +1 @@ -MACOS_DEPLOYMENT_TARGET=12 +MACOS_DEPLOYMENT_TARGET=12.3 From d14da66228a2993cbf4c24ac894fd94b3c184eca Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 15 Aug 2024 23:12:18 +0900 Subject: [PATCH 07/10] =?UTF-8?q?Revert=20"MACOS=5FDEPLOYMENT=5FTARGET=20?= =?UTF-8?q?=E3=82=92=2012.3=20=E3=81=BE=E3=81=A7=E3=81=82=E3=81=92?= =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 58e0801bdf1b2f48dc422e0fc893273f0b996152. --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6ab70cb..ded1ec2 100644 --- a/DEPS +++ b/DEPS @@ -1 +1 @@ -MACOS_DEPLOYMENT_TARGET=12.3 +MACOS_DEPLOYMENT_TARGET=12 From f9d4d420c121cc9592596c2a015738917e4dd02a Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 15 Aug 2024 23:13:22 +0900 Subject: [PATCH 08/10] =?UTF-8?q?macos=2014.0=20=E3=82=88=E3=82=8A?= =?UTF-8?q?=E4=B8=8B=E3=81=A0=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=82=8B=E5=87=A6=E7=90=86=E3=81=AB=E8=A1=8C=E3=81=8B?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/macos_screen_capture.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/patches/macos_screen_capture.patch b/patches/macos_screen_capture.patch index b6e1a2a..2abe644 100644 --- a/patches/macos_screen_capture.patch +++ b/patches/macos_screen_capture.patch @@ -13,3 +13,18 @@ index a79384c7a3..83da322e60 100644 DesktopRegion region; helper_.TakeInvalidRegion(®ion); +diff --git a/modules/desktop_capture/mac/screen_capturer_sck.mm b/modules/desktop_capture/mac/screen_capturer_sck.mm +index 2dad8b356b..d559a9670b 100644 +--- a/modules/desktop_capture/mac/screen_capturer_sck.mm ++++ b/modules/desktop_capture/mac/screen_capturer_sck.mm +@@ -198,6 +198,10 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSck final : public DesktopCapture + } + + void ScreenCapturerSck::OnShareableContentCreated(SCShareableContent* content) { ++ if (!@available(macOS 14.0, *)) { ++ return; ++ } ++ + if (!content) { + RTC_LOG(LS_ERROR) << "getShareableContent failed."; + permanent_error_ = true; From 1ac3688c930b7c73e146c9e928289c4c1ad24efd Mon Sep 17 00:00:00 2001 From: tnoho Date: Fri, 16 Aug 2024 00:34:34 +0900 Subject: [PATCH 09/10] =?UTF-8?q?Revert=20"macos=2014.0=20=E3=82=88?= =?UTF-8?q?=E3=82=8A=E4=B8=8B=E3=81=A0=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E5=87=A6=E7=90=86=E3=81=AB=E8=A1=8C?= =?UTF-8?q?=E3=81=8B=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f9d4d420c121cc9592596c2a015738917e4dd02a. --- patches/macos_screen_capture.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/patches/macos_screen_capture.patch b/patches/macos_screen_capture.patch index 2abe644..b6e1a2a 100644 --- a/patches/macos_screen_capture.patch +++ b/patches/macos_screen_capture.patch @@ -13,18 +13,3 @@ index a79384c7a3..83da322e60 100644 DesktopRegion region; helper_.TakeInvalidRegion(®ion); -diff --git a/modules/desktop_capture/mac/screen_capturer_sck.mm b/modules/desktop_capture/mac/screen_capturer_sck.mm -index 2dad8b356b..d559a9670b 100644 ---- a/modules/desktop_capture/mac/screen_capturer_sck.mm -+++ b/modules/desktop_capture/mac/screen_capturer_sck.mm -@@ -198,6 +198,10 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSck final : public DesktopCapture - } - - void ScreenCapturerSck::OnShareableContentCreated(SCShareableContent* content) { -+ if (!@available(macOS 14.0, *)) { -+ return; -+ } -+ - if (!content) { - RTC_LOG(LS_ERROR) << "getShareableContent failed."; - permanent_error_ = true; From 146509d2dc26c7f889f7e7591e2a46470c1a4733 Mon Sep 17 00:00:00 2001 From: tnoho Date: Fri, 16 Aug 2024 00:35:16 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=AB?= =?UTF-8?q?=E4=BD=BF=E3=81=86=20Xcode=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E7=8F=BE=E7=8A=B6=E3=81=AE?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b36da7..6d89d49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,8 +73,8 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 - - name: Select Xcode 14.3.1 - run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer + - name: Select Xcode 15.4 + run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer - run: brew install ninja - name: Setup Git User run: |