42898 Commits

Author SHA1 Message Date
Mirko Bonadei
8c38eed63c Revert "Add google-java-format to DEPS."
This reverts commit a75459d122c0ce8bec137107159e7d85ba57eff8.

Reason for revert: Currently the formatter uses AOSP format.
It needs to be confgurable.

Original change's description:
> Add google-java-format to DEPS.
>
> Bug: None
> Change-Id: Ib7e586e76ac91880930b9c9170a11e9daba6df64
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340060
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
> Commit-Queue: Zoé Lepaul <xalep@webrtc.org>
> Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41761}

Bug: b/325924007
Change-Id: If11bfdb836bf42efedb7799ca16c13d431115dd9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340100
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41766}
2024-02-20 09:10:19 +00:00
webrtc-version-updater
5437df35c6 Update WebRTC code version (2024-02-20T04:03:59).
Bug: None
Change-Id: I423714e777e48ab7e7db8a95ada2564f525757d2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340009
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41765}
2024-02-20 05:24:28 +00:00
Jianjun Zhu
dba3fd6c1b Correctly mark video frame type for FU packets.
Mark FU packets with type between kBlaWLp and kRsvIrapVcl23 as key frames.
This behavior aligns with AP and single NALU.

Bug: webrtc:13485
Change-Id: I51762e89ebb4829b50524d9f5476f2d5d9c093f7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338860
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41764}
2024-02-19 16:20:46 +00:00
Danil Chapovalov
0355f455a4 Use Environment propagated through android sdk
This way VP8Decoder and DecoderFallback would use propagated instead of global field trials.

Bug: webrtc:15791, webrtc:10335
Change-Id: I5ad5fae38f5b9379bc6376334562c154fbc56e39
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340040
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41763}
2024-02-19 15:54:39 +00:00
Tommi
bde80e3c0e Deprecate Candidate::set_id(), offer generate_id() instead
Bug: none
Change-Id: I68df28a24446667c1bcde04120795fce54252feb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339940
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41762}
2024-02-19 15:01:02 +00:00
Mirko Bonadei
a75459d122 Add google-java-format to DEPS.
Bug: None
Change-Id: Ib7e586e76ac91880930b9c9170a11e9daba6df64
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340060
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Commit-Queue: Zoé Lepaul <xalep@webrtc.org>
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41761}
2024-02-19 14:05:26 +00:00
Danil Chapovalov
d99da2c5f8 Allow to use propagated field trials in VideoDecoderSoftwareFallbackWrapper
Bug: webrtc:15791
Change-Id: Ida5e1c6f46e5aa9530af441b345abb80d2a5349e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339862
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41760}
2024-02-19 12:55:31 +00:00
Victor Boivie
2bfb5db548 dcsctp: Update zero checksum option to v-06 draft
https://datatracker.ietf.org/doc/draft-ietf-tsvwg-sctp-zero-checksum/06/

The previous implementation was for version 00, and since then changes
have been made. The chunk that is used to negotiate this capability has
now grown to include an additional property - the sender's alternate
error detection method.

Bug: webrtc:14997
Change-Id: I78043d187b79f40bbadbcba02eae6eedf54f30f9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336380
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41759}
2024-02-19 10:25:17 +00:00
webrtc-version-updater
c49da7a58b Update WebRTC code version (2024-02-18T04:06:34).
Bug: None
Change-Id: I870b164cf955e97a1d999f0cdad393ad5a2425c3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339925
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41758}
2024-02-18 05:25:06 +00:00
Tommi
0ba663c245 Change a few uses of Candidate::type() to Candidate::type_name()
Switch to type_name() for things like logging since `type()` will
change to returning an enumeration value.

The functional change that this has is that log statements and
Connection::ToString() (used for logging) will contain "host"
instead of "local" and "srflx" instead of "stun".

