1816173 - moz-libwebrtc github patch burn-down

Status: RESOLVED FIXED

(Core :: WebRTC, task, P2)

Description

[Michael Froman [:mjf]]

We have many patches in the moz-libwebrtc gihub repro that can be simplified to allow easier rebase operations during the fast-forward process. Most of these patches are cases where changes are made and then subsequently unmade, or are no longer required at all.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt1 - add shim config for third_party/libwebrtc/third_party/libyuv r?ng!

We don't vendor third_party/libwebrtc/third_party/libyuv, so:

• add BUILD.gn to avoid scattered BUILD.gn changes
• add 5 trampoline libyuv headers

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt2 - remove libyuv location hacks r?ng!

Depends on D169663

Comment 3

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt3 - moz.build updates r?ng!

Depends on D169664

Comment 4

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt4 - add shim config for third_party/libwebrtc/third_party/opus r?ng!

We don't vendor third_party/libwebrtc/third_party/opus, so:

• add BUILD.gn to avoid scattered BUILD.gn changes
• add 2 trampoline headers for libopus

Depends on D169665

Comment 5

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt5 - remove opus locations hacks r?ng!

Depends on D169666

Comment 6

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt6 - add shim config for third_party/libwebrtc/third_party/dav1d r?ng!

We don't vendor third_party/libwebrtc/third_party/dav1d, so:

• add BUILD.gn to avoid scattered BUILD.gn changes
• add trampoline header for dav1d

Depends on D169667

Comment 7

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt7 - remove dav1d location hacks r?ng!

Depends on D169668

Comment 8

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt8 - moz.build updates r?ng!

Depends on D169669

Comment 9

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt9 - add shim config for third_party/libwebrtc/third_party/libaom r?ng!

We don't vendor third_party/libwebrtc/third_party/libaom, so:

• add BUILD.gn to avoid scattered BUILD.gn changes

Depends on D169670

Comment 10

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt10 - remove libaom location hacks r?ng!

Depends on D169671

Comment 11

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt11 - add shim config for third_party/libwebrtc/third_party/googletest r?ng!

We don't vendor third_party/libwebrtc/third_party/googletest, so:

• add BUILD.gn to avoid scattered BUILD.gn changes

Depends on D169672

Comment 12

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt12 - add shim config for third_party/libwebrtc/testing/{gmock|gtest} r?ng!

We don't vendor third_party/libwebrtc/third_party/gmock
third_party/libwebrtc/third_party/gtest, so:

• add BUILD.gn to avoid scattered BUILD.gn changes

Depends on D169673

Comment 13

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt13 - remove gmock and gtest hacks r?ng!

Depends on D169674

Comment 14

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt14 - add shim config for third_party/libwebrtc/third_party/crc32c r?ng!

Depends on D169676

Comment 15

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt15 - remove crc32c hacks r?ng!

Removes 'Bug 1766646 - (fix-c128277f56) don't include build for standalone dcsctp'

Depends on D169677

Comment 16

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt16 - remove reference to '/third_party/libwebrtc/third_party/pipewire' r?ng!

Fixup with 'Bug 1677715 - Fixup errors in desktop_capture BUILD.gn'

Depends on D169678

Comment 17

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt17 - remove BUILD.gn restriction - allows gunit_helpers to build r?ng!

Fixup with 'Bug 1654112 - Tweak upstream gn files for Firefox build.'

Depends on D169679

Comment 18

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt18 - remove unnecessary BUILD.gn restriction around gunit_helpers r?ng!

Removes 'Bug 1766646 - (fix-15a3c3fdca) restrict deps in windows_version_unittest'

Depends on D169680

Comment 19

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt19 - removed commented out BUILD.gn content that stops building single_rw_fifo r?ng!

Fixup with 'Bug 1654112 - do not build single_rw_fifo'

Depends on D169681

Comment 20

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt20 - remove unnecessary BUILD.gn change that reordered resampler/sinc_resampler_avx2.cc r?ng!

Fixup with 'Bug 1654112 - Adapt AVX2 build in libwebrtc'

Depends on D169682

Comment 21

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt21 - make libjingle_peerconnection_api empty instead of disabled r?ng!

Fixup with 'Bug 1654112 - Tweak upstream gn files for Firefox build.'

Depends on D169683

Comment 22

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt22 - remove build hacks for api:libjingle_peerconnection_api r?ng!

Depends on D169684

Comment 23

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt23 - moz.build updates r?ng!

Depends on D169685

