Skip to content

Commit

Permalink
Merge branch 'feature/m128.6613'
Browse files Browse the repository at this point in the history
  • Loading branch information
torikizi committed Aug 22, 2024
2 parents e93d0bf + 375a245 commit 9ab5484
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 78 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 4 additions & 4 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WEBRTC_BUILD_VERSION=127.6533.1.0
WEBRTC_VERSION=127.6533.1
WEBRTC_READABLE_VERSION=M127.6533@{#1}
WEBRTC_COMMIT=e0b28a6a81a989c1f5c89e30fcd247870047390d
WEBRTC_BUILD_VERSION=128.6613.2.0
WEBRTC_VERSION=128.6613.2
WEBRTC_READABLE_VERSION=M128.6613@{#2}
WEBRTC_COMMIT=e7686023a186ac233ed1284da45cc166c0df4e1a
15 changes: 15 additions & 0 deletions patches/dav1d_config_change.patch
Original file line number Diff line number Diff line change
@@ -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
15 changes: 0 additions & 15 deletions patches/h265.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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<const uint8_t> 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
Expand Down
55 changes: 0 additions & 55 deletions patches/revert_asm_changes.patch

This file was deleted.

4 changes: 2 additions & 2 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": [
Expand Down

0 comments on commit 9ab5484

Please sign in to comment.