Bug: webrtc:15846
Change-Id: I35c50d026e4578a25d51765d59c6f2e01b850c94
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339180
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41757}
2024-02-17 18:41:38 +00:00
webrtc-version-updater
600503ae26 Update WebRTC code version (2024-02-17T04:11:12).
Bug: None
Change-Id: I0c27fb3042201bfc36f9be003515f79303aa0d63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339890
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41756}
2024-02-17 05:55:29 +00:00
Sergey Silkin
052bc3af92 Field trial to control SVC frame dropping mode in libvpx VP9 encoder
Example: "WebRTC-LibvpxVp9Encoder-SvcFrameDropConfig/Enabled,layer_drop_mode:1,max_consec_drop:7/"

It is only possible to enable LAYER_DROP (layer_drop_mode=1) for now. All other modes are ignored. Max consecutive frame drops (max_consec_drop) value from the field is always applied if the field trial is enabled.

LAYER_DROP requires flexible mode (is_flexible_mode_=true) which can be enabled by means of WebRTC-Vp9InterLayerPred: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/media/engine/webrtc_video_engine.cc;l=976

Bug: webrtc:15827, b/320629637
Change-Id: I9c4d4838b11547e608d863198b109cb1485902d6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/335041
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41755}
2024-02-16 17:34:52 +00:00
Jeremy Leconte
54d9cd002c Update iOS dimension to have more machines available.
https://chrome-swarming.appspot.com/botlist?c=id&c=task&c=os&c=status&d=asc&f=pool%3Achrome.tests&f=device_status%3Aavailable&f=os%3AiOS-16.7.1&k=os&s=id

Change-Id: I418dcb61d7661ef98122cdea6c691c4994e6afab
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339866
Reviewed-by: Manashi Sarkar <manashi@google.com>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#41754}
2024-02-16 17:31:52 +00:00
Jeremy Leconte
8bfc3e99a6 Fix variant name for iOS simulator 17.4.
Change-Id: I66b00b360d8eace858046d73f40c7eac57375e7d
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339843
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#41753}
2024-02-16 11:01:54 +00:00
Mirko Bonadei
85b405b798 Switch all Linux tasks from Focal to Jammy (except *san).
Bug: b/325441006
Change-Id: I761a84b8e3570d107b82280c1c7870b982bbc3f0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339865
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Mirko Bonadei <mbonadei@google.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41752}
2024-02-16 09:53:34 +00:00
Mirko Bonadei
1b52d5641e Fix generate_buildbot_json and switch to ios_runtime_cache_17_4.
When running it, even without changes at HEAD I got:

```
KeyError: 'ios_runtime_cache_17_0'
```

Bug: b/325441006
Change-Id: I7ea236ccc1f7439d7750208260b01d7636db4ae5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339842
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#41751}
2024-02-16 08:45:30 +00:00
webrtc-version-updater
6596134fad Update WebRTC code version (2024-02-16T04:14:44).
Bug: None
Change-Id: I736a684aae87f4b745520787cf2891787250061c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339829
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41750}
2024-02-16 05:48:38 +00:00
Sunggook Chue
62cbdcea05 Allow getDisplayMedia capture HDR monitor.
The code uses IDXGIOutput1::DuplicateOutput for screen capture and
it allows only DXGI_FORMAT_B8G8R8A8_UNORM texture format, which
works on most monitor cases except HDR monitor.

HDR mointor returns type of DXGI_FORMAT_R16G16B16A16_FLOAT.

These two types of DXGI_FORMAT_B8G8R8A8_UNORM and
DXGI_FORMAT_R16G16B16A16_FLOAT are all formats that DuplicateOutput
returns based on Windows OS team.

The fix is to add allowed format of DXGI_FORMAT_R16G16B16A16_FLOAT.

Manually repro the issue and validated the fix.

