Danil Chapovalov
c63e43f27d
Deprecate PeerConnectionFactoryDependencies::audio_processing
...
Bug: webrtc:369904700
Change-Id: Ic0982abcff2097e4e52e55a4b9c90ec25ae33b90
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367961
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43444}
2024-11-22 13:21:24 +00:00
Lionel Koenig Gélas
999f02bd5f
Implement playout stats for ios AudioDeviceModule
...
Bug: webrtc:378966976
Change-Id: I30169b43f7fc8aba4832a77043566129d5b087a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/368320
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Commit-Queue: Lionel Koenig <lionelk@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43422}
2024-11-19 10:50:30 +00:00
Björn Terelius
6c8b8e0a2b
Remove unused vars (Java)
...
Bug: None
Change-Id: I713e4547fc2c9d10f0d0267e8fb562f4ce00fd73
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367922
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43378}
2024-11-08 11:23:38 +00:00
Björn Terelius
69af473a8a
Remove unused android //base dependency
...
Bug: None
Change-Id: I750720690624a4e18311cd8b18ba324e69b17f70
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367783
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43365}
2024-11-07 10:28:38 +00:00
Danil Chapovalov
1a93080b8d
Extend ios RTCPeerConnectionFactoryBuilder to have custom audio processing builder and field trials
...
Bug: webrtc:369904700
Change-Id: I1f2914b231d16948e571d8967a38f62080538fe0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367020
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43358}
2024-11-05 10:22:55 +00:00
Danil Chapovalov
72b827cfe1
Delete android helper to create default AudioProcessing
...
Users can use BuiltinAudioProcessingBuilder directly instead and thus depend on field trials more explicetly.
Bug: webrtc:369904700
Change-Id: I100e73785ebf9fbfcdd80152b6d094a93498d711
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367261
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43356}
2024-11-04 15:56:39 +00:00
Byoungchan Lee
5f324db7fa
Cleanup unused Obj-C VideoFrame constructors
...
These interfaces were deprecated 6 years ago and have not been
functional for a long time. It is safe to remove them.
Bug: None
Change-Id: Icbc85758551a96b8da10fbf16a1771c3641d1ac3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366500
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Auto-Submit: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43291}
2024-10-23 11:42:58 +00:00
Jeremy Leconte
2d75cd3664
Roll chromium_revision ccf648df91..aa68dfe997 (1365600:1366639)
...
Change log: ccf648df91..aa68dfe997ccf648df91..aa68dfe997006d78d70b..68128fa0f0f2790bfa32..6d08a23c990a905dcb6d..754803453c26dfb6e15c..53b28a32353ef5641e1f..b6f87cfcfbc8056c18ac..512db14abfhttps://boringssl.googlesource.com/boringssl.git/+log/fa0214602c..905c3903fd
* src/third_party/depot_tools: c109945e72..0ab52232fff114473071..283f1aa1ad829f51051c..975ef56df009b3d5fc5a..906334ac1d77f3acade4..a8e59d20745361e5909e..48c5df53f48c5814c8d2..3a202879c1ccf648df91..aa68dfe997https://webrtc-review.googlesource.com/c/src/+/365261
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43212}
2024-10-10 09:11:32 +00:00
Jeremy Leconte
e3819f6ac3
Fix java errors that used to be disabled.
...
This is https://chromium-review.googlesource.com/c/chromium/src/+/5901711 hitting WebRTC.
Change-Id: Ifedd949965a85b29364455a244edab1352f4fcea
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364940
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43193}
2024-10-08 14:53:45 +00:00
Jeremy Leconte
e466ae8184
[NotJavadoc] Avoid using /** for comments which aren't actually Javadoc.
...
Error surfaces when rolling https://chromium-review.googlesource.com/c/chromium/src/+/5901711 in WebRTC.
https://ci.chromium.org/ui/p/webrtc/builders/try/android_arm64_rel/78284/overview
Change-Id: Iad096c7c2cf9b1fabe9ce0abdb8f3da3fc8058d9
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364840
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43182}
2024-10-07 12:32:23 +00:00
Sergio Garcia Murillo
e17aad2c1d
Use rtc::Buffer for memory storage of EncodedImageBuffer
...
The goal is to be able to write the rtc::Buffer by another utility
(like rtc::ByteBufferWriter) and pass it into EncodedImageBuffer
without memcpy.
Bug: webrtc:42223344
Change-Id: Ieda55e77a36636e8cdff6ad6b7d078de0aeafec0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364243
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43179}
2024-10-07 11:06:04 +00:00
Jeremy Leconte
076eb6cdf2
Reland "Expose setHeaderExtensionsToNegotiate for iOS"
...
This reverts commit 1fe80229cc0181ed04f8e8d3ab14aade218fd25d.
Reason for revert: adding a RTC_OBJC_TYPE wrapper should fix the problem.
Original change's description:
> Revert "Expose setHeaderExtensionsToNegotiate for iOS"
>
> This reverts commit f88236066e65762f5543bf0ac141f23b76849126.
>
> Reason for revert: Thanks for the fix Karim ! Unfortunately this commit breaks some downstream projects. I'll work on a reland.
>
> Original change's description:
> > Expose setHeaderExtensionsToNegotiate for iOS
> >
> > Bug: webrtc:15766
> > Change-Id: I56ec97ab272c14b4b70f6c3d7a3daedde11738c4
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336100
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
> > Auto-Submit: Karim Ham <karim@karhm.com>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#43121}
>
> Bug: webrtc:15766
> Change-Id: Ie0ccf73bec192452e288b7421eb8a1ecdb0eda67
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364284
> Owners-Override: Jeremy Leconte <jleconte@webrtc.org>
> Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#43124}
Bug: webrtc:15766
Change-Id: I827bf53764b4725a731d8d9dddad1952b7eb9100
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364285
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Owners-Override: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43128}
2024-10-01 13:52:53 +00:00
Jeremy Leconte
1fe80229cc
Revert "Expose setHeaderExtensionsToNegotiate for iOS"
...
This reverts commit f88236066e65762f5543bf0ac141f23b76849126.
Reason for revert: Thanks for the fix Karim ! Unfortunately this commit breaks some downstream projects. I'll work on a reland.
Original change's description:
> Expose setHeaderExtensionsToNegotiate for iOS
>
> Bug: webrtc:15766
> Change-Id: I56ec97ab272c14b4b70f6c3d7a3daedde11738c4
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336100
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
> Auto-Submit: Karim Ham <karim@karhm.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#43121}
Bug: webrtc:15766
Change-Id: Ie0ccf73bec192452e288b7421eb8a1ecdb0eda67
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364284
Owners-Override: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#43124}
2024-10-01 08:49:13 +00:00
Karim H
f88236066e
Expose setHeaderExtensionsToNegotiate for iOS
...
Bug: webrtc:15766
Change-Id: I56ec97ab272c14b4b70f6c3d7a3daedde11738c4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336100
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Auto-Submit: Karim Ham <karim@karhm.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43121}
2024-10-01 08:13:23 +00:00
Mirko Bonadei
4ab100d4a6
Address UnnecessaryParentheses errorprone warnings
...
These prevent the roll of Chromium, see [1]. This CL is a follow-up of
https://webrtc-review.googlesource.com/c/src/+/363944 which didn't fix
all of the issues.
[1] - https://ci.chromium.org/ui/p/webrtc/builders/try/android_arm64_rel/78025/overview
Bug: None
Change-Id: I68c5ea605ed621dae2494378e74313ba0652c6a2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/363945
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43101}
2024-09-29 06:23:41 +00:00
Mirko Bonadei
f0a57db2e4
Address UnnecessaryParentheses errorprone warnings
...
These prevent the roll of Chromium, see [1].
[1] - https://ci.chromium.org/ui/p/webrtc/builders/try/android_arm_dbg/60719/overview
Bug: None
Change-Id: Ia98e0e5c390507eda512096080ec25597f723cef
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/363944
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43100}
2024-09-28 13:29:31 +00:00
Dor Hen
f3a33c0162
Prepend all RTCMacros.h includes/imports with the relative path from repo
...
root
Bug: webrtc:365299881
Change-Id: Id3adf3b4913da1e04534da232d03455a46c30e4c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362582
Commit-Queue: Dor Hen <dorhen@meta.com>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43028}
2024-09-17 08:45:53 +00:00
Raman Budny
de6225b2e2
Don't crash on failed EGL makeCurrent attempts
...
EglRenderer.renderFrameOnRenderThread:
suppress GLException thrown by failed EglBase14Impl::makeCurrent invocation.
Bug: webrtc:365957543
Change-Id: I947ad7d39ce01e3bbe9bc767d6427e4271f0c0cd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361020
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43027}
2024-09-17 08:21:38 +00:00
Danil Chapovalov
51a2bd130d
Allow sdk/objc owners to approve sdk/BUILD.gn
...
historically build rules for objc wrappers are kept outside of the objc folder
This rule allows objc owners to modify/approve build rules in addition to code changes
Bug: None
Change-Id: Ic5cf4afc4a710912124823bd797f43b39c72425f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361040
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43005}
2024-09-11 10:57:31 +00:00
Dor Hen
28ce65c6f9
Apply include-cleaner to api direct files
...
Bug: webrtc:42226242
Change-Id: Ia1e6021fc18a30b6da9b4a43118167b6ae173717
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360680
Commit-Queue: Dor Hen <dorhen@meta.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42993}
2024-09-10 08:29:26 +00:00
Danil Chapovalov
76aa330c24
Implement ObjCVideoEncoderFactory::QueryCodecSupport
...
To allow objc video encoders to support scalability modes
Bug: b/299588022
Change-Id: Id58f996b8c48c6688cccdc32caff6adb00370d5c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358580
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42985}
2024-09-09 13:56:04 +00:00
Jonas Oreland
3ad2c8d717
Make getNumObservers @VisibleForTesting so that it can be tested outside of package org.webrtc
...
Bug: webrtc:0
Change-Id: I66259bba8c724889df3ee22a8d6b9710a04ba671
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361863
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42973}
2024-09-06 12:36:59 +00:00
karllen.zheng@ringcentral.com
f92f39e618
Increase the default maximum jitter buffer size to 200 packets for Android.
...
Bug: webrtc:42220461
Change-Id: I6dadd8357173c79af0290199d9ed12a0e0417f4f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361673
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42970}
2024-09-06 11:21:34 +00:00
Jonas Oreland
70a59b6900
Flip default value of AndroidNetworkMonitor field trials
...
getAllNetworksFromCache => true (stop using old Android API)
requestVPN => true (is default in old api)
They have been enabled using field trial
for more than a year.
Bug: webrtc:13741
Change-Id: I288c4067193e95251f79d51e935dce555f6eb198
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361581
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42945}
2024-09-04 11:20:34 +00:00
Björn Terelius
e540648079
Remove trailing semicolons in Java
...
Bug: None
Change-Id: I79879691e47255dc2782ddcbfc80db777609a233
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361304
Commit-Queue: Zoé Lepaul <xalep@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42944}
2024-09-04 10:34:30 +00:00
Kári Tristan Helgason
682f7945d5
Deprecate bad signature for CreateSessionDescription.
...
Bug: webrtc:360909068
Change-Id: I8640dcf3cb89b1e07ea6745887d152fdeb7479c9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360020
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42932}
2024-09-03 12:14:54 +00:00
Bjorn Terelius
d34f3b8e04
Remove more self assignment in if-clause
...
More follow-up to https://webrtc-review.googlesource.com/c/src/+/360460
Bug: chromium:361594695
Change-Id: Ic4445829c4bd73fa4ea5132776bce8ca6b61d23a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361401
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42922}
2024-09-03 08:53:12 +00:00
Björn Terelius
a82eb4e2a5
Remove self assignment in if-clause
...
Follow-up to https://webrtc-review.googlesource.com/c/src/+/360460
Bug: chromium:361594695
Change-Id: Id41d964871aa1c074145901af275b0fe004b8e7b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361340
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42919}
2024-09-03 07:11:25 +00:00
Florent Castelli
8037fc6ffa
Migrate absl::optional to std::optional
...
Bug: webrtc:342905193
No-Try: True
Change-Id: Icc968be43b8830038ea9a1f5f604307220457807
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361021
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42911}
2024-09-02 12:16:47 +00:00
Abby Yeh
a9ececd103
Only mute microphone while audio_unit is started.
...
Bug: webrtc:15233
Change-Id: Id21f1a5b5642be6b511811f9b2f474152a313cb2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360081
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Abby Yeh <abbyyeh@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42884}
2024-08-29 16:45:00 +00:00
Danil Chapovalov
61a52146f5
In objc software video encoder wrappers expose functions to list supported scalability modes.
...
Bug: b/299588022
Change-Id: I41c06b1e4257d6ce47cadfec65e98f224c0f6be0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360682
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42883}
2024-08-29 14:49:48 +00:00
Danil Chapovalov
6bed21c811
Extend objc RTCVideoCodecInfo to include scalability modes
...
To match SdpVideoFormat c++ type
Bug: b/299588022
Change-Id: I67444cdb500b75fe43e3dfec47cc1333783897c2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358866
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42864}
2024-08-27 09:40:36 +00:00
Benjamin Williams
ab009c27b4
Refactor WebRTC self assignments in if clauses
...
This change refactors existing self-assignments within if clauses across
the WebRTC codebase.
*Why:*
- Bug Prevention: Assignments within conditionals are frequently
unintended errors, often mistaken for equality checks.
- Clearer Code: Separating assignments from conditionals improves code
readability and reduces the risk of misinterpretation.
Change-Id: I199dc26a35ceca109a2ac569b446811314dfdf0b
Bug: chromium:361594695
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360460
Reviewed-by: Chuck Hays <haysc@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42850}
2024-08-26 15:56:43 +00:00
Corby Hoback
fea60ef8e7
Fixed issue with missing network interfaces on iOS
...
Fixed issue with network interfaces due to a missing return value in the
"nw_path_enumerate_interfaces(...)" block. Exposed in iOS 18,
RTCNetworkMonitor::initWithObserver will only enumerate the first
interface, instead of all device interfaces
Bug: webrtc:359245764
Change-Id: Ifb9f28c33306c0096476a4afb0cdb4d734e87b2c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359541
Auto-Submit: Corby <corby.hoback@gmail.com>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42818}
2024-08-21 06:07:06 +00:00
Byoungchan Lee
e630a3d7ad
[iOS] Make RTCRtpTransceiver.setCodecPreferences failable and accept nil
...
Web Spec and C++ version of setCodecPreferences are failable, as they return
an RTCError (in C++) or throw an InvalidModificationError (in Web Spec).
However, current Objective-C version of setCodecPreferences is not failable,
so callers cannot know if the operation succeeded or not.
Also, the current Objective-C version does not accept nil, which is not
spec-compliant. (Web Spec says if codecs is an empty list, set
transceiver.PreferredCodecs to codecs and abort these steps.)
Bug: webrtc:42226103, webrtc:42226230
Change-Id: Ib90f3e5b45fc959eeb92f623cf50efcb458a7478
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/352400
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42789}
2024-08-16 08:45:39 +00:00
Andy Tamilo
b8841f8ebe
Fix race condition on ObjCNetworkMonitor::network_monitor_
...
There is a race condition on reading
`ObjCNetworkMonitor::_network_monitor` field.
The `ObjCNetworkMonitor::OnPathUpdate()` checks its nullability
on the org.webrtc.RTCDispatcherNetworkMonitor thread BEFORE the
`ObjCNetworkMonitor::Start()` assigns it on the network_monitor thread.
In addition, this field is neither atomic nor protected by mutex so its
last assigned value is not guaranteed to be visible to
another [reading] thread.
Bug: webrtc:355238623
Change-Id: I1a05215111cc873b7d4931824e18f281aebfb91f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357880
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42778}
2024-08-14 09:29:55 +00:00
Mirko Bonadei
1ceff3d442
Reland "Remove jni_zero type aliases in jni_generator_helper.h."
...
This is a reland of commit 6cb7b3a424455f82ad5df78a7295a3e5253b1445
Original change's description:
> Reland "Remove jni_zero type aliases in jni_generator_helper.h."
>
> This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343
>
> Original change's description:
> > Remove jni_zero type aliases in jni_generator_helper.h.
> >
> > This CL removes some type alias from
> > sdk/android/src/jni/jni_generator_helper.h and make sure all the
> > jni_zero types are referred to using the jni_zero:: namespace.
> >
> > The goal is to remove sdk/android/src/jni/jni_generator_helper.h
> > in future CLs.
> >
> > Bug: b/319078685, b/351773023
> > Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882
> > Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> > Reviewed-by: Jeremy Leconte <jleconte@google.com>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#42618}
>
> No-Presubmit: True
> Bug: b/319078685, b/351773023
> Change-Id: I605a726788ee84efdbdc9e75098b404cbd7c1f30
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358922
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42751}
No-Presubmit: True
Bug: b/319078685, b/351773023
Change-Id: I8294d8c5c49bc330d8158684a60fd4e6c88627d8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359320
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mohamed Heikal <mheikal@google.com>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42768}
2024-08-13 10:01:01 +00:00
Rayan Osseiran
47ef160030
Revert "Reland "Remove jni_zero type aliases in jni_generator_helper.h.""
...
This reverts commit 6cb7b3a424455f82ad5df78a7295a3e5253b1445.
Reason for revert: Breaks downstream project (possibly due to alias change)
Original change's description:
> Reland "Remove jni_zero type aliases in jni_generator_helper.h."
>
> This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343
>
> Original change's description:
> > Remove jni_zero type aliases in jni_generator_helper.h.
> >
> > This CL removes some type alias from
> > sdk/android/src/jni/jni_generator_helper.h and make sure all the
> > jni_zero types are referred to using the jni_zero:: namespace.
> >
> > The goal is to remove sdk/android/src/jni/jni_generator_helper.h
> > in future CLs.
> >
> > Bug: b/319078685, b/351773023
> > Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882
> > Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> > Reviewed-by: Jeremy Leconte <jleconte@google.com>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#42618}
>
> No-Presubmit: True
> Bug: b/319078685, b/351773023
> Change-Id: I605a726788ee84efdbdc9e75098b404cbd7c1f30
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358922
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42751}
Bug: b/319078685, b/351773023
Change-Id: Ia9d7ab4ef667c68d2ae5c96318e8126c635a1519
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359000
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Rayan Osseiran <rayano@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42755}
2024-08-09 17:24:56 +00:00
Mirko Bonadei
6cb7b3a424
Reland "Remove jni_zero type aliases in jni_generator_helper.h."
...
This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343
Original change's description:
> Remove jni_zero type aliases in jni_generator_helper.h.
>
> This CL removes some type alias from
> sdk/android/src/jni/jni_generator_helper.h and make sure all the
> jni_zero types are referred to using the jni_zero:: namespace.
>
> The goal is to remove sdk/android/src/jni/jni_generator_helper.h
> in future CLs.
>
> Bug: b/319078685, b/351773023
> Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Reviewed-by: Jeremy Leconte <jleconte@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42618}
No-Presubmit: True
Bug: b/319078685, b/351773023
Change-Id: I605a726788ee84efdbdc9e75098b404cbd7c1f30
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358922
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42751}
2024-08-09 11:35:32 +00:00
Abby Yeh
cae0aeb2b6
Implement MuteMicrophone to enable muted speech listener on iOS 15 and 16.
...
Bug: webrtc:15233
Change-Id: I73e553f0c0a2258941d75b35d2475168c99ceba2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358723
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Abby Yeh <abbyyeh@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42747}
2024-08-08 12:44:10 +00:00
Ranveer Aggarwal
c7e2568457
Optionally overwrite instead of queueing render updates.
...
Here, we overwrite the pending frames per renderer.
Bug: webrtc:351858995
Change-Id: I070219aec4e7be5f2b0c9f2371fe2c99af3e3920
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358760
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Fabian Bergmark <fabianbergmark@google.com>
Commit-Queue: Zoé Lepaul <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42741}
2024-08-07 13:36:39 +00:00
Jeremy Leconte
d02a216026
Revert "Reland "Add a dependancy on //third_party/jni_zero:jni_zero_java""
...
This reverts commit e19a9b37ce477f867524dfb802cca556630a7fac.
Reason for revert: break downstream
Original change's description:
> Reland "Add a dependancy on //third_party/jni_zero:jni_zero_java"
>
> This is a reland of commit 5ccec98826adc84bdb4c8177580a6f23074d8058
>
> Original change's description:
> > Add a dependancy on //third_party/jni_zero:jni_zero_java
> >
> > JniZero's native side expects JniZero's java side to exist, add a
> > dependancy on //third_party/jni_zero:jni_zero_java from
> > sdk/android:base_java.
> >
> > Bug: webrtc:353174456
> > Change-Id: I9240eab3da78efd394e4ee581cf71fd41976eb48
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357200
> > Commit-Queue: Mohamed Heikal <mheikal@google.com>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Auto-Submit: Mohamed Heikal <mheikal@google.com>
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#42639}
>
> Bug: webrtc:353174456, b/325408567
> Change-Id: Ib51939cc6494e867e8018c7d163c85f36b80199b
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358260
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42709}
Bug: webrtc:353174456, b/325408567
Change-Id: I2eb497d8a308485142f6e197e8e41928e2ae6f25
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358280
Auto-Submit: Jeremy Leconte <jleconte@google.com>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Owners-Override: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#42710}
2024-08-01 09:30:27 +00:00
Mohamed
e19a9b37ce
Reland "Add a dependancy on //third_party/jni_zero:jni_zero_java"
...
This is a reland of commit 5ccec98826adc84bdb4c8177580a6f23074d8058
Original change's description:
> Add a dependancy on //third_party/jni_zero:jni_zero_java
>
> JniZero's native side expects JniZero's java side to exist, add a
> dependancy on //third_party/jni_zero:jni_zero_java from
> sdk/android:base_java.
>
> Bug: webrtc:353174456
> Change-Id: I9240eab3da78efd394e4ee581cf71fd41976eb48
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357200
> Commit-Queue: Mohamed Heikal <mheikal@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Auto-Submit: Mohamed Heikal <mheikal@google.com>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42639}
Bug: webrtc:353174456, b/325408567
Change-Id: Ib51939cc6494e867e8018c7d163c85f36b80199b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358260
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42709}
2024-08-01 09:00:04 +00:00
Mirko Bonadei
6b0de3f05b
Revert "Replace instead of queueing render updates."
...
This reverts commit 76960dfdb638b5bee2f08f41236ea2a25a6aab08.
Reason for revert: Speculative rollback (performance).
Original change's description:
> Replace instead of queueing render updates.
>
> Bug: webrtc:351858995
> Change-Id: I6c07d71afeae886ff6a20509bca5b5c65f131e41
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356800
> Reviewed-by: Fabian Bergmark <fabianbergmark@google.com>
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Commit-Queue: Ranveer Aggarwal <ranvr@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42617}
Bug: webrtc:351858995, b/355009708
Change-Id: I0552238732a940fcb06543960fc563b9bd7ca6f1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358140
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42696}
2024-07-30 16:49:57 +00:00
Abby Yeh
35f10a083d
Add listener to detect mute speech event, and callback function to handle the event
...
Bug: webrtc:343347289
Change-Id: I56b1433b0dd8220f95d7d72fb04b4f92fe4a905e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355761
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Abby Yeh <abbyyeh@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42667}
2024-07-23 13:01:39 +00:00
Sergio Garcia Murillo
45e5e385f3
Use ArrayView on H264 bitstream parsing
...
No-Try: true
Bug: webrtc:42225170
Change-Id: I4682f400054fee5c86ea24bebf6d703fb90074da
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/354722
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42650}
2024-07-19 08:16:11 +00:00
Mirko Bonadei
83671efdb9
Revert "Add a dependancy on //third_party/jni_zero:jni_zero_java"
...
This reverts commit 5ccec98826adc84bdb4c8177580a6f23074d8058.
Reason for revert: Breaks downstream project.
Original change's description:
> Add a dependancy on //third_party/jni_zero:jni_zero_java
>
> JniZero's native side expects JniZero's java side to exist, add a
> dependancy on //third_party/jni_zero:jni_zero_java from
> sdk/android:base_java.
>
> Bug: webrtc:353174456
> Change-Id: I9240eab3da78efd394e4ee581cf71fd41976eb48
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357200
> Commit-Queue: Mohamed Heikal <mheikal@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Auto-Submit: Mohamed Heikal <mheikal@google.com>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42639}
Bug: webrtc:353174456
Change-Id: I58bdb9e1797f6d2f716225abc5c337cd90290159
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357460
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Mohamed Heikal <mheikal@google.com>
Cr-Commit-Position: refs/heads/main@{#42647}
2024-07-18 15:27:33 +00:00
Mohamed
5ccec98826
Add a dependancy on //third_party/jni_zero:jni_zero_java
...
JniZero's native side expects JniZero's java side to exist, add a
dependancy on //third_party/jni_zero:jni_zero_java from
sdk/android:base_java.
Bug: webrtc:353174456
Change-Id: I9240eab3da78efd394e4ee581cf71fd41976eb48
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357200
Commit-Queue: Mohamed Heikal <mheikal@google.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Mohamed Heikal <mheikal@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42639}
2024-07-15 20:08:47 +00:00
Jeremy Leconte
4643fb7e01
Revert "Reland "Remove jni_zero type aliases in jni_generator_helper.h.""
...
This reverts commit 4f3d660f4f28a1dcdb577ab89d57830083ac883a.
Reason for revert: downstream still broken
Original change's description:
> Reland "Remove jni_zero type aliases in jni_generator_helper.h."
>
> This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343
>
> Original change's description:
> > Remove jni_zero type aliases in jni_generator_helper.h.
> >
> > This CL removes some type alias from
> > sdk/android/src/jni/jni_generator_helper.h and make sure all the
> > jni_zero types are referred to using the jni_zero:: namespace.
> >
> > The goal is to remove sdk/android/src/jni/jni_generator_helper.h
> > in future CLs.
> >
> > Bug: b/319078685, b/351773023
> > Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882
> > Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> > Reviewed-by: Jeremy Leconte <jleconte@google.com>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#42618}
>
> Bug: b/319078685, b/351773023
> Change-Id: I604b0842d220d76c36b73d2d49bcefe0ee7ae14f
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356903
> Commit-Queue: Jeremy Leconte <jleconte@google.com>
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42626}
Bug: b/319078685, b/351773023
Change-Id: I9429789e44c82735305b2d0d90cbaa4891d79622
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357041
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Owners-Override: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#42627}
2024-07-12 08:36:45 +00:00
Mirko Bonadei
4f3d660f4f
Reland "Remove jni_zero type aliases in jni_generator_helper.h."
...
This is a reland of commit 9fcaa034bc032da9de5d6fcdd45528169f44d343
Original change's description:
> Remove jni_zero type aliases in jni_generator_helper.h.
>
> This CL removes some type alias from
> sdk/android/src/jni/jni_generator_helper.h and make sure all the
> jni_zero types are referred to using the jni_zero:: namespace.
>
> The goal is to remove sdk/android/src/jni/jni_generator_helper.h
> in future CLs.
>
> Bug: b/319078685, b/351773023
> Change-Id: Ief60fce3e8f301f09ac5392d143aa5a82a445bcb
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356882
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Reviewed-by: Jeremy Leconte <jleconte@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42618}
Bug: b/319078685, b/351773023
Change-Id: I604b0842d220d76c36b73d2d49bcefe0ee7ae14f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356903
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42626}
2024-07-12 08:07:37 +00:00
