Commit 699a97f5 authored by Byron Campen's avatar Byron Campen
Browse files

Bug 1822194 - Vendor libwebrtc from 46e2d103b4 

Upstream commit: https://webrtc.googlesource.com/src/+/46e2d103b4edc76b65a8e71a5de372c213cfb5c3
    Use ScopedFieldTrials instead of InitFieldTrialsFromString in InternalDecoderFactoryTest.

    Bug: webrtc:14698
    Change-Id: I47ec906b258cd2b613c863cad6a0318d71a1fa32
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284840


    Reviewed-by: default avatarErik Språng <sprang@webrtc.org>
    Commit-Queue: Philip Eliasson <philipel@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#38717}
parent f44684a5

third_party/libwebrtc/README.moz-ff-commit

+3 −0
Original line number Diff line number Diff line
@@ -19752,3 +19752,6 @@ bbc8fc165c 
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

6a8776a108

# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

46e2d103b4

third_party/libwebrtc/README.mozilla

+2 −0
Original line number Diff line number Diff line
@@ -13190,3 +13190,5 @@ libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches o 
libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:50:23.825203.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:51:40.812801.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:53:24.052266.

third_party/libwebrtc/media/engine/internal_decoder_factory_unittest.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "api/video_codecs/vp9_profile.h"

#include "media/base/media_constants.h"

#include "system_wrappers/include/field_trial.h"

#include "test/field_trial.h"

#include "test/gmock.h"

#include "test/gtest.h"
@@ -122,7 +123,7 @@ TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialEnabled) { 
}



TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialDisabled) {

  InitFieldTrialsFromString(kDav1dDecoderFieldTrialDisabled);

  test::ScopedFieldTrials disable_dav1d(kDav1dDecoderFieldTrialDisabled);

  InternalDecoderFactory factory;

  std::unique_ptr<VideoDecoder> decoder = factory.CreateVideoDecoder(

      SdpVideoFormat(cricket::kAv1CodecName,