Bug: chromium:40787684
Change-Id: I0a7be38b14a06261d631d2db172f12725edbbf1f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339621
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/main@{#41749}
2024-02-15 23:15:31 +00:00
Jianjun Zhu
7e0bd7aaaf Reland "Add HEVC support for h264_packet_buffer."
This is a reland of commit a2655449ee310704ee2053fd6d43a5ab7002b755

This CL guards H265 header behind RTC_ENABLE_H265.

Original change's description:
> Add HEVC support for h264_packet_buffer.
>
> Renamed to h26x_packet_buffer as it also supports HEVC now. For HEVC,
> start code is added by depacktizer, and remote endpoint must send
> sequence and picture information in-band.
>
> Co-authored-by: Qiujiao Wu <qiujiao.wu@intel.com>
>
> Bug: webrtc:13485
> Change-Id: I321cb223357d8d15da95cec80ec0c3a43c26734e
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333863
> Reviewed-by: Philip Eliasson <philipel@webrtc.org>
> Commit-Queue: Philip Eliasson <philipel@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41739}

Bug: webrtc:13485
Change-Id: I478e0ab88adcef34100670a90b12251ab3c9b623
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339822
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41748}
2024-02-15 16:38:27 +00:00
Danil Chapovalov
46364195d3 Propagate webrtc::Environment through MultiplexDecoderAdapter
Bug: webrtc:15791
Change-Id: Ibe8fdc45722409b2cf6608ea6d8da2ea7e3472c2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338621
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41747}
2024-02-15 16:03:55 +00:00
Philipp Hancke
ce1271af8f Do not guard AV1 SVC tests on VP9 define
BUG=None

Change-Id: Id10bb49c266319eb387f0dd2e9c4327b8a5eb944
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339800
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#41746}
2024-02-15 15:25:05 +00:00
Danil Chapovalov
2eee89e904 Cleanup webrtc::Environment propagation through java wrappers
Force and thus guarantee VideoDecoder created through java wrappers get access to the webrtc::Environment

Bug: webrtc:15791
Change-Id: I3f145937c0b914c8e34b24e1ecc55da756551069
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338441
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41745}
2024-02-15 13:33:48 +00:00
Per K
45242adc4c Add field trial property alloc_current_bwe_limit
The new field trial can be used to ensure probes are limited by the current BWE and does not automatically send a probe at the new max rate.

Also removes unused
  FieldTrialFlag allocation_allow_further_probing;
  FieldTrialParameter<DataRate> allocation_probe_max;



Bug: webrtc:14928
Change-Id: I0d5c350c0231ca0600033ad8211dca0574104201
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339840
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Diep Bui <diepbp@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41744}
2024-02-15 12:47:16 +00:00
Harald Alvestrand
6a8236617d Reject SDP with duplicate msid lines
This is an obscure error that was found by a fuzzer.

Bug: webrtc:15845
Change-Id: I3509fa264a3af6f0f5e8e6b75a8b7dcd8fb0da1a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339681
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41743}
2024-02-15 11:06:41 +00:00
Mirko Bonadei
611f21d0d4 Revert "Add HEVC support for h264_packet_buffer."
This reverts commit a2655449ee310704ee2053fd6d43a5ab7002b755.

Reason for revert: H265 tests must be hidden behind RTC_ENABLE_H265.

Original change's description:
> Add HEVC support for h264_packet_buffer.
>
> Renamed to h26x_packet_buffer as it also supports HEVC now. For HEVC,
> start code is added by depacktizer, and remote endpoint must send
> sequence and picture information in-band.
>
> Co-authored-by: Qiujiao Wu <qiujiao.wu@intel.com>
>
> Bug: webrtc:13485
> Change-Id: I321cb223357d8d15da95cec80ec0c3a43c26734e
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333863
> Reviewed-by: Philip Eliasson <philipel@webrtc.org>
> Commit-Queue: Philip Eliasson <philipel@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41739}

Bug: webrtc:13485
Change-Id: I64660d73ef0d790b25622ce882aab3db63facf26
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339861
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41742}
2024-02-15 10:55:33 +00:00
Danil Chapovalov
b158537a4f Allow to propagate field trials into Vp8 Decoder
Bug: webrtc:15791
Change-Id: I0cd279006924c7a4859697b26a2271c3dc63ea6d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/337400
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41741}
2024-02-15 10:36:05 +00:00
Tommi
f7b22c66ff Add Candidate::type_name()
Candidate::type() is currently how the name of the type is fetched,
but that getter returns a non-standard type name.