Comment 24

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt24 - reset changes to rtc_link_pipewire in webrtc.gni r?ng!

Upstream webrtc.gni has
rtc_link_pipewire = false

Bug 1677715 - Set rtc_use_pipewire flag in webrtc.gni
results in setting rtc_link_pipewire = true

Bug 1739142 [Linux] Enable PipeWire on Linux
results in setting rtc_link_pipewire = !build_with_mozilla

In our builds, that last change is the same as:
rtc_link_pipewire = false

Depends on D169686

Comment 25

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt25 - don't needlessly move rtc_libvpx_build_vp9 setting in webrtc.gni r?ng!

Depends on D169687

Comment 26

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt26 - minimize build hacks around transport:stun_types r?ng!

Depends on D169688

Comment 27

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt27 - moz.build updates r?ng!

Depends on D169689

Comment 28

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt28 - remove unused SimulatedClock variables from rtcp_transceiver_impl_unittest.cc r?ng!

Removes 'Bug 1729455 - Cherry-pick libwebrtc ntp clock consolidation patches.'

Depends on D169690

Comment 29

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt29 - remove redundant packets_discarded from RTCRemoteInboundRtpStreamStats r?ng!

When fd1e9d1a was vendored, I should have moved our cherry-picked definition
of packets_discarded at the same time upstream moved jitter and packets_lost
to RTCReceivedRtpStreamStats.

Removes 'Bug 1742181 - Cherry-pick libwebrtc patch for audio recv stat packetsDiscarded.'

Depends on D169691

Comment 30

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt30 - remove unused files modules/audio_device/opensl/single_rw_fifo.{cc|h} r?ng!

Since 0627374afdb8 "Bug 1654112 - do not build single_rw_fifo"
we no longer build these files, so we can remove these Mozilla-only
additions to libwebrtc.

Fixup with 'Bug 1376873 - Rollup of local modifications'

Depends on D169692

Comment 31

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt31 - remove unused reference to third_party/libyuv/include/libyuv/planar_functions.h r?ng!

Fixup with 'Bug 1376873 - Rollup of local modifications'

Depends on D169693

Comment 32

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt32 - use #if instead of commenting out lines of code r?ng!

Fixup with 'Bug 1654112 - Disable creating av1 encoder and decoder'

Depends on D169694

Comment 33

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt33 - remove unnecessary _USE_MATH_DEFINES change in third_party/libwebrtc/modules/audio_processing/include/audio_processing.h r?ng!

Removes 'Bug 1376873 - Don't define _USE_MATH_DEFINES in audio_processing.h'

Depends on D169695

Comment 34

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt34 - remove unintended blank line added in common_video/libyuv/webrtc_libyuv.cc r?ng!

Fixup with 'Bug 1376873 - Rollup of local modifications'

Depends on D169696

Comment 35

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt35 - relax build restrictions from 'Bug 1654112 - Tweak upstream gn files for Firefox build.' r?ng!

Note: these changes do not produce moz.build changes.

Depends on D169697

Comment 36

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt36 - relax build restrictions that allow removing github patches r?ng!

Note: these changes do not produce moz.build changes.

Removes 'Bug 1766646 - (fix-db5d728878) restrict what we're building in modules/audio_processing/capture_levels_adjuster/BUILD.gn'
Removes 'Bug 1766646 - (fix-e7b752b221) restrict what we're building in modules/video_coding/BUILD.gn'
Removes 'Bug 1766646 - (fix-e9a74c918b) restrict what we're building in api/video/BUILD.gn'
Removes 'Bug 1766646 - (fix-ac5f2e7203) restrict what we're building in rtc_base/containers/BUILD.gn'
Removes 'Bug 1766646 - (fix-8615bf0582) restrict deps in frame_buffer_unittest'
Removes 'Bug 1790097 - (fix-2377226851) restrict deps in timing_unittests'
Removes 'Bug 1766646 - restrict what we're building sdk/BUILD.gn'

Depends on D169698

