Commit 5d1886f3 authored by Michael Froman's avatar Michael Froman
Browse files

Bug 1828517 - Vendor libwebrtc from 3dd73ae6f4 

Upstream commit: https://webrtc.googlesource.com/src/+/3dd73ae6f4d0e1fa39145677341712ebfd65ac44
    Surface the SetMetadata() method so that Chromium can use it.

    RTPVideoHeader is changed to non-const to allow modifying it. We want
    to do this when implementing setMetadata() in JavaScript or when
    refactoring clone() as "construct + set bytes + setMetadata".

    Unblocks
    https://chromium-review.googlesource.com/c/chromium/src/+/4164979.

    Bug: webrtc:14709
    Change-Id: I6089df9c03e9aa33feeb0830dd240dd456cb565e
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290981


    Reviewed-by: default avatarHarald Alvestrand <hta@webrtc.org>
    Commit-Queue: Henrik Boström <hbos@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#39113}
parent 220e93a5

third_party/libwebrtc/README.moz-ff-commit

+3 −0
Original line number Diff line number Diff line
@@ -20955,3 +20955,6 @@ c01410ea1e 
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

6afa92ab20

# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

3dd73ae6f4

third_party/libwebrtc/README.mozilla

+2 −0
Original line number Diff line number Diff line
@@ -13992,3 +13992,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l 
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T16:03:03.714495.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T16:04:02.469043.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T16:04:57.727902.

third_party/libwebrtc/api/frame_transformer_interface.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface { 
  virtual std::vector<uint8_t> GetAdditionalData() const = 0;



  virtual const VideoFrameMetadata& GetMetadata() const = 0;

  // TODO(https://crbug.com/webrtc/14709): Make pure virtual when Chromium MOCK

  // has implemented this.

  virtual void SetMetadata(const VideoFrameMetadata&) {}

};



// Extends the TransformableFrameInterface to expose audio-specific information.

third_party/libwebrtc/api/test/mock_transformable_video_frame.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ class MockTransformableVideoFrame 
              GetMetadata,

              (),

              (const, override));

  MOCK_METHOD(void,

              SetMetadata,

              (const webrtc::VideoFrameMetadata&),

              (override));

};



}  // namespace webrtc

third_party/libwebrtc/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ class MockTransformableVideoFrame 
              GetMetadata,

              (),

              (const, override));

  MOCK_METHOD(void,

              SetMetadata,

              (const webrtc::VideoFrameMetadata&),

              (override));

};



TEST(FrameTransformerFactory, CloneVideoFrame) {