Instead, I'm adding a new getter, type_name(), will follow up with
updating dependent code that needs the string, to use type_name (and
adapt to potential dependency on "local" or "stun") and then switch
type() to be enum based.

Also adding a test file for Candidate with a couple of basic tests to
start with.

Bug: webrtc:15846
Change-Id: I9b78b2405a9f962a3c07eaa8e72a79854c6f5ceb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339660
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41740}
2024-02-15 10:26:28 +00:00
Jianjun Zhu
a2655449ee Add HEVC support for h264_packet_buffer.
Renamed to h26x_packet_buffer as it also supports HEVC now. For HEVC,
start code is added by depacktizer, and remote endpoint must send
sequence and picture information in-band.

Co-authored-by: Qiujiao Wu <qiujiao.wu@intel.com>

Bug: webrtc:13485
Change-Id: I321cb223357d8d15da95cec80ec0c3a43c26734e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333863
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41739}
2024-02-15 09:54:06 +00:00
Dor Hen
4efc830e53 Provide test output path with OutputPathWithRandomDirectory 1/n
First commit in a series of commits to wire up the test output path utility that adds a random directory in the path, for problematic tests that run in concurrent execution environments.

Bug: webrtc:15833
Change-Id: I5e5b3940007be773d77dbbfc953efa810e4e3ea9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339522
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41738}
2024-02-15 07:35:00 +00:00
webrtc-version-updater
3e9e4e7c9c Update WebRTC code version (2024-02-15T04:07:08).
Bug: None
Change-Id: I0ee54527ed5e6d8c40249c0a7c0fed159a60287c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339720
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41737}
2024-02-15 05:24:12 +00:00
henrika
414c94290a Reland "Extends WebRTC logs for software encoder fallback"
This is a reland of commit 050ffefd854f8a57071992238723259e9ae0d85a

Original change's description:
> Extends WebRTC logs for software encoder fallback
>
> This CL extends logging related to HW->SW fallbacks on the encoder
> side in WebRTC. The goal is to make it easier to track down the
> different steps taken when setting up the video encoder and why/when
> HW encoding fails.
>
> Current logs are added on several lines which makes regexp searching
> difficult. This CL adds all related information on one line instead.
>
> Three new search tags are also added VSE (VideoStreamEncoder), VESFW
> (VideoEncoderSoftwareFallbackWrapper) and SEA (SimulcastEncoderAdapter). The idea is to allow searching for the tags to see correlated logs.
>
> It has been verified that these added logs also show up in WebRTC
> logs in Meet.
>
> Logs from the GPU process are not included due to the sandboxed
> nature which makes it much more complex to add to the native
> WebRTC log. I think that these simple logs will provide value as is.
>
> Example: https://gist.github.com/henrik-and/41946f7f0b10774241bd14d7687f770b
>
> Bug: b/322132132
> Change-Id: Iec58c9741a9dd6bab3236a88e9a6e45440f5d980
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339260
> Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41733}

NOTRY=true

Bug: b/322132132
Change-Id: I25dd34b9ba59ea8502e47b4c89cd111430636e08
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339680
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41736}
2024-02-14 17:15:29 +00:00
Mirko Bonadei
23c32da48a Revert "Extends WebRTC logs for software encoder fallback"
This reverts commit 050ffefd854f8a57071992238723259e9ae0d85a.

Reason for revert: Breaks downstream project.