Comment 37

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/mozilla-central/rev/94fa8f0d6ef5
pt1 - add shim config for third_party/libwebrtc/third_party/libyuv r=ng
https://hg.mozilla.org/mozilla-central/rev/e30ac1bf912d
pt2 - remove libyuv location hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/57aca0ad6a7f
pt3 - moz.build updates r=ng
https://hg.mozilla.org/mozilla-central/rev/91ba0c420574
pt4 - add shim config for third_party/libwebrtc/third_party/opus r=ng
https://hg.mozilla.org/mozilla-central/rev/87da8b691585
pt5 - remove opus locations hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/bb4b996205eb
pt6 - add shim config for third_party/libwebrtc/third_party/dav1d r=ng
https://hg.mozilla.org/mozilla-central/rev/af775776c445
pt7 - remove dav1d location hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/6774d32480c8
pt8 - moz.build updates r=ng
https://hg.mozilla.org/mozilla-central/rev/0bb68d7883d8
pt9 - add shim config for third_party/libwebrtc/third_party/libaom r=ng
https://hg.mozilla.org/mozilla-central/rev/36bda4c3e6b0
pt10 - remove libaom location hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/95802fe16571
pt11 - add shim config for third_party/libwebrtc/third_party/googletest r=ng
https://hg.mozilla.org/mozilla-central/rev/4ea9d2db79c4
pt12 - add shim config for third_party/libwebrtc/testing/{gmock|gtest} r=ng
https://hg.mozilla.org/mozilla-central/rev/fbb4e822b811
pt13 - remove gmock and gtest hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/227d2ae7a872
pt14 - add shim config for third_party/libwebrtc/third_party/crc32c r=ng
https://hg.mozilla.org/mozilla-central/rev/71622f12eaae
pt15 - remove crc32c hacks r=ng
https://hg.mozilla.org/mozilla-central/rev/cc74f4e8d276
pt16 - remove reference to '/third_party/libwebrtc/third_party/pipewire' r=ng
https://hg.mozilla.org/mozilla-central/rev/a923a9576a4c
pt17 - remove BUILD.gn restriction - allows gunit_helpers to build r=ng
https://hg.mozilla.org/mozilla-central/rev/f82a0cf2d323
pt18 - remove unnecessary BUILD.gn restriction around gunit_helpers r=ng
https://hg.mozilla.org/mozilla-central/rev/27130ebaee11
pt19 - removed commented out BUILD.gn content that stops building single_rw_fifo r=ng
https://hg.mozilla.org/mozilla-central/rev/6e079abed439
pt20 - remove unnecessary BUILD.gn change that reordered resampler/sinc_resampler_avx2.cc r=ng
https://hg.mozilla.org/mozilla-central/rev/d64c578914db
pt21 - make libjingle_peerconnection_api empty instead of disabled r=ng
https://hg.mozilla.org/mozilla-central/rev/47af08f0072d
pt22 - remove build hacks for api:libjingle_peerconnection_api r=ng
https://hg.mozilla.org/mozilla-central/rev/c6ab5770e650
pt23 - moz.build updates r=ng
https://hg.mozilla.org/mozilla-central/rev/a87920007e1f
pt24 - reset changes to rtc_link_pipewire in webrtc.gni r=ng
https://hg.mozilla.org/mozilla-central/rev/e2b59860397c
pt25 - don't needlessly move rtc_libvpx_build_vp9 setting in webrtc.gni r=ng
https://hg.mozilla.org/mozilla-central/rev/3108d9103c54
pt26 - minimize build hacks around transport:stun_types r=ng
https://hg.mozilla.org/mozilla-central/rev/4a67b2703c90
pt27 - moz.build updates r=ng
https://hg.mozilla.org/mozilla-central/rev/19a1e3caf100
pt28 - remove unused SimulatedClock variables from rtcp_transceiver_impl_unittest.cc r=ng
https://hg.mozilla.org/mozilla-central/rev/fdb462e94c37
pt29 - remove redundant packets_discarded from RTCRemoteInboundRtpStreamStats r=ng
https://hg.mozilla.org/mozilla-central/rev/b3636f068847
pt30 - remove unused files modules/audio_device/opensl/single_rw_fifo.{cc|h} r=ng
https://hg.mozilla.org/mozilla-central/rev/9bbe643b8ce6
pt31 - remove unused reference to third_party/libyuv/include/libyuv/planar_functions.h r=ng
https://hg.mozilla.org/mozilla-central/rev/bbdcbe625d57
pt32 - use #if instead of commenting out lines of code r=ng
https://hg.mozilla.org/mozilla-central/rev/abffe6676804
pt33 - remove unnecessary _USE_MATH_DEFINES change in third_party/libwebrtc/modules/audio_processing/include/audio_processing.h r=ng
https://hg.mozilla.org/mozilla-central/rev/b0d1b59601fa
pt34 - remove unintended blank line added in common_video/libyuv/webrtc_libyuv.cc r=ng
https://hg.mozilla.org/mozilla-central/rev/d3198ae5e516
pt35 - relax build restrictions from 'Bug 1654112 - Tweak upstream gn files for Firefox build.' r=ng
https://hg.mozilla.org/mozilla-central/rev/d07a18cd4ca2
pt36 - relax build restrictions that allow removing github patches r=ng