Original change's description:
> Extends WebRTC logs for software encoder fallback
>
> This CL extends logging related to HW->SW fallbacks on the encoder
> side in WebRTC. The goal is to make it easier to track down the
> different steps taken when setting up the video encoder and why/when
> HW encoding fails.
>
> Current logs are added on several lines which makes regexp searching
> difficult. This CL adds all related information on one line instead.
>
> Three new search tags are also added VSE (VideoStreamEncoder), VESFW
> (VideoEncoderSoftwareFallbackWrapper) and SEA (SimulcastEncoderAdapter). The idea is to allow searching for the tags to see correlated logs.
>
> It has been verified that these added logs also show up in WebRTC
> logs in Meet.
>
> Logs from the GPU process are not included due to the sandboxed
> nature which makes it much more complex to add to the native
> WebRTC log. I think that these simple logs will provide value as is.
>
> Example: https://gist.github.com/henrik-and/41946f7f0b10774241bd14d7687f770b
>
> Bug: b/322132132
> Change-Id: Iec58c9741a9dd6bab3236a88e9a6e45440f5d980
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339260
> Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41733}

Bug: b/322132132
Change-Id: I24d0a4e71a43ac192485f1af208563a51d919865
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339661
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41735}
2024-02-14 13:45:39 +00:00
Johannes Kron
7fc9535d8b Add trace event with qp value to VideoStreamEncoder
Bug: None
Change-Id: I11c88a948b1940cac91ac6132e44107db0c5c46a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338980
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41734}
2024-02-14 13:02:24 +00:00
henrika
050ffefd85 Extends WebRTC logs for software encoder fallback
This CL extends logging related to HW->SW fallbacks on the encoder
side in WebRTC. The goal is to make it easier to track down the
different steps taken when setting up the video encoder and why/when
HW encoding fails.

Current logs are added on several lines which makes regexp searching
difficult. This CL adds all related information on one line instead.

Three new search tags are also added VSE (VideoStreamEncoder), VESFW
(VideoEncoderSoftwareFallbackWrapper) and SEA (SimulcastEncoderAdapter). The idea is to allow searching for the tags to see correlated logs.

It has been verified that these added logs also show up in WebRTC
logs in Meet.

Logs from the GPU process are not included due to the sandboxed
nature which makes it much more complex to add to the native
WebRTC log. I think that these simple logs will provide value as is.

Example: https://gist.github.com/henrik-and/41946f7f0b10774241bd14d7687f770b

Bug: b/322132132
Change-Id: Iec58c9741a9dd6bab3236a88e9a6e45440f5d980
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339260
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41733}
2024-02-14 12:29:55 +00:00
Philipp Hancke
7a6a8ebf23 sdp: backfill default codec parameters for H265
with default values for level-id and tx-mode defined in
  https://datatracker.ietf.org/doc/html/draft-aboba-avtcore-hevc-webrtc

BUG=webrtc:15703

Change-Id: I07d77d69c6376313e693e8ddda1cc0135033549a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338620
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#41732}
2024-02-14 11:20:53 +00:00
Sergey Silkin
2bd4129e91 Set scoped field trials in encode/decode test
Since not all codecs read field trials from the environment yet.

Bug: webrtc:14852
Change-Id: Ia2477c41d09dabf91f47c59eb3139d6d6a711548
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339380
Auto-Submit: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41731}
2024-02-14 09:13:58 +00:00
Dor Hen
94c3328b61 Provide unified solution for dir name randomization in tests
This approach actually wraps the unique identifier generation into the
function that provides the output path for a test.
This way we don't need to add `CreateRandomUuid()` everywhere that we
have `test::OutputPath` and instead just rename to
`test::OutputPathRandomDir`

Bug: webrtc:15833
Change-Id: Ic9b69b5b599727f07b2906569a84a40edeecd1a0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338645
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41730}
2024-02-14 07:12:03 +00:00
webrtc-version-updater
495e23e60f Update WebRTC code version (2024-02-14T04:12:34).
Bug: None
Change-Id: I7c64b17a0a0a05e24b11fe19af8f1954f62837d2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339643
Bot-Commit: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com <webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41729}
2024-02-14 05:46:25 +00:00
chromium-webrtc-autoroll
d99fb2f6ff Roll chromium_revision 4906525a63..a4279f2842 (1259697:1259805)
Change log: 4906525a63..a4279f2842
Full diff: 4906525a63..a4279f2842

Changed dependencies
* src/build: a301b4f2a6..a3566ffdee
* src/ios: f3dc4ca279..37d33be47e
* src/testing: a87036f3ca..a7e90605df
* src/third_party: 0c4c3fa25c..121de111a9
* src/third_party/androidx: f2NTXeY1WbJ_lRwpAyZWORm3Ho9qRx28GRayw1ol5x8C..W2mpTbVe6yo3_GJiaoEVjCGnpicqsSrxcRMEADDJzMMC
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/99cae5876c..c712e9cc34
* src/third_party/kotlin_stdlib: 7f5xFu_YQrbg_vacQ5mMcUFIkMPpvM_mQ8QERRKYBvUC..-uFeIws_FQzyqmgZlGL37ooRLAD8mwClD33O8rZwnTsC
* src/third_party/r8: szZgxadOOC_Yfq3DhP5R0WR2LMRiVMVrt71WNfL5taIC..tp4vVuXzmyHJxDFlwxDb7RYZLLEufc3EnGTyOTCTNkgC
* src/tools: 8b818c04f0..2b9f1d699f
DEPS diff: 4906525a63..a4279f2842/DEPS

No update to Clang.

BUG=None

Change-Id: I289ba81e7a357b058915ab8557ee50a89c707ef2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339580
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41728}
2024-02-13 15:00:54 +00:00
Diep Bui
14d7d2d845 Add an option to allow pacing at loss based estimate when network bandwidth is loss limited.
Add a small clean up in LossBasedBandwidthEstimatorV2ReadyForUse since IsReady() includes IsEnabled().

Bug: webrtc:12707
Change-Id: I20dfeb2ab31e7724041f89af9f312211a3ae3d23
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339521
Commit-Queue: Diep Bui <diepbp@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41727}
2024-02-13 11:54:06 +00:00
chromium-webrtc-autoroll
e5cd905b9e Roll chromium_revision 7d6bb2c760..4906525a63 (1259552:1259697)
Change log: 7d6bb2c760..4906525a63
Full diff: 7d6bb2c760..4906525a63

Changed dependencies
* src/base: 6c5ef966eb..fd5eca261f
* src/build: fcd7410768..a301b4f2a6
* src/testing: 13076206a3..a87036f3ca
* src/third_party: a043caba1c..0c4c3fa25c
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/d80f7d1ae4..99cae5876c
* src/tools: 6d4102387b..8b818c04f0
DEPS diff: 7d6bb2c760..4906525a63/DEPS

No update to Clang.

BUG=None

Change-Id: I5da5f4efa5c7b441752d8605f8256b33b85e0413
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339500
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41726}
2024-02-13 09:12:00 +00:00
Henrik Boström
1e7a6f3b6a Revert "Make setCodecPreferences only look at receive codecs"
This reverts commit 1cce1d7ddcbde3a3648007b5a131bd0c2638724b.

Reason for revert: Breaks WPTs

Original change's description:
> Make setCodecPreferences only look at receive codecs
>
> which is what is noted in JSEP:
>   https://www.rfc-editor.org/rfc/rfc8829.html#name-setcodecpreferences
>
> Some W3C spec modifications are required since the W3C specification
> currently takes into account send codecs as well.
>
> Spec issue:
>   https://github.com/w3c/webrtc-pc/issues/2888
> Spec PR:
>  https://github.com/w3c/webrtc-pc/pull/2926
>
> setCodecPreferences continues to modify the codecs in an offer.
>
> Also rename RtpSender::SetCodecPreferences to RtpSender::SetSendCodecs for consistent semantics.
>
> BUG=webrtc:15396
>
> Change-Id: I1e8fbe77cb2670575578a777ed1336567a1e4031
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/328780
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Philipp Hancke <phancke@microsoft.com>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41719}

Bug: webrtc:15396
Change-Id: I7b545e91f820c3affc39841c6e93939eac75c363
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339520
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Owners-Override: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Auto-Submit: Henrik Boström <hbos@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41725}
2024-02-13 08:24:45 +00:00
chromium-webrtc-autoroll
e28e60c740 Roll chromium_revision 821d081141..7d6bb2c760 (1259390:1259552)
Change log: 821d081141..7d6bb2c760
Full diff: 821d081141..7d6bb2c760