Comment 38

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/94fa8f0d6ef5
https://hg.mozilla.org/mozilla-central/rev/e30ac1bf912d
https://hg.mozilla.org/mozilla-central/rev/57aca0ad6a7f
https://hg.mozilla.org/mozilla-central/rev/91ba0c420574
https://hg.mozilla.org/mozilla-central/rev/87da8b691585
https://hg.mozilla.org/mozilla-central/rev/bb4b996205eb
https://hg.mozilla.org/mozilla-central/rev/af775776c445
https://hg.mozilla.org/mozilla-central/rev/6774d32480c8
https://hg.mozilla.org/mozilla-central/rev/0bb68d7883d8
https://hg.mozilla.org/mozilla-central/rev/36bda4c3e6b0
https://hg.mozilla.org/mozilla-central/rev/95802fe16571
https://hg.mozilla.org/mozilla-central/rev/4ea9d2db79c4
https://hg.mozilla.org/mozilla-central/rev/fbb4e822b811
https://hg.mozilla.org/mozilla-central/rev/227d2ae7a872
https://hg.mozilla.org/mozilla-central/rev/71622f12eaae
https://hg.mozilla.org/mozilla-central/rev/cc74f4e8d276
https://hg.mozilla.org/mozilla-central/rev/a923a9576a4c
https://hg.mozilla.org/mozilla-central/rev/f82a0cf2d323
https://hg.mozilla.org/mozilla-central/rev/27130ebaee11
https://hg.mozilla.org/mozilla-central/rev/6e079abed439
https://hg.mozilla.org/mozilla-central/rev/d64c578914db
https://hg.mozilla.org/mozilla-central/rev/47af08f0072d
https://hg.mozilla.org/mozilla-central/rev/c6ab5770e650
https://hg.mozilla.org/mozilla-central/rev/a87920007e1f
https://hg.mozilla.org/mozilla-central/rev/e2b59860397c
https://hg.mozilla.org/mozilla-central/rev/3108d9103c54
https://hg.mozilla.org/mozilla-central/rev/4a67b2703c90
https://hg.mozilla.org/mozilla-central/rev/19a1e3caf100
https://hg.mozilla.org/mozilla-central/rev/fdb462e94c37
https://hg.mozilla.org/mozilla-central/rev/b3636f068847
https://hg.mozilla.org/mozilla-central/rev/9bbe643b8ce6
https://hg.mozilla.org/mozilla-central/rev/bbdcbe625d57
https://hg.mozilla.org/mozilla-central/rev/abffe6676804
https://hg.mozilla.org/mozilla-central/rev/b0d1b59601fa
https://hg.mozilla.org/mozilla-central/rev/d3198ae5e516
https://hg.mozilla.org/mozilla-central/rev/d07a18cd4ca2

Comment 39

[Nico Grunbaum [:ng, @chew:mozilla.org]]

There is a little more work that is going to land on mozilla-central, so I am reopening this bug.

Comment 40

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt37 - remove unnecessary gtk includes in modules/desktop_capture/desktop_capturer.cc r?ng!

Bug 1672987 added gtk includes in order to use gdk_display_get_default.
Bug 1675767 subsequently removed the call to gdk_display_get_default, but
did not remove the previously added gtk includes.

After removing the no longer necessary gtk includes, the following 3 commits
collapse to no change and can be removed:
Bug 1654112 - Update USE_X11 to WEBRTC_USE_X11 like rest of libwebrtc, in desktop_capturer.cc. r=ng
Bug 1675767 [Linux] Use PipeWire on Wayland desktop, r=dminor
Bug 1672987 Use PipeWire when Wayland display is actually used, r=dminor

Comment 41

[Michael Froman [:mjf]]

Attachment: Bug 1816173 - pt38 - add license block and some explanation to the trampoline headers r?ng!

Depends on D170025

Comment 42

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6a72fc9dc5c6
pt37 - remove unnecessary gtk includes in modules/desktop_capture/desktop_capturer.cc r=ng
https://hg.mozilla.org/integration/autoland/rev/326524ce5dbc
pt38 - add license block and some explanation to the trampoline headers r=ng

Comment 43

[Atila Butkovits]

https://hg.mozilla.org/mozilla-central/rev/6a72fc9dc5c6
https://hg.mozilla.org/mozilla-central/rev/326524ce5dbc