Changed dependencies
* reclient_version: re_client_version:0.130.0.546556b-gomaip..re_client_version:0.131.1.784ddbb-gomaip
* src/base: e39c682e38..6c5ef966eb
* src/build: f109cb48d1..fcd7410768
* src/buildtools/reclient: re_client_version:0.130.0.546556b-gomaip..re_client_version:0.131.1.784ddbb-gomaip
* src/ios: 650af61823..f3dc4ca279
* src/testing: 4a09588758..13076206a3
* src/third_party: 0ca8b9cff3..a043caba1c
* src/third_party/androidx: rDm_kXJ4QiOAfQYXTO_2ZWlg_5HVE3VWUkkps3x0O3cC..f2NTXeY1WbJ_lRwpAyZWORm3Ho9qRx28GRayw1ol5x8C
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4495ac19ba..d80f7d1ae4
* src/third_party/depot_tools: 6c92a665e1..f76550541c
* src/third_party/perfetto: 7fae70ec1e..e01c38d714
* src/tools: 26754ff27f..6d4102387b
DEPS diff: 821d081141..7d6bb2c760/DEPS

No update to Clang.

BUG=None

Change-Id: I2592dbba61e434abd5b51a5ee3acd526f89ff478
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339460
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41724}
2024-02-13 00:43:39 +00:00
chromium-webrtc-autoroll
764b8ae655 Roll chromium_revision 3455025028..821d081141 (1259277:1259390)
Change log: 3455025028..821d081141
Full diff: 3455025028..821d081141

Changed dependencies
* src/base: f65b89ddd8..e39c682e38
* src/third_party: 719cf4d0b4..0ca8b9cff3
* src/third_party/depot_tools: 2acd6f4c9d..6c92a665e1
* src/third_party/perfetto: 958abadb3d..7fae70ec1e
* src/tools: d9a4045620..26754ff27f
DEPS diff: 3455025028..821d081141/DEPS

No update to Clang.

BUG=None

Change-Id: If236e6b0eb18c824fa19ffb19a894bc5fad90810
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339420
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41723}
2024-02-12 20:42:51 +00:00
chromium-webrtc-autoroll
9a75ae1255 Roll chromium_revision f53e0380af..3455025028 (1259106:1259277)
Change log: f53e0380af..3455025028
Full diff: f53e0380af..3455025028

Changed dependencies
* src/base: a3c0545d76..f65b89ddd8
* src/build: 100a2e5828..f109cb48d1
* src/buildtools: f90248f2bf..f35a7d885a
* src/ios: 7d8367c78c..650af61823
* src/testing: 24fb660f29..4a09588758
* src/third_party: 513fca12d3..719cf4d0b4
* src/third_party/androidx: 0Jfh-EIa7YBsv86pah7juYpkhvYjTk-Og860SJavIM0C..rDm_kXJ4QiOAfQYXTO_2ZWlg_5HVE3VWUkkps3x0O3cC
* src/third_party/depot_tools: 32769fe939..2acd6f4c9d
* src/third_party/perfetto: 3d959a6b84..958abadb3d
* src/third_party/r8: Ms1b55b8kRNZqqskNs35JxAgZvqbtKGKDimgS_0LGz4C..szZgxadOOC_Yfq3DhP5R0WR2LMRiVMVrt71WNfL5taIC
* src/third_party/turbine: 7NPeRX_XAc2XOUX7V9moyIEyM8RjjPdAhRK-8DLzk_oC..s-hdujub30RR2mH9Qf7pHv6h9uNGEiYVs6W1VXWeEe8C
* src/tools: daa8c430f1..d9a4045620
DEPS diff: f53e0380af..3455025028/DEPS

No update to Clang.

BUG=None

Change-Id: I00dff0887ac6f00f20370d23565829a5d350ea19
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339400
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41722}
2024-02-12 18:52:13 +00:00
Tommi
521b8632b6 Change type of candidate type names from char[] to string_view
Bug: none
Change-Id: I57fcfd486bf4e2fb15288614b0e81f00b10e120a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/337443
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41721}
2024-02-12 15:14:02 +00:00
Philipp Hancke
e3fb8122aa Reland "Let port allocator create ice tie breaker"
This is a reland of commit 3f3f991c03bb4073a06da37c822daaa9deed9307

Original change's description:
> Let port allocator create ice tie breaker
>
> Moves the responsibility for creating the ICE tie breaker from the JSEP transport controller to the port allocator. This will allow a future change to separate the ICE tie breaker (which is sent over the network and hence known to the peer) from the "port allocator random" (that is used to seed the ICE candidate foundation crc32 checksum) as an implementation detail.
>
> BUG=webrtc:14626
>
> Change-Id: I3a9a0980238d6108b1b154f45de2975b08793b1c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/281660
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Philipp Hancke <phancke@microsoft.com>
> Cr-Commit-Position: refs/heads/main@{#41707}

Bug: webrtc:14626
Change-Id: Id3c8f257c5611958551bd66d7ce7a885bf8ba2f9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339320
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#41720}
2024-02-12 14:47:12 +00:00
Philipp Hancke
1cce1d7ddc Make setCodecPreferences only look at receive codecs
which is what is noted in JSEP:
  https://www.rfc-editor.org/rfc/rfc8829.html#name-setcodecpreferences

Some W3C spec modifications are required since the W3C specification
currently takes into account send codecs as well.

Spec issue:
  https://github.com/w3c/webrtc-pc/issues/2888
Spec PR:
 https://github.com/w3c/webrtc-pc/pull/2926

setCodecPreferences continues to modify the codecs in an offer.

Also rename RtpSender::SetCodecPreferences to RtpSender::SetSendCodecs for consistent semantics.

BUG=webrtc:15396

Change-Id: I1e8fbe77cb2670575578a777ed1336567a1e4031
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/328780
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41719}
2024-02-12 13:47:11 +00:00
chromium-webrtc-autoroll
cd81d55fec Roll chromium_revision 91eaa36325..f53e0380af (1258480:1259106)
Change log: 91eaa36325..f53e0380af
Full diff: 91eaa36325..f53e0380af

Changed dependencies
* src/base: 896320bc94..a3c0545d76
* src/build: 2304a0bd73..100a2e5828
* src/ios: 43bf7f8fe9..7d8367c78c
* src/testing: 4f90ff4a62..24fb660f29
* src/third_party: a25684473e..513fca12d3
* src/third_party/androidx: G5BlTdQ3N9XCIYScX3yJxRJtxWtNX1Qb1BWkgkh-z6AC..0Jfh-EIa7YBsv86pah7juYpkhvYjTk-Og860SJavIM0C
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/6e8cde260d..4495ac19ba
* src/third_party/depot_tools: 05048d2cb0..32769fe939
* src/third_party/perfetto: ec59b08ccb..3d959a6b84
* src/third_party/r8: aRZW4VFdf45KlLTJNNkZ-Z8f_PTxChr6X3Nqhjth-FEC..Ms1b55b8kRNZqqskNs35JxAgZvqbtKGKDimgS_0LGz4C
* src/tools: 5c64a518b3..daa8c430f1
DEPS diff: 91eaa36325..f53e0380af/DEPS

No update to Clang.

BUG=None

Change-Id: I7a4c32e3606716e796311ed1d4dd73f6151a0f79
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339340
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Bot-Commit: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41718}
2024-02-12 12:44:58 +00:00
Hanna Silen
24ad911210 Use num_output_channels() in GainController2
Replace num_proc_channels() with num_output_channels() in
GainController2. The number of channels is only used in
InputVolumeController.

Bug: webrtc:7494
Change-Id: I6b3f66980a518401fefab304e18c9910eee28d4e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338922
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Hanna Silen <silen@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41717}
2024-02-12 11:29:20 +00:00