mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish resolving merge conflicts

Browse source
This commit is contained in:
Rashad Sookram 2022-11-11 17:44:06 -05:00
parent 797e6aed77
commit 2e9c66e1b1
570 changed files with 111 additions and 24628 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.vpython3
View file

@ -56,15 +56,12 @@ wheel: <
>
>
<<<<<<< HEAD
=======
# GRPC used by iOS test.
wheel: <
name: "infra/python/wheels/grpcio/${vpython_platform}"
version: "version:1.44.0"
>
>>>>>>> m108
wheel: <
name: "infra/python/wheels/six-py2_py3"
version: "version:1.15.0"
@ -82,13 +79,8 @@ wheel: <
version: "version:2.0.0"
>
wheel: <
<<<<<<< HEAD
name: "infra/python/wheels/protobuf-py2_py3"
version: "version:3.13.0"
=======
name: "infra/python/wheels/protobuf-py3"
version: "version:3.20.0"
>>>>>>> m108
>
wheel: <
name: "infra/python/wheels/requests-py2_py3"

6
AUTHORS
View file

@ -85,10 +85,7 @@ Mike Gilbert <floppymaster@gmail.com>
Mike Wei <Mike.WeiB@gmail.com>
Min Wang <mingewang@gmail.com>
Mo Zanaty <mzanaty@cisco.com>
<<<<<<< HEAD
=======
Nico Schlumprecht <me@github.nico.onl>
>>>>>>> m108
Niek van der Maas <mail@niekvandermaas.nl>
Olivier Crête <olivier.crete@ocrete.ca>
Pali Rohar
@ -125,10 +122,7 @@ Victor Costan <costan@gmail.com>
Vladimir Beloborodov <VladimirTechMan@gmail.com>
Xiaohong Xu <freemine@yeah.net>
Xiaolei Yu <dreifachstein@gmail.com>
<<<<<<< HEAD
=======
Xinchao Tian <tianxinchao@360.cn>
>>>>>>> m108
Yaowen Guo <albertguo88@gmail.com>
Yura Yaroshevich <yura.yaroshevich@gmail.com>
Yuriy Pavlyshak <yuriy@appear.in>

395
DEPS
View file

File diff suppressed because it is too large Load diff

4
PRESUBMIT.py
View file

@ -953,11 +953,7 @@ def CommonChecks(input_api, output_api):
# Skip long-lines check for DEPS and GN files.
build_file_filter_list = (r'.+\.gn$', r'.+\.gni$', 'DEPS')
# Also we will skip most checks for third_party directory.
<<<<<<< HEAD
third_party_filter_list = (r'^third_party[\\\/].+', )
=======
third_party_filter_list = (r'(^|.*[\\\/])third_party[\\\/].+', )
>>>>>>> m108
eighty_char_sources = lambda x: input_api.FilterSourceFile(
x,
files_to_skip=build_file_filter_list + objc_filter_list +

6
api/DEPS
View file

@ -309,24 +309,18 @@ specific_include_rules = {
"+modules/video_coding",
],
<<<<<<< HEAD
=======
"video_decoder_factory_template.*\.h": [
"+modules/video_coding",
],
>>>>>>> m108
"field_trials\.h": [
"+rtc_base/containers/flat_map.h",
],
<<<<<<< HEAD
=======
"video_track_source_proxy_factory.h": [
"+rtc_base/thread.h",
],
>>>>>>> m108
# .cc files in api/ should not be restricted in what they can #include,
# so we re-add all the top-level directories here. (That's because .h
# files leak their #includes to whoever's #including them, but .cc files

3
api/async_dns_resolver.h
View file

@ -81,8 +81,6 @@ class AsyncDnsResolverFactoryInterface {
// Creates an AsyncDnsResolver and starts resolving the name. The callback
// will be called when resolution is finished.
// The callback will be called on the sequence that the caller runs on.
<<<<<<< HEAD
=======
virtual std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAndResolve(
const rtc::SocketAddress& addr,
std::function<void()> callback) = 0;
@ -90,7 +88,6 @@ class AsyncDnsResolverFactoryInterface {
// matching the specified family. The callback will be called when resolution
// is finished. The callback will be called on the sequence that the caller
// runs on.
>>>>>>> m108
virtual std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAndResolve(
const rtc::SocketAddress& addr,
int family,

17
api/audio/BUILD.gn
View file

@ -22,10 +22,6 @@ rtc_library("audio_frame_api") {
"../../rtc_base:checks",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:timeutils",
]
}
@ -41,13 +37,8 @@ rtc_source_set("audio_mixer_api") {
deps = [
":audio_frame_api",
<<<<<<< HEAD
"../../rtc_base:refcount",
"../../rtc_base:rtc_base_approved",
=======
"..:make_ref_counted",
"../../rtc_base:refcount",
>>>>>>> m108
]
}
@ -75,10 +66,6 @@ rtc_library("aec3_config_json") {
":aec3_config",
"../../rtc_base:checks",
"../../rtc_base:logging",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:rtc_json",
"../../rtc_base:stringutils",
"../../rtc_base/system:rtc_export",
@ -120,9 +107,5 @@ rtc_source_set("echo_detector_creator") {
"../../api:scoped_refptr",
"../../modules/audio_processing:api",
"../../modules/audio_processing:residual_echo_detector",
<<<<<<< HEAD
"../../rtc_base:refcount",
=======
>>>>>>> m108
]
}

6
api/audio_codecs/BUILD.gn
View file

@ -34,16 +34,10 @@ rtc_library("audio_codecs_api") {
"..:make_ref_counted",
"..:scoped_refptr",
"../../api:field_trials_view",
<<<<<<< HEAD
"../../rtc_base:checks",
"../../rtc_base:refcount",
"../../rtc_base:rtc_base_approved",
=======
"../../rtc_base:buffer",
"../../rtc_base:checks",
"../../rtc_base:event_tracer",
"../../rtc_base:refcount",
>>>>>>> m108
"../../rtc_base:sanitizer",
"../../rtc_base/system:rtc_export",
"../units:time_delta",

8
api/audio_codecs/L16/BUILD.gn
View file

@ -23,10 +23,6 @@ rtc_library("audio_encoder_L16") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:pcm16b",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base:safe_minmax",
"../../../rtc_base:stringutils",
@ -49,10 +45,6 @@ rtc_library("audio_decoder_L16") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:pcm16b",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base/system:rtc_export",
]

3
api/audio_codecs/audio_decoder_factory_template.h
View file

@ -16,10 +16,7 @@
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/field_trials_view.h"
<<<<<<< HEAD
=======
#include "api/make_ref_counted.h"
>>>>>>> m108
#include "api/scoped_refptr.h"
namespace webrtc {

3
api/audio_codecs/audio_encoder_factory_template.h
View file

@ -16,10 +16,7 @@
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/field_trials_view.h"
<<<<<<< HEAD
=======
#include "api/make_ref_counted.h"
>>>>>>> m108
#include "api/scoped_refptr.h"
namespace webrtc {

8
api/audio_codecs/g711/BUILD.gn
View file

@ -23,10 +23,6 @@ rtc_library("audio_encoder_g711") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:g711",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base:safe_minmax",
"../../../rtc_base:stringutils",
@ -49,10 +45,6 @@ rtc_library("audio_decoder_g711") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:g711",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base/system:rtc_export",
]

8
api/audio_codecs/g722/BUILD.gn
View file

@ -30,10 +30,6 @@ rtc_library("audio_encoder_g722") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:g722",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base:safe_minmax",
"../../../rtc_base:stringutils",
@ -56,10 +52,6 @@ rtc_library("audio_decoder_g722") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:g722",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base/system:rtc_export",
]

4
api/audio_codecs/ilbc/BUILD.gn
View file

@ -29,10 +29,6 @@ rtc_library("audio_encoder_ilbc") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:ilbc",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:safe_conversions",
"../../../rtc_base:safe_minmax",
"../../../rtc_base:stringutils",

8
api/audio_codecs/isac/BUILD.gn
View file

@ -67,10 +67,6 @@ rtc_library("audio_encoder_isac_fix") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:isac_fix",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:stringutils",
"../../../rtc_base/system:rtc_export",
]
@ -110,10 +106,6 @@ rtc_library("audio_encoder_isac_float") {
"..:audio_codecs_api",
"../../../api:field_trials_view",
"../../../modules/audio_coding:isac",
<<<<<<< HEAD
"../../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../../rtc_base:stringutils",
"../../../rtc_base/system:rtc_export",
]

18
api/audio_options.cc
View file

@ -52,12 +52,6 @@ void AudioOptions::SetAll(const AudioOptions& change) {
change.audio_jitter_buffer_fast_accelerate);
SetFrom(&audio_jitter_buffer_min_delay_ms,
change.audio_jitter_buffer_min_delay_ms);
<<<<<<< HEAD
SetFrom(&audio_jitter_buffer_enable_rtx_handling,
change.audio_jitter_buffer_enable_rtx_handling);
SetFrom(&residual_echo_detector, change.residual_echo_detector);
=======
>>>>>>> m108
SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe);
SetFrom(&audio_network_adaptor, change.audio_network_adaptor);
SetFrom(&audio_network_adaptor_config, change.audio_network_adaptor_config);
@ -78,12 +72,6 @@ bool AudioOptions::operator==(const AudioOptions& o) const {
o.audio_jitter_buffer_fast_accelerate &&
audio_jitter_buffer_min_delay_ms ==
o.audio_jitter_buffer_min_delay_ms &&
<<<<<<< HEAD
audio_jitter_buffer_enable_rtx_handling ==
o.audio_jitter_buffer_enable_rtx_handling &&
residual_echo_detector == o.residual_echo_detector &&
=======
>>>>>>> m108
combined_audio_video_bwe == o.combined_audio_video_bwe &&
audio_network_adaptor == o.audio_network_adaptor &&
audio_network_adaptor_config == o.audio_network_adaptor_config &&
@ -109,12 +97,6 @@ std::string AudioOptions::ToString() const {
audio_jitter_buffer_fast_accelerate);
ToStringIfSet(&result, "audio_jitter_buffer_min_delay_ms",
audio_jitter_buffer_min_delay_ms);
<<<<<<< HEAD
ToStringIfSet(&result, "audio_jitter_buffer_enable_rtx_handling",
audio_jitter_buffer_enable_rtx_handling);
ToStringIfSet(&result, "residual_echo_detector", residual_echo_detector);
=======
>>>>>>> m108
ToStringIfSet(&result, "combined_audio_video_bwe", combined_audio_video_bwe);
ToStringIfSet(&result, "audio_network_adaptor", audio_network_adaptor);
ToStringIfSet(&result, "init_recording_on_send", init_recording_on_send);

9
api/audio_options.h
View file

@ -58,15 +58,6 @@ struct RTC_EXPORT AudioOptions {
absl::optional<bool> audio_jitter_buffer_fast_accelerate;
// Audio receiver jitter buffer (NetEq) minimum target delay in milliseconds.
absl::optional<int> audio_jitter_buffer_min_delay_ms;
<<<<<<< HEAD
// Audio receiver jitter buffer (NetEq) should handle retransmitted packets.
absl::optional<bool> audio_jitter_buffer_enable_rtx_handling;
// TODO(bugs.webrtc.org/11539): Deprecated, replaced by
// webrtc::CreateEchoDetector() and injection when creating the audio
// processing module.
absl::optional<bool> residual_echo_detector;
=======
>>>>>>> m108
// Enable combined audio+bandwidth BWE.
// TODO(pthatcher): This flag is set from the
// "googCombinedAudioVideoBwe", but not used anywhere. So delete it,

15
api/field_trials.cc
View file

@ -63,12 +63,8 @@ std::atomic<bool> instance_created_{false};
namespace webrtc {
FieldTrials::FieldTrials(const std::string& s)
<<<<<<< HEAD
: field_trial_string_(s),
=======
: uses_global_(true),
field_trial_string_(s),
>>>>>>> m108
previous_field_trial_string_(webrtc::field_trial::GetFieldTrialString()),
key_value_map_(InsertIntoMap(s)) {
// TODO(bugs.webrtc.org/10335): Remove the global string!
@ -77,12 +73,6 @@ FieldTrials::FieldTrials(const std::string& s)
<< "Only one instance may be instanciated at any given time!";
}
<<<<<<< HEAD
FieldTrials::~FieldTrials() {
// TODO(bugs.webrtc.org/10335): Remove the global string!
field_trial::InitFieldTrialsFromString(previous_field_trial_string_);
RTC_CHECK(instance_created_.exchange(false));
=======
std::unique_ptr<FieldTrials> FieldTrials::CreateNoGlobal(const std::string& s) {
return std::unique_ptr<FieldTrials>(new FieldTrials(s, true));
}
@ -98,7 +88,6 @@ FieldTrials::~FieldTrials() {
field_trial::InitFieldTrialsFromString(previous_field_trial_string_);
RTC_CHECK(instance_created_.exchange(false));
}
>>>>>>> m108
}
std::string FieldTrials::Lookup(absl::string_view key) const {
@ -109,14 +98,10 @@ std::string FieldTrials::Lookup(absl::string_view key) const {
// Check the global string so that programs using
// a mix between FieldTrials and the global string continue to work
// TODO(bugs.webrtc.org/10335): Remove the global string!
<<<<<<< HEAD
return field_trial::FindFullName(std::string(key));
=======
if (uses_global_) {
return field_trial::FindFullName(std::string(key));
}
return "";
>>>>>>> m108
}
} // namespace webrtc

12
api/field_trials.h
View file

@ -11,10 +11,7 @@
#ifndef API_FIELD_TRIALS_H_
#define API_FIELD_TRIALS_H_
<<<<<<< HEAD
=======
#include <memory>
>>>>>>> m108
#include <string>
#include "absl/strings/string_view.h"
@ -36,20 +33,12 @@ namespace webrtc {
//
// NOTE: Creating multiple FieldTrials-object is currently prohibited
// until we remove the global string (TODO(bugs.webrtc.org/10335))
<<<<<<< HEAD
=======
// (unless using CreateNoGlobal):
>>>>>>> m108
class FieldTrials : public FieldTrialsView {
public:
explicit FieldTrials(const std::string& s);
~FieldTrials();
<<<<<<< HEAD
std::string Lookup(absl::string_view key) const override;
private:
=======
// Create a FieldTrials object that is not reading/writing from
// global variable (i.e can not be used for all parts of webrtc).
static std::unique_ptr<FieldTrials> CreateNoGlobal(const std::string& s);
@ -59,7 +48,6 @@ class FieldTrials : public FieldTrialsView {
private:
explicit FieldTrials(const std::string& s, bool);
const bool uses_global_;
>>>>>>> m108
const std::string field_trial_string_;
const char* const previous_field_trial_string_;
const flat_map<std::string, std::string> key_value_map_;

51
api/field_trials_unittest.cc
View file

@ -10,16 +10,11 @@
#include "api/field_trials.h"
<<<<<<< HEAD
#include "api/transport/field_trial_based_config.h"
#include "system_wrappers/include/field_trial.h"
=======
#include <memory>
#include "api/transport/field_trial_based_config.h"
#include "system_wrappers/include/field_trial.h"
#include "test/gmock.h"
>>>>>>> m108
#include "test/gtest.h"
#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
@ -27,10 +22,6 @@
#endif // GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
namespace webrtc {
<<<<<<< HEAD
TEST(FieldTrials, EmptyString) {
=======
namespace {
using ::testing::NotNull;
@ -45,29 +36,11 @@ class FieldTrialsTest : public testing::Test {
};
TEST_F(FieldTrialsTest, EmptyStringHasNoEffect) {
>>>>>>> m108
FieldTrials f("");
EXPECT_FALSE(f.IsEnabled("MyCoolTrial"));
EXPECT_FALSE(f.IsDisabled("MyCoolTrial"));
}
<<<<<<< HEAD
TEST(FieldTrials, EnableDisable) {
FieldTrials f("MyCoolTrial/Enabled/MyUncoolTrial/Disabled/");
EXPECT_TRUE(f.IsEnabled("MyCoolTrial"));
EXPECT_TRUE(f.IsDisabled("MyUncoolTrial"));
}
TEST(FieldTrials, SetGlobalStringAndReadFromFieldTrial) {
const char* s = "MyCoolTrial/Enabled/MyUncoolTrial/Disabled/";
webrtc::field_trial::InitFieldTrialsFromString(s);
FieldTrialBasedConfig f;
EXPECT_TRUE(f.IsEnabled("MyCoolTrial"));
EXPECT_TRUE(f.IsDisabled("MyUncoolTrial"));
}
TEST(FieldTrials, SetFieldTrialAndReadFromGlobalString) {
=======
TEST_F(FieldTrialsTest, EnabledDisabledMustBeFirstInValue) {
FieldTrials f(
"MyCoolTrial/EnabledFoo/"
@ -87,27 +60,11 @@ TEST_F(FieldTrialsTest, FieldTrialsDoesNotReadGlobalString) {
}
TEST_F(FieldTrialsTest, FieldTrialsWritesGlobalString) {
>>>>>>> m108
FieldTrials f("MyCoolTrial/Enabled/MyUncoolTrial/Disabled/");
EXPECT_TRUE(webrtc::field_trial::IsEnabled("MyCoolTrial"));
EXPECT_TRUE(webrtc::field_trial::IsDisabled("MyUncoolTrial"));
}
<<<<<<< HEAD
TEST(FieldTrials, RestoresGlobalString) {
const char* s = "SomeString/Enabled/";
webrtc::field_trial::InitFieldTrialsFromString(s);
{
FieldTrials f("SomeOtherString/Enabled/");
EXPECT_EQ(std::string("SomeOtherString/Enabled/"),
webrtc::field_trial::GetFieldTrialString());
}
EXPECT_EQ(s, webrtc::field_trial::GetFieldTrialString());
}
#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
TEST(FieldTrials, OnlyOneInstance) {
=======
TEST_F(FieldTrialsTest, FieldTrialsRestoresGlobalStringAfterDestruction) {
static constexpr char s[] = "SomeString/Enabled/";
InitFieldTrialsFromString(s);
@ -121,24 +78,17 @@ TEST_F(FieldTrialsTest, FieldTrialsRestoresGlobalStringAfterDestruction) {
#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
TEST_F(FieldTrialsTest, FieldTrialsDoesNotSupportSimultaneousInstances) {
>>>>>>> m108
FieldTrials f("SomeString/Enabled/");
RTC_EXPECT_DEATH(FieldTrials("SomeOtherString/Enabled/").Lookup("Whatever"),
"Only one instance");
}
#endif // GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
<<<<<<< HEAD
TEST(FieldTrials, SequentialInstances) {
=======
TEST_F(FieldTrialsTest, FieldTrialsSupportsSeparateInstances) {
>>>>>>> m108
{ FieldTrials f("SomeString/Enabled/"); }
{ FieldTrials f("SomeOtherString/Enabled/"); }
}
<<<<<<< HEAD
=======
TEST_F(FieldTrialsTest, NonGlobalFieldTrialsInstanceDoesNotModifyGlobalString) {
std::unique_ptr<FieldTrials> f =
FieldTrials::CreateNoGlobal("SomeString/Enabled/");
@ -184,5 +134,4 @@ TEST_F(FieldTrialsTest, FieldTrialBasedConfigReadsGlobalString) {
}
} // namespace
>>>>>>> m108
} // namespace webrtc

9
api/ice_transport_interface.h
View file

@ -24,10 +24,7 @@ namespace cricket {
class IceTransportInternal;
class PortAllocator;
class IceControllerFactoryInterface;
<<<<<<< HEAD
=======
class ActiveIceControllerFactoryInterface;
>>>>>>> m108
} // namespace cricket
namespace webrtc {
@ -88,8 +85,6 @@ struct IceTransportInit final {
return ice_controller_factory_;
}
<<<<<<< HEAD
=======
// An active ICE controller actively manages the connection used by an ICE
// transport, in contrast with a legacy ICE controller that only picks the
// best connection to use or ping, and lets the transport decide when and
@ -118,7 +113,6 @@ struct IceTransportInit final {
return active_ice_controller_factory_;
}
>>>>>>> m108
const FieldTrialsView* field_trials() { return field_trials_; }
void set_field_trials(const FieldTrialsView* field_trials) {
field_trials_ = field_trials;
@ -131,11 +125,8 @@ struct IceTransportInit final {
AsyncResolverFactory* async_resolver_factory_ = nullptr;
RtcEventLog* event_log_ = nullptr;
cricket::IceControllerFactoryInterface* ice_controller_factory_ = nullptr;
<<<<<<< HEAD
=======
cricket::ActiveIceControllerFactoryInterface* active_ice_controller_factory_ =
nullptr;
>>>>>>> m108
const FieldTrialsView* field_trials_ = nullptr;
// TODO(https://crbug.com/webrtc/12657): Redesign to have const members.
};

8
api/media_stream_interface.h
View file

@ -334,13 +334,6 @@ class MediaStreamInterface : public rtc::RefCountInterface,
const std::string& track_id) = 0;
// Takes ownership of added tracks.
<<<<<<< HEAD
// TODO(hta): Should take scoped_refptr rather than raw pointer.
virtual bool AddTrack(AudioTrackInterface* track) = 0;
virtual bool AddTrack(VideoTrackInterface* track) = 0;
virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
=======
// Note: Default implementations are for avoiding link time errors in
// implementations that mock this API.
// TODO(bugs.webrtc.org/13980): Remove default implementations.
@ -373,7 +366,6 @@ class MediaStreamInterface : public rtc::RefCountInterface,
VideoTrackInterface* track) {
return RemoveTrack(rtc::scoped_refptr<VideoTrackInterface>(track));
}
>>>>>>> m108
protected:
~MediaStreamInterface() override = default;

3
api/metronome/BUILD.gn
View file

@ -16,8 +16,6 @@ rtc_source_set("metronome") {
"../task_queue",
"../units:time_delta",
]
<<<<<<< HEAD
=======
deps = [
"../../api/units:timestamp",
"../../modules:module_api_public",
@ -39,5 +37,4 @@ if (rtc_include_tests) {
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
>>>>>>> m108
}

4
api/metronome/test/BUILD.gn
View file

@ -23,10 +23,6 @@ rtc_library("fake_metronome") {
"../../../rtc_base:rtc_task_queue",
"../../../rtc_base/synchronization:mutex",
"../../../rtc_base/task_utils:repeating_task",
<<<<<<< HEAD
"../../../rtc_base/task_utils:to_queued_task",
=======
>>>>>>> m108
"../../task_queue",
"../../units:time_delta",
]

13
api/metronome/test/fake_metronome.cc
View file

@ -16,10 +16,6 @@
#include "api/units/time_delta.h"
#include "rtc_base/event.h"
#include "rtc_base/task_utils/repeating_task.h"
<<<<<<< HEAD
#include "rtc_base/task_utils/to_queued_task.h"
=======
>>>>>>> m108
namespace webrtc::test {
@ -44,12 +40,7 @@ size_t ForcedTickMetronome::NumListeners() {
void ForcedTickMetronome::Tick() {
for (auto* listener : listeners_) {
<<<<<<< HEAD
listener->OnTickTaskQueue()->PostTask(
ToQueuedTask([listener] { listener->OnTick(); }));
=======
listener->OnTickTaskQueue()->PostTask([listener] { listener->OnTick(); });
>>>>>>> m108
}
}
@ -73,11 +64,7 @@ void FakeMetronome::AddListener(TickListener* listener) {
return TimeDelta::PlusInfinity();
for (auto* listener : listeners_) {
listener->OnTickTaskQueue()->PostTask(
<<<<<<< HEAD
ToQueuedTask([listener] { listener->OnTick(); }));
=======
[listener] { listener->OnTick(); });
>>>>>>> m108
}
return tick_period_;
});

4
api/neteq/BUILD.gn
View file

@ -20,10 +20,6 @@ rtc_source_set("neteq_api") {
"..:rtp_headers",
"..:rtp_packet_info",
"..:scoped_refptr",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:stringutils",
"../../system_wrappers:system_wrappers",
"../audio_codecs:audio_codecs_api",

10
api/task_queue/task_queue_base.h
View file

@ -61,15 +61,6 @@ class RTC_LOCKABLE RTC_EXPORT TaskQueueBase {
// Prefer PostDelayedTask() over PostDelayedHighPrecisionTask() whenever
// possible.
//
<<<<<<< HEAD
// Schedules a task to execute a specified number of milliseconds from when
// the call is made, using "low" precision. All scheduling is affected by
// OS-specific leeway and current workloads which means that in terms of
// precision there are no hard guarantees, but in addition to the OS induced
// leeway, "low" precision adds up to a 17 ms additional leeway. The purpose
// of this leeway is to achieve more efficient CPU scheduling and reduce Idle
// Wake Up frequency.
=======
// Schedules a `task` to execute a specified `delay` from when the call is
// made, using "low" precision. All scheduling is affected by OS-specific
// leeway and current workloads which means that in terms of precision there
@ -77,7 +68,6 @@ class RTC_LOCKABLE RTC_EXPORT TaskQueueBase {
// precision adds up to a 17 ms additional leeway. The purpose of this leeway
// is to achieve more efficient CPU scheduling and reduce Idle Wake Up
// frequency.
>>>>>>> m108
//
// The task may execute with [-1, 17 + OS induced leeway) ms additional delay.
//

5
api/task_queue/test/BUILD.gn
View file

@ -13,13 +13,8 @@ rtc_library("mock_task_queue_base") {
sources = [ "mock_task_queue_base.h" ]
deps = [
"../../../api/task_queue:task_queue",
<<<<<<< HEAD
"../../../test:test_support",
]
=======
"../../../api/units:time_delta",
"../../../test:test_support",
]
absl_deps = [ "//third_party/abseil-cpp/absl/functional:any_invocable" ]
>>>>>>> m108
}

14
api/task_queue/test/mock_task_queue_base.h
View file

@ -11,28 +11,15 @@
#ifndef API_TASK_QUEUE_TEST_MOCK_TASK_QUEUE_BASE_H_
#define API_TASK_QUEUE_TEST_MOCK_TASK_QUEUE_BASE_H_
<<<<<<< HEAD
#include <memory>
#include "api/task_queue/task_queue_base.h"
=======
#include "absl/functional/any_invocable.h"
#include "api/task_queue/task_queue_base.h"
#include "api/units/time_delta.h"
>>>>>>> m108
#include "test/gmock.h"
namespace webrtc {
class MockTaskQueueBase : public TaskQueueBase {
public:
<<<<<<< HEAD
MOCK_METHOD0(Delete, void());
MOCK_METHOD1(PostTask, void(std::unique_ptr<QueuedTask>));
MOCK_METHOD2(PostDelayedTask, void(std::unique_ptr<QueuedTask>, uint32_t));
MOCK_METHOD2(PostDelayedHighPrecisionTask,
void(std::unique_ptr<QueuedTask>, uint32_t));
=======
MOCK_METHOD(void, Delete, (), (override));
MOCK_METHOD(void, PostTask, (absl::AnyInvocable<void() &&>), (override));
MOCK_METHOD(void,
@ -43,7 +30,6 @@ class MockTaskQueueBase : public TaskQueueBase {
PostDelayedHighPrecisionTask,
(absl::AnyInvocable<void() &&>, TimeDelta),
(override));
>>>>>>> m108
};
} // namespace webrtc

3
api/test/mock_async_dns_resolver.h
View file

@ -34,13 +34,10 @@ class MockAsyncDnsResolver : public AsyncDnsResolverInterface {
Start,
(const rtc::SocketAddress&, std::function<void()>),
(override));
<<<<<<< HEAD
=======
MOCK_METHOD(void,
Start,
(const rtc::SocketAddress&, int family, std::function<void()>),
(override));
>>>>>>> m108
MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const, override));
};

9
api/test/mock_rtpsender.h
View file

@ -31,21 +31,15 @@ class MockRtpSender : public RtpSenderInterface {
track,
(),
(const, override));
<<<<<<< HEAD
=======
MOCK_METHOD(rtc::scoped_refptr<DtlsTransportInterface>,
dtls_transport,
(),
(const override));
>>>>>>> m108
MOCK_METHOD(uint32_t, ssrc, (), (const, override));
MOCK_METHOD(cricket::MediaType, media_type, (), (const, override));
MOCK_METHOD(std::string, id, (), (const, override));
MOCK_METHOD(std::vector<std::string>, stream_ids, (), (const, override));
<<<<<<< HEAD
=======
MOCK_METHOD(void, SetStreams, (const std::vector<std::string>&), (override));
>>>>>>> m108
MOCK_METHOD(std::vector<RtpEncodingParameters>,
init_send_encodings,
(),
@ -56,8 +50,6 @@ class MockRtpSender : public RtpSenderInterface {
GetDtmfSender,
(),
(const, override));
<<<<<<< HEAD
=======
MOCK_METHOD(void,
SetFrameEncryptor,
(rtc::scoped_refptr<FrameEncryptorInterface>),
@ -74,7 +66,6 @@ class MockRtpSender : public RtpSenderInterface {
SetEncoderSelector,
(std::unique_ptr<VideoEncoderFactory::EncoderSelectorInterface>),
(override));
>>>>>>> m108
};
static_assert(!std::is_abstract_v<rtc::RefCountedObject<MockRtpSender>>, "");

3
api/test/peerconnection_quality_test_fixture.h
View file

@ -556,13 +556,10 @@ class PeerConnectionE2EQualityTestFixture {
rtc::scoped_refptr<webrtc::AudioProcessing> audio_processing) = 0;
virtual PeerConfigurer* SetAudioMixer(
rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) = 0;
<<<<<<< HEAD
=======
// Forces the Peerconnection to use the network thread as the worker thread.
// Ie, worker thread and the network thread is the same thread.
virtual PeerConfigurer* SetUseNetworkThreadAsWorkerThread() = 0;
>>>>>>> m108
// The parameters of the following 4 methods will be passed to the
// PeerConnectionInterface implementation that will be created for this

5
api/transport/BUILD.gn
View file

@ -142,14 +142,9 @@ if (rtc_include_tests) {
deps = [
":stun_types",
"../../rtc_base",
<<<<<<< HEAD
"../../rtc_base:macromagic",
"../../rtc_base:rtc_base_approved",
=======
"../../rtc_base:byte_buffer",
"../../rtc_base:byte_order",
"../../rtc_base:macromagic",
>>>>>>> m108
"../../rtc_base:socket_address",
"../../system_wrappers:metrics",
"../../test:test_support",

4
api/transport/stun_unittest.cc
View file

@ -1074,11 +1074,7 @@ TEST_F(StunTest, ReadMessageWithAnUnknownAttribute) {
const StunByteStringAttribute* username =
msg.GetByteString(STUN_ATTR_USERNAME);
ASSERT_TRUE(username != NULL);
<<<<<<< HEAD
EXPECT_EQ(kTestUserName2, username->GetString());
=======
EXPECT_EQ(kTestUserName2, username->string_view());
>>>>>>> m108
}
TEST_F(StunTest, WriteMessageWithAnErrorCodeAttribute) {

16
api/video/BUILD.gn
View file

@ -29,10 +29,6 @@ rtc_library("video_rtp_headers") {
deps = [
"..:array_view",
"../../rtc_base:logging",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
"../../rtc_base/system:rtc_export",
@ -75,10 +71,6 @@ rtc_library("video_frame") {
"..:video_track_source_constraints",
"../../rtc_base:checks",
"../../rtc_base:refcount",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:timeutils",
"../../rtc_base/memory:aligned_malloc",
"../../rtc_base/system:rtc_export",
@ -160,10 +152,6 @@ rtc_library("encoded_image") {
"..:scoped_refptr",
"../../rtc_base:checks",
"../../rtc_base:refcount",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base/system:rtc_export",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@ -294,10 +282,6 @@ rtc_library("video_stream_decoder_create") {
deps = [
":video_stream_decoder",
"../../api:field_trials_view",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../video:video_stream_decoder_impl",
"../task_queue",
"../video_codecs:video_codecs_api",

144
api/video/i422_buffer.cc
View file

@ -14,15 +14,9 @@
#include <algorithm>
#include <utility>
<<<<<<< HEAD
#include "api/video/i420_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/ref_counted_object.h"
=======
#include "api/make_ref_counted.h"
#include "api/video/i420_buffer.h"
#include "rtc_base/checks.h"
>>>>>>> m108
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/planar_functions.h"
#include "third_party/libyuv/include/libyuv/scale.h"
@ -37,132 +31,6 @@ namespace {
int I422DataSize(int height, int stride_y, int stride_u, int stride_v) {
return stride_y * height + stride_u * height + stride_v * height;
}
<<<<<<< HEAD
// TODO(sergio.garcia.murillo@gmail.com): Remove as soon it is available in
// libyuv. Due to the rotate&scale required, this function may not be merged in
// to libyuv inmediatelly.
// https://bugs.chromium.org/p/libyuv/issues/detail?id=926
int webrtcI422Rotate(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_u,
int src_stride_u,
const uint8_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum libyuv::RotationMode mode) {
int halfwidth = (width + 1) >> 1;
int halfheight = (height + 1) >> 1;
if (!src_y || !src_u || !src_v || width <= 0 || height == 0 || !dst_y ||
!dst_u || !dst_v) {
return -1;
}
// Negative height means invert the image.
if (height < 0) {
height = -height;
src_y = src_y + (height - 1) * src_stride_y;
src_u = src_u + (height - 1) * src_stride_u;
src_v = src_v + (height - 1) * src_stride_v;
src_stride_y = -src_stride_y;
src_stride_u = -src_stride_u;
src_stride_v = -src_stride_v;
}
switch (mode) {
case libyuv::kRotate0:
// copy frame
libyuv::CopyPlane(src_y, src_stride_y, dst_y, dst_stride_y, width,
height);
libyuv::CopyPlane(src_u, src_stride_u, dst_u, dst_stride_u, halfwidth,
height);
libyuv::CopyPlane(src_v, src_stride_v, dst_v, dst_stride_v, halfwidth,
height);
return 0;
case libyuv::kRotate90:
// We need to rotate and rescale, we use plane Y as temporal storage.
libyuv::RotatePlane90(src_u, src_stride_u, dst_y, height, halfwidth,
height);
libyuv::ScalePlane(dst_y, height, height, halfwidth, dst_u, halfheight,
halfheight, width, libyuv::kFilterBilinear);
libyuv::RotatePlane90(src_v, src_stride_v, dst_y, height, halfwidth,
height);
libyuv::ScalePlane(dst_y, height, height, halfwidth, dst_v, halfheight,
halfheight, width, libyuv::kFilterLinear);
libyuv::RotatePlane90(src_y, src_stride_y, dst_y, dst_stride_y, width,
height);
return 0;
case libyuv::kRotate270:
// We need to rotate and rescale, we use plane Y as temporal storage.
libyuv::RotatePlane270(src_u, src_stride_u, dst_y, height, halfwidth,
height);
libyuv::ScalePlane(dst_y, height, height, halfwidth, dst_u, halfheight,
halfheight, width, libyuv::kFilterBilinear);
libyuv::RotatePlane270(src_v, src_stride_v, dst_y, height, halfwidth,
height);
libyuv::ScalePlane(dst_y, height, height, halfwidth, dst_v, halfheight,
halfheight, width, libyuv::kFilterLinear);
libyuv::RotatePlane270(src_y, src_stride_y, dst_y, dst_stride_y, width,
height);
return 0;
case libyuv::kRotate180:
libyuv::RotatePlane180(src_y, src_stride_y, dst_y, dst_stride_y, width,
height);
libyuv::RotatePlane180(src_u, src_stride_u, dst_u, dst_stride_u,
halfwidth, height);
libyuv::RotatePlane180(src_v, src_stride_v, dst_v, dst_stride_v,
halfwidth, height);
return 0;
default:
break;
}
return -1;
}
// TODO(sergio.garcia.murillo@gmail.com): Remove this function with libyuv one
// as soon as the dependency is updated.
int webrtcI422Scale(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_u,
int src_stride_u,
const uint8_t* src_v,
int src_stride_v,
int src_width,
int src_height,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum libyuv::FilterMode filtering) {
if (!src_y || !src_u || !src_v || src_width <= 0 || src_height == 0 ||
src_width > 32768 || src_height > 32768 || !dst_y || !dst_u || !dst_v ||
dst_width <= 0 || dst_height <= 0) {
return -1;
}
int src_halfwidth = (src_width + 1) >> 1;
int dst_halfwidth = (dst_width + 1) >> 1;
libyuv::ScalePlane(src_y, src_stride_y, src_width, src_height, dst_y,
dst_stride_y, dst_width, dst_height, filtering);
libyuv::ScalePlane(src_u, src_stride_u, src_halfwidth, src_height, dst_u,
dst_stride_u, dst_halfwidth, dst_height, filtering);
libyuv::ScalePlane(src_v, src_stride_v, src_halfwidth, src_height, dst_v,
dst_stride_v, dst_halfwidth, dst_height, filtering);
return 0;
}
=======
>>>>>>> m108
} // namespace
I422Buffer::I422Buffer(int width, int height)
@ -266,11 +134,7 @@ rtc::scoped_refptr<I422Buffer> I422Buffer::Rotate(
I422Buffer::Create(rotated_width, rotated_height);
RTC_CHECK_EQ(0,
<<<<<<< HEAD
webrtcI422Rotate(
=======
libyuv::I422Rotate(
>>>>>>> m108
src.DataY(), src.StrideY(), src.DataU(), src.StrideU(),
src.DataV(), src.StrideV(), buffer->MutableDataY(),
buffer->StrideY(), buffer->MutableDataU(), buffer->StrideU(),
@ -356,20 +220,12 @@ void I422Buffer::CropAndScaleFrom(const I422BufferInterface& src,
src.DataU() + src.StrideU() * uv_offset_y + uv_offset_x;
const uint8_t* v_plane =
src.DataV() + src.StrideV() * uv_offset_y + uv_offset_x;
<<<<<<< HEAD
int res =
webrtcI422Scale(y_plane, src.StrideY(), u_plane, src.StrideU(), v_plane,
src.StrideV(), crop_width, crop_height, MutableDataY(),
StrideY(), MutableDataU(), StrideU(), MutableDataV(),
StrideV(), width(), height(), libyuv::kFilterBox);
=======
int res =
libyuv::I422Scale(y_plane, src.StrideY(), u_plane, src.StrideU(), v_plane,
src.StrideV(), crop_width, crop_height, MutableDataY(),
StrideY(), MutableDataU(), StrideU(), MutableDataV(),
StrideV(), width(), height(), libyuv::kFilterBox);
>>>>>>> m108
RTC_DCHECK_EQ(res, 0);
}

5
api/video/i422_buffer.h
View file

@ -61,13 +61,8 @@ class RTC_EXPORT I422Buffer : public I422BufferInterface {
// quirks in memory checkers
// (https://bugs.chromium.org/p/libyuv/issues/detail?id=377) and
// ffmpeg (http://crbug.com/390941).
<<<<<<< HEAD
// TODO(nisse): Deprecated. Should be deleted if/when those issues
// are resolved in a better way. Or in the mean time, use SetBlack.
=======
// TODO(https://crbug.com/390941): Deprecated. Should be deleted if/when those
// issues are resolved in a better way. Or in the mean time, use SetBlack.
>>>>>>> m108
void InitializeData();
int width() const override;

6
api/video/i444_buffer.cc
View file

@ -14,15 +14,9 @@
#include <algorithm>
#include <utility>
<<<<<<< HEAD
#include "api/video/i420_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/ref_counted_object.h"
=======
#include "api/make_ref_counted.h"
#include "api/video/i420_buffer.h"
#include "rtc_base/checks.h"
>>>>>>> m108
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/planar_functions.h"
#include "third_party/libyuv/include/libyuv/scale.h"

5
api/video/i444_buffer.h
View file

@ -58,13 +58,8 @@ class RTC_EXPORT I444Buffer : public I444BufferInterface {
// quirks in memory checkers
// (https://bugs.chromium.org/p/libyuv/issues/detail?id=377) and
// ffmpeg (http://crbug.com/390941).
<<<<<<< HEAD
// TODO(nisse): Deprecated. Should be deleted if/when those issues
// are resolved in a better way. Or in the mean time, use SetBlack.
=======
// TODO(https://crbug.com/390941): Deprecated. Should be deleted if/when those
// issues are resolved in a better way. Or in the mean time, use SetBlack.
>>>>>>> m108
void InitializeData();
int width() const override;

3
api/video/test/BUILD.gn
View file

@ -12,10 +12,7 @@ rtc_library("rtc_api_video_unittests") {
testonly = true
sources = [
"color_space_unittest.cc",
<<<<<<< HEAD
=======
"i210_buffer_unittest.cc",
>>>>>>> m108
"i422_buffer_unittest.cc",
"i444_buffer_unittest.cc",
"nv12_buffer_unittest.cc",

22
api/video_codecs/BUILD.gn
View file

@ -77,10 +77,6 @@ rtc_library("video_codecs_api") {
"../../rtc_base:checks",
"../../rtc_base:macromagic",
"../../rtc_base:refcount",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:stringutils",
"../../rtc_base/system:rtc_export",
"../units:data_rate",
@ -154,16 +150,12 @@ rtc_source_set("video_encoder_factory_template") {
allow_poison = [ "software_video_codecs" ]
public = [ "video_encoder_factory_template.h" ]
<<<<<<< HEAD
deps = [ ":video_codecs_api" ]
=======
deps = [
":video_codecs_api",
"../../api:array_view",
"../../modules/video_coding/svc:scalability_mode_util",
]
>>>>>>> m108
absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container" ]
}
@ -172,9 +164,6 @@ rtc_source_set("video_encoder_factory_template_libvpx_vp8_adapter") {
allow_poison = [ "software_video_codecs" ]
public = [ "video_encoder_factory_template_libvpx_vp8_adapter.h" ]
<<<<<<< HEAD
deps = [ "../../modules/video_coding:webrtc_vp8" ]
=======
deps = [
":video_codecs_api",
"../../modules/video_coding:webrtc_vp8",
@ -182,7 +171,6 @@ rtc_source_set("video_encoder_factory_template_libvpx_vp8_adapter") {
]
absl_deps = [ "//third_party/abseil-cpp/absl/container:inlined_vector" ]
>>>>>>> m108
}
rtc_source_set("video_encoder_factory_template_libvpx_vp9_adapter") {
@ -207,10 +195,6 @@ rtc_source_set("video_encoder_factory_template_libaom_av1_adapter") {
public = [ "video_encoder_factory_template_libaom_av1_adapter.h" ]
deps = [
<<<<<<< HEAD
"../../modules/video_coding/codecs/av1:libaom_av1_encoder",
"../../modules/video_coding/svc:scalability_structures",
=======
":scalability_mode",
":video_codecs_api",
"../../modules/video_coding/codecs/av1:av1_svc_config",
@ -268,7 +252,6 @@ rtc_source_set("video_decoder_factory_template_dav1d_adapter") {
deps = [
":video_codecs_api",
"../../modules/video_coding/codecs/av1:dav1d_decoder",
>>>>>>> m108
]
}
@ -307,13 +290,8 @@ rtc_library("rtc_software_fallback_wrappers") {
"../../modules/video_coding:video_codec_interface",
"../../modules/video_coding:video_coding_utility",
"../../rtc_base:checks",
<<<<<<< HEAD
"../../rtc_base:logging",
"../../rtc_base:rtc_base_approved",
=======
"../../rtc_base:event_tracer",
"../../rtc_base:logging",
>>>>>>> m108
"../../rtc_base/system:rtc_export",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",

6
api/video_codecs/test/BUILD.gn
View file

@ -20,10 +20,7 @@ if (rtc_include_tests) {
]
deps = [
<<<<<<< HEAD
=======
":video_decoder_factory_template_tests",
>>>>>>> m108
":video_encoder_factory_template_tests",
"..:builtin_video_encoder_factory",
"..:rtc_software_fallback_wrappers",
@ -64,8 +61,6 @@ if (rtc_include_tests) {
"//testing/gtest",
]
}
<<<<<<< HEAD
=======
rtc_library("video_decoder_factory_template_tests") {
testonly = true
@ -82,5 +77,4 @@ if (rtc_include_tests) {
"//testing/gtest",
]
}
>>>>>>> m108
}

46
api/video_codecs/test/video_encoder_factory_template_tests.cc
View file

@ -17,10 +17,7 @@
#include "test/gmock.h"
#include "test/gtest.h"
<<<<<<< HEAD
=======
using ::testing::Contains;
>>>>>>> m108
using ::testing::Each;
using ::testing::Eq;
using ::testing::Field;
@ -44,15 +41,9 @@ struct FooEncoderTemplateAdapter {
return std::make_unique<testing::StrictMock<MockVideoEncoder>>();
}
<<<<<<< HEAD
static bool IsScalabilityModeSupported(
const absl::string_view scalability_mode) {
return scalability_mode == "L1T2" || scalability_mode == "L1T3";
=======
static bool IsScalabilityModeSupported(ScalabilityMode scalability_mode) {
return scalability_mode == ScalabilityMode::kL1T2 ||
scalability_mode == ScalabilityMode::kL1T3;
>>>>>>> m108
}
};
@ -66,18 +57,11 @@ struct BarEncoderTemplateAdapter {
return std::make_unique<testing::StrictMock<MockVideoEncoder>>();
}
<<<<<<< HEAD
static bool IsScalabilityModeSupported(
const absl::string_view scalability_mode) {
return scalability_mode == "L1T2" || scalability_mode == "L1T3" ||
scalability_mode == "S2T2" || scalability_mode == "S2T3";
=======
static bool IsScalabilityModeSupported(ScalabilityMode scalability_mode) {
return scalability_mode == ScalabilityMode::kL1T2 ||
scalability_mode == ScalabilityMode::kL1T3 ||
scalability_mode == ScalabilityMode::kS2T1 ||
scalability_mode == ScalabilityMode::kS3T3;
>>>>>>> m108
}
};
@ -94,11 +78,7 @@ TEST(VideoEncoderFactoryTemplate, OneTemplateAdapterCodecSupport) {
Field(&CodecSupport::is_supported, true));
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "L1T2"),
Field(&CodecSupport::is_supported, true));
<<<<<<< HEAD
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "S2T3"),
=======
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "S3T3"),
>>>>>>> m108
Field(&CodecSupport::is_supported, false));
EXPECT_THAT(factory.QueryCodecSupport(SdpVideoFormat("FooX"), absl::nullopt),
Field(&CodecSupport::is_supported, false));
@ -132,21 +112,13 @@ TEST(VideoEncoderFactoryTemplate, TwoTemplateAdaptersCodecSupport) {
Field(&CodecSupport::is_supported, true));
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "L1T2"),
Field(&CodecSupport::is_supported, true));
<<<<<<< HEAD
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "S2T3"),
=======
EXPECT_THAT(factory.QueryCodecSupport(kFooSdp, "S3T3"),
>>>>>>> m108
Field(&CodecSupport::is_supported, false));
EXPECT_THAT(factory.QueryCodecSupport(kBarLowSdp, absl::nullopt),
Field(&CodecSupport::is_supported, true));
EXPECT_THAT(factory.QueryCodecSupport(kBarHighSdp, absl::nullopt),
Field(&CodecSupport::is_supported, true));
<<<<<<< HEAD
EXPECT_THAT(factory.QueryCodecSupport(kBarLowSdp, "S2T2"),
=======
EXPECT_THAT(factory.QueryCodecSupport(kBarLowSdp, "S2T1"),
>>>>>>> m108
Field(&CodecSupport::is_supported, true));
EXPECT_THAT(factory.QueryCodecSupport(kBarHighSdp, "S3T2"),
Field(&CodecSupport::is_supported, false));
@ -154,18 +126,12 @@ TEST(VideoEncoderFactoryTemplate, TwoTemplateAdaptersCodecSupport) {
TEST(VideoEncoderFactoryTemplate, LibvpxVp8) {
VideoEncoderFactoryTemplate<LibvpxVp8EncoderTemplateAdapter> factory;
<<<<<<< HEAD
const SdpVideoFormat kVp8Sdp("VP8");
EXPECT_THAT(factory.GetSupportedFormats(), UnorderedElementsAre(kVp8Sdp));
EXPECT_THAT(factory.CreateVideoEncoder(kVp8Sdp), Ne(nullptr));
=======
auto formats = factory.GetSupportedFormats();
EXPECT_THAT(formats.size(), 1);
EXPECT_THAT(formats[0], Field(&SdpVideoFormat::name, "VP8"));
EXPECT_THAT(formats[0], Field(&SdpVideoFormat::scalability_modes,
Contains(ScalabilityMode::kL1T3)));
EXPECT_THAT(factory.CreateVideoEncoder(formats[0]), Ne(nullptr));
>>>>>>> m108
}
TEST(VideoEncoderFactoryTemplate, LibvpxVp9) {
@ -173,11 +139,8 @@ TEST(VideoEncoderFactoryTemplate, LibvpxVp9) {
auto formats = factory.GetSupportedFormats();
EXPECT_THAT(formats, Not(IsEmpty()));
EXPECT_THAT(formats, Each(Field(&SdpVideoFormat::name, "VP9")));
<<<<<<< HEAD
=======
EXPECT_THAT(formats, Each(Field(&SdpVideoFormat::scalability_modes,
Contains(ScalabilityMode::kL3T3_KEY))));
>>>>>>> m108
EXPECT_THAT(factory.CreateVideoEncoder(formats[0]), Ne(nullptr));
}
@ -189,29 +152,20 @@ TEST(VideoEncoderFactoryTemplate, OpenH264) {
auto formats = factory.GetSupportedFormats();
EXPECT_THAT(formats, Not(IsEmpty()));
EXPECT_THAT(formats, Each(Field(&SdpVideoFormat::name, "H264")));
<<<<<<< HEAD
=======
EXPECT_THAT(formats, Each(Field(&SdpVideoFormat::scalability_modes,
Contains(ScalabilityMode::kL1T3))));
>>>>>>> m108
EXPECT_THAT(factory.CreateVideoEncoder(formats[0]), Ne(nullptr));
}
#endif // defined(WEBRTC_USE_H264)
TEST(VideoEncoderFactoryTemplate, LibaomAv1) {
VideoEncoderFactoryTemplate<LibaomAv1EncoderTemplateAdapter> factory;
<<<<<<< HEAD
const SdpVideoFormat kAv1Sdp("AV1");
EXPECT_THAT(factory.GetSupportedFormats(), UnorderedElementsAre(kAv1Sdp));
EXPECT_THAT(factory.CreateVideoEncoder(kAv1Sdp), Ne(nullptr));
=======
auto formats = factory.GetSupportedFormats();
EXPECT_THAT(formats.size(), 1);
EXPECT_THAT(formats[0], Field(&SdpVideoFormat::name, "AV1"));
EXPECT_THAT(formats[0], Field(&SdpVideoFormat::scalability_modes,
Contains(ScalabilityMode::kL3T3_KEY)));
EXPECT_THAT(factory.CreateVideoEncoder(formats[0]), Ne(nullptr));
>>>>>>> m108
}
} // namespace

17
api/video_codecs/video_codec.cc
View file

@ -136,21 +136,7 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) {
}
VideoCodecComplexity VideoCodec::GetVideoEncoderComplexity() const {
<<<<<<< HEAD
if (complexity_.has_value()) {
return complexity_.value();
}
switch (codecType) {
case kVideoCodecVP8:
return VP8().complexity;
case kVideoCodecVP9:
return VP9().complexity;
default:
return VideoCodecComplexity::kComplexityNormal;
}
=======
return complexity_;
>>>>>>> m108
}
void VideoCodec::SetVideoEncoderComplexity(
@ -158,8 +144,6 @@ void VideoCodec::SetVideoEncoderComplexity(
complexity_ = complexity_setting;
}
<<<<<<< HEAD
=======
bool VideoCodec::GetFrameDropEnabled() const {
return frame_drop_enabled_;
}
@ -168,5 +152,4 @@ void VideoCodec::SetFrameDropEnabled(bool enabled) {
frame_drop_enabled_ = enabled;
}
>>>>>>> m108
} // namespace webrtc

7
api/video_codecs/video_codec.h
View file

@ -192,18 +192,11 @@ class RTC_EXPORT VideoCodec {
// TODO(hta): Consider replacing the union with a pointer type.
// This will allow removing the VideoCodec* types from this file.
VideoCodecUnion codec_specific_;
<<<<<<< HEAD
std::string scalability_mode_;
// 'complexity_' indicates the CPU capability of the client. It's used to
// determine encoder CPU complexity (e.g., cpu_used for VP8, VP9. and AV1).
absl::optional<VideoCodecComplexity> complexity_;
=======
absl::optional<ScalabilityMode> scalability_mode_;
// 'complexity_' indicates the CPU capability of the client. It's used to
// determine encoder CPU complexity (e.g., cpu_used for VP8, VP9. and AV1).
VideoCodecComplexity complexity_;
bool frame_drop_enabled_ = false;
>>>>>>> m108
};
} // namespace webrtc

45
api/video_codecs/video_encoder_factory_template.h
View file

@ -16,15 +16,10 @@
#include <vector>
#include "absl/algorithm/container.h"
<<<<<<< HEAD
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
=======
#include "api/array_view.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "modules/video_coding/svc/scalability_mode_util.h"
>>>>>>> m108
namespace webrtc {
// The VideoEncoderFactoryTemplate supports encoders implementations given as
@ -42,11 +37,7 @@ namespace webrtc {
//
// // Returns true if the encoder supports the given scalability mode.
// static bool
<<<<<<< HEAD
// IsScalabilityModeSupported(const absl::string_view scalability_mode);
=======
// IsScalabilityModeSupported(ScalabilityMode scalability_mode);
>>>>>>> m108
//
// Note that the order of the template arguments matter as the factory will
// query/return the first encoder implementation supporting the given
@ -55,13 +46,7 @@ template <typename... Ts>
class VideoEncoderFactoryTemplate : public VideoEncoderFactory {
public:
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
<<<<<<< HEAD
std::vector<SdpVideoFormat> formats;
GetSupportedFormatsInternal<Ts...>(formats);
return formats;
=======
return GetSupportedFormatsInternal<Ts...>();
>>>>>>> m108
}
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
@ -76,25 +61,6 @@ class VideoEncoderFactoryTemplate : public VideoEncoderFactory {
}
private:
<<<<<<< HEAD
template <typename V>
bool IsFormatSupported(const SdpVideoFormat& format) const {
return absl::c_count(V::SupportedFormats(), format) > 0;
}
template <typename V, typename... Vs>
void GetSupportedFormatsInternal(std::vector<SdpVideoFormat>& formats) const {
auto supported_formats = V::SupportedFormats();
for (const auto& format : supported_formats) {
if (absl::c_count(formats, format) == 0) {
formats.push_back(format);
}
}
if constexpr (sizeof...(Vs) > 0) {
return GetSupportedFormatsInternal<Vs...>(formats);
}
=======
bool IsFormatInList(
const SdpVideoFormat& format,
rtc::ArrayView<const SdpVideoFormat> supported_formats) const {
@ -132,17 +98,12 @@ class VideoEncoderFactoryTemplate : public VideoEncoderFactory {
}
return supported_formats;
>>>>>>> m108
}
template <typename V, typename... Vs>
std::unique_ptr<VideoEncoder> CreateVideoEncoderInternal(
const SdpVideoFormat& format) {
<<<<<<< HEAD
if (IsFormatSupported<V>(format)) {
=======
if (IsFormatInList(format, V::SupportedFormats())) {
>>>>>>> m108
return V::CreateEncoder(format);
}
@ -157,14 +118,8 @@ class VideoEncoderFactoryTemplate : public VideoEncoderFactory {
CodecSupport QueryCodecSupportInternal(
const SdpVideoFormat& format,
const absl::optional<std::string>& scalability_mode) const {
<<<<<<< HEAD
if (IsFormatSupported<V>(format)) {
return {.is_supported = !scalability_mode ||
V::IsScalabilityModeSupported(*scalability_mode)};
=======
if (IsFormatInList(format, V::SupportedFormats())) {
return {.is_supported = IsScalabilityModeSupported<V>(scalability_mode)};
>>>>>>> m108
}
if constexpr (sizeof...(Vs) > 0) {

16
api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h
View file

@ -14,27 +14,18 @@
#include <memory>
#include <vector>
<<<<<<< HEAD
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
#include "modules/video_coding/svc/create_scalability_structure.h"
=======
#include "absl/container/inlined_vector.h"
#include "api/video_codecs/sdp_video_format.h"
#include "modules/video_coding/codecs/av1/av1_svc_config.h"
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
>>>>>>> m108
namespace webrtc {
struct LibaomAv1EncoderTemplateAdapter {
static std::vector<SdpVideoFormat> SupportedFormats() {
<<<<<<< HEAD
return {SdpVideoFormat("AV1")};
=======
absl::InlinedVector<ScalabilityMode, kScalabilityModeCount>
scalability_modes = LibaomAv1EncoderSupportedScalabilityModes();
return {
SdpVideoFormat("AV1", SdpVideoFormat::Parameters(), scalability_modes)};
>>>>>>> m108
}
static std::unique_ptr<VideoEncoder> CreateEncoder(
@ -42,15 +33,8 @@ struct LibaomAv1EncoderTemplateAdapter {
return CreateLibaomAv1Encoder();
}
<<<<<<< HEAD
static bool IsScalabilityModeSupported(absl::string_view scalability_mode) {
// For libaom AV1, the scalability mode is supported if we can create the
// scalability structure.
return ScalabilityStructureConfig(scalability_mode) != absl::nullopt;
=======
static bool IsScalabilityModeSupported(ScalabilityMode scalability_mode) {
return LibaomAv1EncoderSupportsScalabilityMode(scalability_mode);
>>>>>>> m108
}
};

14
api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h
View file

@ -14,21 +14,14 @@
#include <memory>
#include <vector>
<<<<<<< HEAD
#include "modules/video_coding/codecs/vp8/include/vp8.h"
=======
#include "absl/container/inlined_vector.h"
#include "api/video_codecs/sdp_video_format.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp8/vp8_scalability.h"
>>>>>>> m108
namespace webrtc {
struct LibvpxVp8EncoderTemplateAdapter {
static std::vector<SdpVideoFormat> SupportedFormats() {
<<<<<<< HEAD
return {SdpVideoFormat("VP8")};
=======
absl::InlinedVector<ScalabilityMode, kScalabilityModeCount>
scalability_modes;
for (const auto scalability_mode : kVP8SupportedScalabilityModes) {
@ -37,7 +30,6 @@ struct LibvpxVp8EncoderTemplateAdapter {
return {
SdpVideoFormat("VP8", SdpVideoFormat::Parameters(), scalability_modes)};
>>>>>>> m108
}
static std::unique_ptr<VideoEncoder> CreateEncoder(
@ -45,14 +37,8 @@ struct LibvpxVp8EncoderTemplateAdapter {
return VP8Encoder::Create();
}
<<<<<<< HEAD
static bool IsScalabilityModeSupported(
const absl::string_view scalability_mode) {
return VP8Encoder::SupportsScalabilityMode(scalability_mode);
=======
static bool IsScalabilityModeSupported(ScalabilityMode scalability_mode) {
return VP8SupportsScalabilityMode(scalability_mode);
>>>>>>> m108
}
};
} // namespace webrtc

12
api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h
View file

@ -19,27 +19,15 @@
namespace webrtc {
struct LibvpxVp9EncoderTemplateAdapter {
static std::vector<SdpVideoFormat> SupportedFormats() {
<<<<<<< HEAD
return SupportedVP9Codecs();
=======
return SupportedVP9Codecs(/*add_scalability_modes=*/true);
>>>>>>> m108
}
static std::unique_ptr<VideoEncoder> CreateEncoder(
const SdpVideoFormat& format) {
<<<<<<< HEAD
return VP9Encoder::Create();
}
static bool IsScalabilityModeSupported(
const absl::string_view scalability_mode) {
=======
return VP9Encoder::Create(cricket::VideoCodec(format));
}
static bool IsScalabilityModeSupported(ScalabilityMode scalability_mode) {
>>>>>>> m108
return VP9Encoder::SupportsScalabilityMode(scalability_mode);
}
};

20
api/video_codecs/video_encoder_factory_template_open_h264_adapter.h
View file

@ -18,13 +18,6 @@
namespace webrtc {
// TODO(bugs.webrtc.org/13573): When OpenH264 is no longer a conditional build
<<<<<<< HEAD
// target remove this #ifdef.
#if defined(WEBRTC_USE_H264)
struct OpenH264EncoderTemplateAdapter {
static std::vector<SdpVideoFormat> SupportedFormats() {
return SupportedH264Codecs();
=======
// target remove #ifdefs.
struct OpenH264EncoderTemplateAdapter {
static std::vector<SdpVideoFormat> SupportedFormats() {
@ -33,22 +26,10 @@ struct OpenH264EncoderTemplateAdapter {
#else
return {};
#endif
>>>>>>> m108
}
static std::unique_ptr<VideoEncoder> CreateEncoder(
const SdpVideoFormat& format) {
<<<<<<< HEAD
return H264Encoder::Create(cricket::VideoCodec(format));
}
static bool IsScalabilityModeSupported(
const absl::string_view scalability_mode) {
return H264Encoder::SupportsScalabilityMode(scalability_mode);
}
};
#endif // defined(WEBRTC_USE_H264)
=======
#if defined(WEBRTC_USE_H264)
return H264Encoder::Create(cricket::VideoCodec(format));
#else
@ -64,7 +45,6 @@ struct OpenH264EncoderTemplateAdapter {
#endif
}
};
>>>>>>> m108
} // namespace webrtc
#endif // API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_TEMPLATE_OPEN_H264_ADAPTER_H_

17
api/wrapping_async_dns_resolver.h
View file

@ -13,10 +13,7 @@
#include <functional>
#include <memory>
<<<<<<< HEAD
=======
#include <utility>
>>>>>>> m108
#include "absl/memory/memory.h"
#include "api/async_dns_resolver.h"
@ -72,16 +69,6 @@ class RTC_EXPORT WrappingAsyncDnsResolver : public AsyncDnsResolverInterface,
void Start(const rtc::SocketAddress& addr,
std::function<void()> callback) override {
RTC_DCHECK_RUN_ON(&sequence_checker_);
<<<<<<< HEAD
RTC_DCHECK_EQ(State::kNotStarted, state_);
state_ = State::kStarted;
callback_ = callback;
wrapped_->SignalDone.connect(this,
&WrappingAsyncDnsResolver::OnResolveResult);
wrapped_->Start(addr);
}
=======
PrepareToResolve(std::move(callback));
wrapped_->Start(addr);
}
@ -94,7 +81,6 @@ class RTC_EXPORT WrappingAsyncDnsResolver : public AsyncDnsResolverInterface,
wrapped_->Start(addr, family);
}
>>>>>>> m108
const AsyncDnsResolverResult& result() const override {
RTC_DCHECK_RUN_ON(&sequence_checker_);
RTC_DCHECK_EQ(State::kResolved, state_);
@ -111,8 +97,6 @@ class RTC_EXPORT WrappingAsyncDnsResolver : public AsyncDnsResolverInterface,
return wrapped_.get();
}
<<<<<<< HEAD
=======
void PrepareToResolve(std::function<void()> callback) {
RTC_DCHECK_RUN_ON(&sequence_checker_);
RTC_DCHECK_EQ(State::kNotStarted, state_);
@ -122,7 +106,6 @@ class RTC_EXPORT WrappingAsyncDnsResolver : public AsyncDnsResolverInterface,
&WrappingAsyncDnsResolver::OnResolveResult);
}
>>>>>>> m108
void OnResolveResult(rtc::AsyncResolverInterface* ref) {
RTC_DCHECK_RUN_ON(&sequence_checker_);
RTC_DCHECK(state_ == State::kStarted);

16
audio/BUILD.gn
View file

@ -84,28 +84,16 @@ rtc_library("audio") {
"../modules/pacing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
<<<<<<< HEAD
"../rtc_base",
=======
"../modules/utility:utility",
>>>>>>> m108
"../rtc_base:audio_format_to_string",
"../rtc_base:buffer",
"../rtc_base:checks",
<<<<<<< HEAD
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:rate_limiter",
"../rtc_base:refcount",
"../rtc_base:rtc_base_approved",
=======
"../rtc_base:event_tracer",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:race_checker",
"../rtc_base:rate_limiter",
"../rtc_base:refcount",
>>>>>>> m108
"../rtc_base:rtc_event",
"../rtc_base:rtc_task_queue",
"../rtc_base:safe_conversions",
@ -203,10 +191,6 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:macromagic",
"../rtc_base:refcount",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:safe_compare",
"../rtc_base:task_queue_for_test",

11
audio/audio_send_stream_unittest.cc
View file

@ -36,10 +36,7 @@
#include "test/mock_audio_encoder.h"
#include "test/mock_audio_encoder_factory.h"
#include "test/scoped_key_value_config.h"
<<<<<<< HEAD
=======
#include "test/time_controller/real_time_controller.h"
>>>>>>> m108
namespace webrtc {
namespace test {
@ -195,15 +192,9 @@ struct ConfigHelper {
.WillRepeatedly(Return(&worker_queue_));
return std::unique_ptr<internal::AudioSendStream>(
new internal::AudioSendStream(
<<<<<<< HEAD
Clock::GetRealTimeClock(), stream_config_, audio_state_,
task_queue_factory_.get(), &rtp_transport_, &bitrate_allocator_,
&event_log_, absl::nullopt,
=======
time_controller_.GetClock(), stream_config_, audio_state_,
time_controller_.GetTaskQueueFactory(), &rtp_transport_,
&bitrate_allocator_, &event_log_, absl::nullopt,
>>>>>>> m108
std::unique_ptr<voe::ChannelSendInterface>(channel_send_),
field_trials));
}
@ -332,8 +323,6 @@ struct ConfigHelper {
test::ScopedKeyValueConfig field_trials;
test::ScopedKeyValueConfig field_trials;
private:
RealTimeController time_controller_;
rtc::scoped_refptr<AudioState> audio_state_;

5
audio/audio_state.h
View file

@ -52,13 +52,8 @@ class AudioState : public webrtc::AudioState {
return config_.audio_device_module.get();
}
<<<<<<< HEAD
void AddReceivingStream(webrtc::AudioReceiveStream* stream);
void RemoveReceivingStream(webrtc::AudioReceiveStream* stream);
=======
void AddReceivingStream(webrtc::AudioReceiveStreamInterface* stream);
void RemoveReceivingStream(webrtc::AudioReceiveStreamInterface* stream);
>>>>>>> m108
void AddSendingStream(webrtc::AudioSendStream* stream,
int sample_rate_hz,

7
audio/channel_receive_frame_transformer_delegate.cc
View file

@ -37,12 +37,9 @@ class TransformableIncomingAudioFrame
uint32_t GetSsrc() const override { return ssrc_; }
uint32_t GetTimestamp() const override { return header_.timestamp; }
const RTPHeader& GetHeader() const override { return header_; }
<<<<<<< HEAD
=======
rtc::ArrayView<const uint32_t> GetContributingSources() const override {
return rtc::ArrayView<const uint32_t>(header_.arrOfCSRCs, header_.numCSRCs);
}
>>>>>>> m108
Direction GetDirection() const override { return Direction::kReceiver; }
private:
@ -85,11 +82,7 @@ void ChannelReceiveFrameTransformerDelegate::Transform(
void ChannelReceiveFrameTransformerDelegate::OnTransformedFrame(
std::unique_ptr<TransformableFrameInterface> frame) {
rtc::scoped_refptr<ChannelReceiveFrameTransformerDelegate> delegate(this);
<<<<<<< HEAD
channel_receive_thread_->PostTask(ToQueuedTask(
=======
channel_receive_thread_->PostTask(
>>>>>>> m108
[delegate = std::move(delegate), frame = std::move(frame)]() mutable {
delegate->ReceiveFrame(std::move(frame));
});

13
audio/channel_send.cc
View file

@ -233,13 +233,6 @@ class ChannelSend : public ChannelSendInterface,
rtc::scoped_refptr<ChannelSendFrameTransformerDelegate>
frame_transformer_delegate_ RTC_GUARDED_BY(encoder_queue_);
<<<<<<< HEAD
// Defined last to ensure that there are no running tasks when the other
// members are destroyed.
rtc::TaskQueue encoder_queue_;
=======
>>>>>>> m108
const bool fixing_timestamp_stall_;
mutable Mutex rtcp_counter_mutex_;
@ -481,13 +474,7 @@ ChannelSend::ChannelSend(
field_trials.IsDisabled("WebRTC-Audio-FixTimestampStall")),
encoder_queue_(task_queue_factory->CreateTaskQueue(
"AudioEncoder",
<<<<<<< HEAD
TaskQueueFactory::Priority::NORMAL)),
fixing_timestamp_stall_(
field_trials.IsDisabled("WebRTC-Audio-FixTimestampStall")) {
=======
TaskQueueFactory::Priority::NORMAL)) {
>>>>>>> m108
audio_coding_.reset(AudioCodingModule::Create(AudioCodingModule::Config()));
RtpRtcpInterface::Configuration configuration;

8
audio/utility/BUILD.gn
View file

@ -27,10 +27,6 @@ rtc_library("audio_frame_operations") {
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:logging",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:safe_conversions",
"../../system_wrappers:field_trial",
]
@ -51,10 +47,6 @@ if (rtc_include_tests) {
"../../rtc_base:checks",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:stringutils",
"../../test:field_trial",
"../../test:test_support",

59
call/BUILD.gn
View file

@ -70,13 +70,8 @@ rtc_library("call_interfaces") {
"../rtc_base",
"../rtc_base:audio_format_to_string",
"../rtc_base:checks",
<<<<<<< HEAD
"../rtc_base:refcount",
"../rtc_base:rtc_base_approved",
=======
"../rtc_base:copy_on_write_buffer",
"../rtc_base:refcount",
>>>>>>> m108
"../rtc_base:stringutils",
"../rtc_base/network:sent_packet",
]
@ -155,10 +150,6 @@ rtc_library("rtp_receiver") {
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:logging",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:stringutils",
"../rtc_base/containers:flat_map",
"../rtc_base/containers:flat_set",
@ -168,13 +159,6 @@ rtc_library("rtp_receiver") {
"//third_party/abseil-cpp/absl/strings:strings",
"//third_party/abseil-cpp/absl/types:optional",
]
<<<<<<< HEAD
absl_deps = [
"//third_party/abseil-cpp/absl/strings:strings",
"//third_party/abseil-cpp/absl/types:optional",
]
=======
>>>>>>> m108
}
rtc_library("rtp_sender") {
@ -227,16 +211,11 @@ rtc_library("rtp_sender") {
"../modules/video_coding:video_codec_interface",
"../rtc_base",
"../rtc_base:checks",
<<<<<<< HEAD
"../rtc_base:logging",
"../rtc_base:macromagic",
=======
"../rtc_base:event_tracer",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:race_checker",
"../rtc_base:random",
>>>>>>> m108
"../rtc_base:rate_limiter",
"../rtc_base:rtc_task_queue",
"../rtc_base:timeutils",
@ -282,10 +261,6 @@ rtc_library("bitrate_allocator") {
"../api/units:time_delta",
"../rtc_base:checks",
"../rtc_base:logging",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:safe_minmax",
"../rtc_base/system:no_unique_address",
"../system_wrappers",
@ -343,11 +318,8 @@ rtc_library("call") {
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/video_coding",
"../rtc_base:checks",
<<<<<<< HEAD
=======
"../rtc_base:copy_on_write_buffer",
"../rtc_base:event_tracer",
>>>>>>> m108
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:rate_limiter",
@ -365,10 +337,7 @@ rtc_library("call") {
"../system_wrappers:metrics",
"../video",
"../video:decode_synchronizer",
<<<<<<< HEAD
=======
"../video/config:encoder_config",
>>>>>>> m108
"adaptation:resource_adaptation",
]
absl_deps = [
@ -418,13 +387,8 @@ rtc_library("video_stream_api") {
"../common_video:frame_counts",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
"../rtc_base:stringutils",
=======
"../rtc_base:stringutils",
"../video/config:encoder_config",
>>>>>>> m108
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
@ -443,12 +407,8 @@ rtc_library("simulated_network") {
"../api/units:timestamp",
"../rtc_base:checks",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
"../rtc_base:race_checker",
"../rtc_base:random",
>>>>>>> m108
"../rtc_base/synchronization:mutex",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@ -478,10 +438,6 @@ rtc_library("fake_network") {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base/synchronization:mutex",
"../system_wrappers",
]
@ -544,20 +500,12 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rate_limiter",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_event",
"../rtc_base:safe_conversions",
"../rtc_base:task_queue_for_test",
=======
"../rtc_base:random",
"../rtc_base:rate_limiter",
"../rtc_base:rtc_event",
"../rtc_base:safe_conversions",
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
>>>>>>> m108
"../rtc_base:timeutils",
"../rtc_base/synchronization:mutex",
"../system_wrappers",
@ -569,10 +517,7 @@ if (rtc_include_tests) {
"../test:field_trial",
"../test:mock_frame_transformer",
"../test:mock_transport",
<<<<<<< HEAD
=======
"../test:run_loop",
>>>>>>> m108
"../test:scoped_key_value_config",
"../test:test_common",
"../test:test_support",
@ -632,11 +577,7 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
"../rtc_base:platform_thread",
>>>>>>> m108
"../rtc_base:rtc_event",
"../rtc_base:stringutils",
"../rtc_base:task_queue_for_test",

6
call/OWNERS
View file

@ -4,11 +4,5 @@ brandtr@webrtc.org
tommi@webrtc.org
mflodman@webrtc.org
stefan@webrtc.org
<<<<<<< HEAD
srte@webrtc.org
terelius@webrtc.org
sprang@webrtc.org
=======
>>>>>>> m108
per-file version.cc=webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com

17
call/adaptation/BUILD.gn
View file

@ -33,10 +33,7 @@ rtc_library("resource_adaptation") {
]
deps = [
"../../api:field_trials_view",
<<<<<<< HEAD
=======
"../../api:make_ref_counted",
>>>>>>> m108
"../../api:rtp_parameters",
"../../api:scoped_refptr",
"../../api:sequence_checker",
@ -51,10 +48,6 @@ rtc_library("resource_adaptation") {
"../../rtc_base:logging",
"../../rtc_base:macromagic",
"../../rtc_base:refcount",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:rtc_task_queue",
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
@ -95,10 +88,6 @@ if (rtc_include_tests) {
"../../api/video_codecs:video_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:gunit_helpers",
<<<<<<< HEAD
"../../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../../rtc_base:rtc_event",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:stringutils",
@ -135,12 +124,6 @@ if (rtc_include_tests) {
"../../api/adaptation:resource_adaptation_api",
"../../api/task_queue:task_queue",
"../../api/video:video_stream_encoder",
<<<<<<< HEAD
"../../rtc_base:refcount",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/task_utils:to_queued_task",
=======
>>>>>>> m108
"../../test:test_support",
"../../video:video_stream_encoder_interface",
"../../video/config:encoder_config",

4
call/adaptation/resource_adaptation_processor.cc
View file

@ -113,11 +113,7 @@ void ResourceAdaptationProcessor::AddResource(
<< "Resource \"" << resource->Name() << "\" was already registered.";
resources_.push_back(resource);
}
<<<<<<< HEAD
resource->SetResourceListener(resource_listener_delegate_);
=======
resource->SetResourceListener(resource_listener_delegate_.get());
>>>>>>> m108
RTC_LOG(LS_INFO) << "Registered resource \"" << resource->Name() << "\".";
}

3
call/adaptation/resource_adaptation_processor_unittest.cc
View file

@ -135,10 +135,7 @@ class ResourceAdaptationProcessorTest : public ::testing::Test {
}
protected:
<<<<<<< HEAD
=======
rtc::AutoThread main_thread_;
>>>>>>> m108
webrtc::test::ScopedKeyValueConfig field_trials_;
FakeFrameRateProvider frame_rate_provider_;
VideoStreamInputStateProvider input_state_provider_;

187
call/call.cc
View file

@ -52,10 +52,6 @@
#include "modules/rtp_rtcp/source/rtp_util.h"
#include "modules/video_coding/fec_controller_default.h"
#include "rtc_base/checks.h"
<<<<<<< HEAD
#include "rtc_base/location.h"
=======
>>>>>>> m108
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/no_unique_address.h"
@ -352,15 +348,9 @@ class Call final : public webrtc::Call,
rtc::CopyOnWriteBuffer packet,
int64_t packet_time_us) RTC_RUN_ON(worker_thread_);
<<<<<<< HEAD
AudioReceiveStream* FindAudioStreamForSyncGroup(const std::string& sync_group)
RTC_RUN_ON(worker_thread_);
void ConfigureSync(const std::string& sync_group) RTC_RUN_ON(worker_thread_);
=======
AudioReceiveStreamImpl* FindAudioStreamForSyncGroup(
absl::string_view sync_group) RTC_RUN_ON(worker_thread_);
void ConfigureSync(absl::string_view sync_group) RTC_RUN_ON(worker_thread_);
>>>>>>> m108
void NotifyBweOfReceivedPacket(const RtpPacketReceived& packet,
MediaType media_type,
@ -369,11 +359,7 @@ class Call final : public webrtc::Call,
bool IdentifyReceivedPacket(RtpPacketReceived& packet,
bool* use_send_side_bwe = nullptr);
<<<<<<< HEAD
bool RegisterReceiveStream(uint32_t ssrc, ReceiveStream* stream);
=======
bool RegisterReceiveStream(uint32_t ssrc, ReceiveStreamInterface* stream);
>>>>>>> m108
bool UnregisterReceiveStream(uint32_t ssrc);
void UpdateAggregateNetworkState();
@ -409,21 +395,12 @@ class Call final : public webrtc::Call,
// creates them.
// TODO(bugs.webrtc.org/11993): Move audio_receive_streams_,
// video_receive_streams_ over to the network thread.
<<<<<<< HEAD
std::set<AudioReceiveStream*> audio_receive_streams_
RTC_GUARDED_BY(worker_thread_);
std::set<VideoReceiveStream2*> video_receive_streams_
RTC_GUARDED_BY(worker_thread_);
// TODO(nisse): Should eventually be injected at creation,
// with a single object in the bundled case.
=======
std::set<AudioReceiveStreamImpl*> audio_receive_streams_
RTC_GUARDED_BY(worker_thread_);
std::set<VideoReceiveStream2*> video_receive_streams_
RTC_GUARDED_BY(worker_thread_);
// TODO(bugs.webrtc.org/7135, bugs.webrtc.org/9719): Should eventually be
// injected at creation, with a single object in the bundled case.
>>>>>>> m108
RtpStreamReceiverController audio_receiver_controller_
RTC_GUARDED_BY(worker_thread_);
RtpStreamReceiverController video_receiver_controller_
@ -436,11 +413,7 @@ class Call final : public webrtc::Call,
// TODO(bugs.webrtc.org/11993): Move receive_rtp_config_ over to the
// network thread.
<<<<<<< HEAD
std::map<uint32_t, ReceiveStream*> receive_rtp_config_
=======
std::map<uint32_t, ReceiveStreamInterface*> receive_rtp_config_
>>>>>>> m108
RTC_GUARDED_BY(&receive_11993_checker_);
// Audio and Video send streams are owned by the client that creates them.
@ -541,104 +514,7 @@ Call* Call::Create(const Call::Config& config,
transportControllerSend) {
RTC_DCHECK(config.task_queue_factory);
return new internal::Call(clock, config, std::move(transportControllerSend),
<<<<<<< HEAD
std::move(call_thread), config.task_queue_factory);
}
class SharedModuleThread::Impl {
public:
Impl(std::unique_ptr<ProcessThread> process_thread,
std::function<void()> on_one_ref_remaining)
: module_thread_(std::move(process_thread)),
on_one_ref_remaining_(std::move(on_one_ref_remaining)) {}
void EnsureStarted() {
RTC_DCHECK_RUN_ON(&sequence_checker_);
if (started_)
return;
started_ = true;
module_thread_->Start();
}
ProcessThread* process_thread() {
RTC_DCHECK_RUN_ON(&sequence_checker_);
return module_thread_.get();
}
void AddRef() const {
RTC_DCHECK_RUN_ON(&sequence_checker_);
++ref_count_;
}
rtc::RefCountReleaseStatus Release() const {
RTC_DCHECK_RUN_ON(&sequence_checker_);
--ref_count_;
if (ref_count_ == 0) {
module_thread_->Stop();
return rtc::RefCountReleaseStatus::kDroppedLastRef;
}
if (ref_count_ == 1 && on_one_ref_remaining_) {
auto moved_fn = std::move(on_one_ref_remaining_);
// NOTE: after this function returns, chances are that `this` has been
// deleted - do not touch any member variables.
// If the owner of the last reference implements a lambda that releases
// that last reference inside of the callback (which is legal according
// to this implementation), we will recursively enter Release() above,
// call Stop() and release the last reference.
moved_fn();
}
return rtc::RefCountReleaseStatus::kOtherRefsRemained;
}
private:
RTC_NO_UNIQUE_ADDRESS SequenceChecker sequence_checker_;
mutable int ref_count_ RTC_GUARDED_BY(sequence_checker_) = 0;
std::unique_ptr<ProcessThread> const module_thread_;
std::function<void()> const on_one_ref_remaining_;
bool started_ = false;
};
SharedModuleThread::SharedModuleThread(
std::unique_ptr<ProcessThread> process_thread,
std::function<void()> on_one_ref_remaining)
: impl_(std::make_unique<Impl>(std::move(process_thread),
std::move(on_one_ref_remaining))) {}
SharedModuleThread::~SharedModuleThread() = default;
// static
rtc::scoped_refptr<SharedModuleThread> SharedModuleThread::Create(
std::unique_ptr<ProcessThread> process_thread,
std::function<void()> on_one_ref_remaining) {
// Using `new` to access a non-public constructor.
return rtc::scoped_refptr<SharedModuleThread>(new SharedModuleThread(
std::move(process_thread), std::move(on_one_ref_remaining)));
}
void SharedModuleThread::EnsureStarted() {
impl_->EnsureStarted();
}
ProcessThread* SharedModuleThread::process_thread() {
return impl_->process_thread();
}
void SharedModuleThread::AddRef() const {
impl_->AddRef();
}
rtc::RefCountReleaseStatus SharedModuleThread::Release() const {
auto ret = impl_->Release();
if (ret == rtc::RefCountReleaseStatus::kDroppedLastRef)
delete this;
return ret;
=======
config.task_queue_factory);
>>>>>>> m108
}
// This method here to avoid subclasses has to implement this method.
@ -1028,11 +904,7 @@ void Call::DestroyAudioReceiveStream(
// After calling erase(), call ConfigureSync. This will clear associated
// video streams or associate them with a different audio stream if one exists
// for this sync_group.
<<<<<<< HEAD
ConfigureSync(audio_receive_stream->config().sync_group);
=======
ConfigureSync(audio_receive_stream->sync_group());
>>>>>>> m108
UnregisterReceiveStream(ssrc);
@ -1169,11 +1041,7 @@ webrtc::VideoReceiveStreamInterface* Call::CreateVideoReceiveStream(
task_queue_factory_, this, num_cpu_cores_,
transport_send_->packet_router(), std::move(configuration),
call_stats_.get(), clock_, std::make_unique<VCMTiming>(clock_, trials()),
<<<<<<< HEAD
&nack_periodic_processor_, decode_sync_.get());
=======
&nack_periodic_processor_, decode_sync_.get(), event_log_);
>>>>>>> m108
// TODO(bugs.webrtc.org/11993): Set this up asynchronously on the network
// thread.
receive_stream->RegisterWithTransport(&video_receiver_controller_);
@ -1183,15 +1051,9 @@ webrtc::VideoReceiveStreamInterface* Call::CreateVideoReceiveStream(
// stream. Since the transport_send_cc negotiation is per payload
// type, we may get an incorrect value for the rtx stream, but
// that is unlikely to matter in practice.
<<<<<<< HEAD
RegisterReceiveStream(rtp.rtx_ssrc, receive_stream);
}
RegisterReceiveStream(rtp.remote_ssrc, receive_stream);
=======
RegisterReceiveStream(receive_stream->rtx_ssrc(), receive_stream);
}
RegisterReceiveStream(receive_stream->remote_ssrc(), receive_stream);
>>>>>>> m108
video_receive_streams_.insert(receive_stream);
ConfigureSync(receive_stream->sync_group());
@ -1213,16 +1075,10 @@ void Call::DestroyVideoReceiveStream(
// Remove all ssrcs pointing to a receive stream. As RTX retransmits on a
// separate SSRC there can be either one or two.
<<<<<<< HEAD
UnregisterReceiveStream(rtp.remote_ssrc);
if (rtp.rtx_ssrc) {
UnregisterReceiveStream(rtp.rtx_ssrc);
=======
UnregisterReceiveStream(receive_stream_impl->remote_ssrc());
if (receive_stream_impl->rtx_ssrc()) {
UnregisterReceiveStream(receive_stream_impl->rtx_ssrc());
>>>>>>> m108
}
video_receive_streams_.erase(receive_stream_impl);
ConfigureSync(receive_stream_impl->sync_group());
@ -1250,11 +1106,7 @@ FlexfecReceiveStream* Call::CreateFlexfecReceiveStream(
// TODO(bugs.webrtc.org/11993): Set this up asynchronously on the network
// thread.
receive_stream->RegisterWithTransport(&video_receiver_controller_);
<<<<<<< HEAD
RegisterReceiveStream(config.rtp.remote_ssrc, receive_stream);
=======
RegisterReceiveStream(receive_stream->remote_ssrc(), receive_stream);
>>>>>>> m108
// TODO(brandtr): Store config in RtcEventLog here.
@ -1270,14 +1122,8 @@ void Call::DestroyFlexfecReceiveStream(FlexfecReceiveStream* receive_stream) {
// TODO(bugs.webrtc.org/11993): Unregister on the network thread.
receive_stream_impl->UnregisterFromTransport();
<<<<<<< HEAD
RTC_DCHECK(receive_stream != nullptr);
const FlexfecReceiveStream::RtpConfig& rtp = receive_stream->rtp_config();
UnregisterReceiveStream(rtp.remote_ssrc);
=======
auto ssrc = receive_stream_impl->remote_ssrc();
UnregisterReceiveStream(ssrc);
>>>>>>> m108
// Remove all SSRCs pointing to the FlexfecReceiveStreamImpl to be
// destroyed.
@ -1503,15 +1349,6 @@ void Call::OnAllocationLimitsChanged(BitrateAllocationLimits limits) {
std::memory_order_relaxed);
}
<<<<<<< HEAD
// RTC_RUN_ON(worker_thread_)
AudioReceiveStream* Call::FindAudioStreamForSyncGroup(
const std::string& sync_group) {
RTC_DCHECK_RUN_ON(&receive_11993_checker_);
if (!sync_group.empty()) {
for (AudioReceiveStream* stream : audio_receive_streams_) {
if (stream->config().sync_group == sync_group)
=======
AudioReceiveStreamImpl* Call::FindAudioStreamForSyncGroup(
absl::string_view sync_group) {
RTC_DCHECK_RUN_ON(worker_thread_);
@ -1519,7 +1356,6 @@ AudioReceiveStreamImpl* Call::FindAudioStreamForSyncGroup(
if (!sync_group.empty()) {
for (AudioReceiveStreamImpl* stream : audio_receive_streams_) {
if (stream->sync_group() == sync_group)
>>>>>>> m108
return stream;
}
}
@ -1527,20 +1363,12 @@ AudioReceiveStreamImpl* Call::FindAudioStreamForSyncGroup(
return nullptr;
}
<<<<<<< HEAD
// TODO(bugs.webrtc.org/11993): Expect to be called on the network thread.
// RTC_RUN_ON(worker_thread_)
void Call::ConfigureSync(const std::string& sync_group) {
// `audio_stream` may be nullptr when clearing the audio stream for a group.
AudioReceiveStream* audio_stream = FindAudioStreamForSyncGroup(sync_group);
=======
void Call::ConfigureSync(absl::string_view sync_group) {
// TODO(bugs.webrtc.org/11993): Expect to be called on the network thread.
RTC_DCHECK_RUN_ON(worker_thread_);
// `audio_stream` may be nullptr when clearing the audio stream for a group.
AudioReceiveStreamImpl* audio_stream =
FindAudioStreamForSyncGroup(sync_group);
>>>>>>> m108
size_t num_synced_streams = 0;
for (VideoReceiveStream2* video_stream : video_receive_streams_) {
@ -1707,10 +1535,7 @@ void Call::OnRecoveredPacket(const uint8_t* packet, size_t length) {
void Call::NotifyBweOfReceivedPacket(const RtpPacketReceived& packet,
MediaType media_type,
bool use_send_side_bwe) {
<<<<<<< HEAD
=======
RTC_DCHECK_RUN_ON(worker_thread_);
>>>>>>> m108
RTPHeader header;
packet.GetHeader(&header);
@ -1745,29 +1570,17 @@ bool Call::IdentifyReceivedPacket(RtpPacketReceived& packet,
return false;
}
<<<<<<< HEAD
packet.IdentifyExtensions(
RtpHeaderExtensionMap(it->second->rtp_config().extensions));
if (use_send_side_bwe) {
*use_send_side_bwe = UseSendSideBwe(it->second->rtp_config());
=======
packet.IdentifyExtensions(it->second->GetRtpExtensionMap());
if (use_send_side_bwe) {
*use_send_side_bwe = UseSendSideBwe(it->second);
>>>>>>> m108
}
return true;
}
<<<<<<< HEAD
bool Call::RegisterReceiveStream(uint32_t ssrc, ReceiveStream* stream) {
=======
bool Call::RegisterReceiveStream(uint32_t ssrc,
ReceiveStreamInterface* stream) {
>>>>>>> m108
RTC_DCHECK_RUN_ON(&receive_11993_checker_);
RTC_DCHECK(stream);
auto inserted = receive_rtp_config_.emplace(ssrc, stream);

35
call/call.h
View file

@ -34,41 +34,6 @@
namespace webrtc {
<<<<<<< HEAD
// A restricted way to share the module process thread across multiple instances
// of Call that are constructed on the same worker thread (which is what the
// peer connection factory guarantees).
// SharedModuleThread supports a callback that is issued when only one reference
// remains, which is used to indicate to the original owner that the thread may
// be discarded.
class SharedModuleThread final {
public:
// Allows injection of an externally created process thread.
static rtc::scoped_refptr<SharedModuleThread> Create(
std::unique_ptr<ProcessThread> process_thread,
std::function<void()> on_one_ref_remaining);
void EnsureStarted();
ProcessThread* process_thread();
private:
friend class rtc::scoped_refptr<SharedModuleThread>;
SharedModuleThread(std::unique_ptr<ProcessThread> process_thread,
std::function<void()> on_one_ref_remaining);
~SharedModuleThread();
void AddRef() const;
rtc::RefCountReleaseStatus Release() const;
class Impl;
mutable std::unique_ptr<Impl> impl_;
};
=======
// A Call represents a two-way connection carrying zero or more outgoing
// and incoming media streams, transported over one or more RTP transports.
>>>>>>> m108
// A Call represents a two-way connection carrying zero or more outgoing
// and incoming media streams, transported over one or more RTP transports.

125
call/call_factory.cc
View file

@ -31,115 +31,6 @@
namespace webrtc {
namespace {
using TimeScopedNetworkConfig = DegradedCall::TimeScopedNetworkConfig;
<<<<<<< HEAD
bool ParseConfigParam(const FieldTrialsView& trials,
absl::string_view exp_name,
int* field) {
std::string group = trials.Lookup(exp_name);
if (group.empty())
return false;
return (sscanf(group.c_str(), "%d", field) == 1);
}
absl::optional<TimeScopedNetworkConfig> ParseDegradationConfig(
const FieldTrialsView& trials,
bool send) {
std::string exp_prefix = "WebRTCFakeNetwork";
if (send) {
exp_prefix += "Send";
} else {
exp_prefix += "Receive";
}
TimeScopedNetworkConfig config;
bool configured = false;
configured |=
ParseConfigParam(trials, exp_prefix + "DelayMs", &config.queue_delay_ms);
configured |= ParseConfigParam(trials, exp_prefix + "DelayStdDevMs",
&config.delay_standard_deviation_ms);
int queue_length = 0;
if (ParseConfigParam(trials, exp_prefix + "QueueLength", &queue_length)) {
RTC_CHECK_GE(queue_length, 0);
config.queue_length_packets = queue_length;
configured = true;
}
configured |= ParseConfigParam(trials, exp_prefix + "CapacityKbps",
&config.link_capacity_kbps);
configured |= ParseConfigParam(trials, exp_prefix + "LossPercent",
&config.loss_percent);
int allow_reordering = 0;
if (ParseConfigParam(trials, exp_prefix + "AllowReordering",
&allow_reordering)) {
config.allow_reordering = true;
configured = true;
}
configured |= ParseConfigParam(trials, exp_prefix + "AvgBurstLossLength",
&config.avg_burst_loss_length);
return configured ? absl::optional<TimeScopedNetworkConfig>(config)
: absl::nullopt;
}
std::vector<TimeScopedNetworkConfig> GetNetworkConfigs(
const FieldTrialsView& trials,
bool send) {
FieldTrialStructList<TimeScopedNetworkConfig> trials_list(
{FieldTrialStructMember("queue_length_packets",
[](TimeScopedNetworkConfig* p) {
// FieldTrialParser does not natively support
// size_t type, so use this ugly cast as
// workaround.
return reinterpret_cast<unsigned*>(
&p->queue_length_packets);
}),
FieldTrialStructMember(
"queue_delay_ms",
[](TimeScopedNetworkConfig* p) { return &p->queue_delay_ms; }),
FieldTrialStructMember("delay_standard_deviation_ms",
[](TimeScopedNetworkConfig* p) {
return &p->delay_standard_deviation_ms;
}),
FieldTrialStructMember(
"link_capacity_kbps",
[](TimeScopedNetworkConfig* p) { return &p->link_capacity_kbps; }),
FieldTrialStructMember(
"loss_percent",
[](TimeScopedNetworkConfig* p) { return &p->loss_percent; }),
FieldTrialStructMember(
"allow_reordering",
[](TimeScopedNetworkConfig* p) { return &p->allow_reordering; }),
FieldTrialStructMember("avg_burst_loss_length",
[](TimeScopedNetworkConfig* p) {
return &p->avg_burst_loss_length;
}),
FieldTrialStructMember(
"packet_overhead",
[](TimeScopedNetworkConfig* p) { return &p->packet_overhead; }),
FieldTrialStructMember("codel_active_queue_management",
[](TimeScopedNetworkConfig* p) {
return &p->codel_active_queue_management;
}),
FieldTrialStructMember(
"duration",
[](TimeScopedNetworkConfig* p) { return &p->duration; })},
{});
ParseFieldTrial({&trials_list},
trials.Lookup(send ? "WebRTC-FakeNetworkSendConfig"
: "WebRTC-FakeNetworkReceiveConfig"));
std::vector<TimeScopedNetworkConfig> configs = trials_list.Get();
if (configs.empty()) {
// Try legacy fallback trials.
absl::optional<DegradedCall::TimeScopedNetworkConfig> fallback_config =
ParseDegradationConfig(trials, send);
if (fallback_config.has_value()) {
configs.push_back(*fallback_config);
}
}
return configs;
}
=======
std::vector<TimeScopedNetworkConfig> GetNetworkConfigs(
const FieldTrialsView& trials,
@ -186,7 +77,6 @@ std::vector<TimeScopedNetworkConfig> GetNetworkConfigs(
return trials_list.Get();
}
>>>>>>> m108
} // namespace
CallFactory::CallFactory() {
@ -205,25 +95,10 @@ Call* CallFactory::CreateCall(const Call::Config& config) {
RtpTransportConfig transportConfig = config.ExtractTransportConfig();
<<<<<<< HEAD
if (!send_degradation_configs.empty() ||
!receive_degradation_configs.empty()) {
return new DegradedCall(
std::unique_ptr<Call>(Call::Create(
config, Clock::GetRealTimeClock(),
SharedModuleThread::Create(
ProcessThread::Create("ModuleProcessThread"), nullptr),
config.rtp_transport_controller_send_factory->Create(
transportConfig, Clock::GetRealTimeClock(),
ProcessThread::Create("PacerThread")))),
send_degradation_configs, receive_degradation_configs);
}
=======
Call* call =
Call::Create(config, Clock::GetRealTimeClock(),
config.rtp_transport_controller_send_factory->Create(
transportConfig, Clock::GetRealTimeClock()));
>>>>>>> m108
if (!send_degradation_configs.empty() ||
!receive_degradation_configs.empty()) {

52
call/degraded_call.cc
View file

@ -21,20 +21,12 @@ namespace webrtc {
DegradedCall::FakeNetworkPipeOnTaskQueue::FakeNetworkPipeOnTaskQueue(
TaskQueueBase* task_queue,
<<<<<<< HEAD
const ScopedTaskSafety& task_safety,
=======
rtc::scoped_refptr<PendingTaskSafetyFlag> call_alive,
>>>>>>> m108
Clock* clock,
std::unique_ptr<NetworkBehaviorInterface> network_behavior)
: clock_(clock),
task_queue_(task_queue),
<<<<<<< HEAD
task_safety_(task_safety),
=======
call_alive_(std::move(call_alive)),
>>>>>>> m108
pipe_(clock, std::move(network_behavior)) {}
void DegradedCall::FakeNetworkPipeOnTaskQueue::SendRtp(
@ -71,26 +63,12 @@ bool DegradedCall::FakeNetworkPipeOnTaskQueue::Process() {
return false;
}
<<<<<<< HEAD
task_queue_->PostTask(ToQueuedTask(task_safety_, [this, time_to_next] {
=======
task_queue_->PostTask(SafeTask(call_alive_, [this, time_to_next] {
>>>>>>> m108
RTC_DCHECK_RUN_ON(task_queue_);
int64_t next_process_time = *time_to_next + clock_->TimeInMilliseconds();
if (!next_process_ms_ || next_process_time < *next_process_ms_) {
next_process_ms_ = next_process_time;
task_queue_->PostDelayedHighPrecisionTask(
<<<<<<< HEAD
ToQueuedTask(task_safety_,
[this] {
RTC_DCHECK_RUN_ON(task_queue_);
if (!Process()) {
next_process_ms_.reset();
}
}),
*time_to_next);
=======
SafeTask(call_alive_,
[this] {
RTC_DCHECK_RUN_ON(task_queue_);
@ -99,7 +77,6 @@ bool DegradedCall::FakeNetworkPipeOnTaskQueue::Process() {
}
}),
TimeDelta::Millis(*time_to_next));
>>>>>>> m108
}
}));
@ -205,10 +182,7 @@ DegradedCall::DegradedCall(
const std::vector<TimeScopedNetworkConfig>& receive_configs)
: clock_(Clock::GetRealTimeClock()),
call_(std::move(call)),
<<<<<<< HEAD
=======
call_alive_(PendingTaskSafetyFlag::CreateDetached()),
>>>>>>> m108
send_config_index_(0),
send_configs_(send_configs),
send_simulated_network_(nullptr),
@ -219,13 +193,6 @@ DegradedCall::DegradedCall(
receive_simulated_network_ = network.get();
receive_pipe_ =
std::make_unique<webrtc::FakeNetworkPipe>(clock_, std::move(network));
<<<<<<< HEAD
receive_pipe_->SetReceiver(call_->Receiver());
if (receive_configs_.size() > 1) {
call_->network_thread()->PostDelayedTask(
ToQueuedTask(task_safety_, [this] { UpdateReceiveNetworkConfig(); }),
receive_configs_[0].duration.ms());
=======
packet_receiver_ = std::make_unique<ThreadedPacketReceiver>(
call_->worker_thread(), call_->network_thread(), call_alive_,
call_->Receiver());
@ -234,26 +201,17 @@ DegradedCall::DegradedCall(
call_->network_thread()->PostDelayedTask(
SafeTask(call_alive_, [this] { UpdateReceiveNetworkConfig(); }),
receive_configs_[0].duration);
>>>>>>> m108
}
}
if (!send_configs_.empty()) {
auto network = std::make_unique<SimulatedNetwork>(send_configs_[0]);
send_simulated_network_ = network.get();
send_pipe_ = std::make_unique<FakeNetworkPipeOnTaskQueue>(
<<<<<<< HEAD
call_->network_thread(), task_safety_, clock_, std::move(network));
if (send_configs_.size() > 1) {
call_->network_thread()->PostDelayedTask(
ToQueuedTask(task_safety_, [this] { UpdateSendNetworkConfig(); }),
send_configs_[0].duration.ms());
=======
call_->network_thread(), call_alive_, clock_, std::move(network));
if (send_configs_.size() > 1) {
call_->network_thread()->PostDelayedTask(
SafeTask(call_alive_, [this] { UpdateSendNetworkConfig(); }),
send_configs_[0].duration);
>>>>>>> m108
}
}
}
@ -460,13 +418,8 @@ void DegradedCall::UpdateSendNetworkConfig() {
send_config_index_ = (send_config_index_ + 1) % send_configs_.size();
send_simulated_network_->SetConfig(send_configs_[send_config_index_]);
call_->network_thread()->PostDelayedTask(
<<<<<<< HEAD
ToQueuedTask(task_safety_, [this] { UpdateSendNetworkConfig(); }),
send_configs_[send_config_index_].duration.ms());
=======
SafeTask(call_alive_, [this] { UpdateSendNetworkConfig(); }),
send_configs_[send_config_index_].duration);
>>>>>>> m108
}
void DegradedCall::UpdateReceiveNetworkConfig() {
@ -474,12 +427,7 @@ void DegradedCall::UpdateReceiveNetworkConfig() {
receive_simulated_network_->SetConfig(
receive_configs_[receive_config_index_]);
call_->network_thread()->PostDelayedTask(
<<<<<<< HEAD
ToQueuedTask(task_safety_, [this] { UpdateReceiveNetworkConfig(); }),
receive_configs_[receive_config_index_].duration.ms());
=======
SafeTask(call_alive_, [this] { UpdateReceiveNetworkConfig(); }),
receive_configs_[receive_config_index_].duration);
>>>>>>> m108
}
} // namespace webrtc

13
call/degraded_call.h
View file

@ -40,7 +40,6 @@
#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "system_wrappers/include/clock.h"
#include "video/config/video_encoder_config.h"
@ -123,11 +122,7 @@ class DegradedCall : public Call, private PacketReceiver {
public:
FakeNetworkPipeOnTaskQueue(
TaskQueueBase* task_queue,
<<<<<<< HEAD
const ScopedTaskSafety& task_safety,
=======
rtc::scoped_refptr<PendingTaskSafetyFlag> call_alive,
>>>>>>> m108
Clock* clock,
std::unique_ptr<NetworkBehaviorInterface> network_behavior);
@ -147,11 +142,7 @@ class DegradedCall : public Call, private PacketReceiver {
Clock* const clock_;
TaskQueueBase* const task_queue_;
<<<<<<< HEAD
const ScopedTaskSafety& task_safety_;
=======
rtc::scoped_refptr<PendingTaskSafetyFlag> call_alive_;
>>>>>>> m108
FakeNetworkPipe pipe_;
absl::optional<int64_t> next_process_ms_ RTC_GUARDED_BY(&task_queue_);
};
@ -206,12 +197,8 @@ class DegradedCall : public Call, private PacketReceiver {
Clock* const clock_;
const std::unique_ptr<Call> call_;
<<<<<<< HEAD
ScopedTaskSafety task_safety_;
=======
// For cancelling tasks on the network thread when DegradedCall is destroyed
rtc::scoped_refptr<PendingTaskSafetyFlag> call_alive_;
>>>>>>> m108
size_t send_config_index_;
const std::vector<TimeScopedNetworkConfig> send_configs_;
SimulatedNetwork* send_simulated_network_;

51
call/rampup_tests.cc
View file

@ -336,21 +336,12 @@ void RampUpTester::PollStats() {
}
void RampUpTester::ReportResult(
<<<<<<< HEAD
const std::string& measurement,
size_t value,
const std::string& units,
test::ImproveDirection improve_direction) const {
webrtc::test::PrintResult(
measurement, "",
=======
absl::string_view measurement,
size_t value,
Unit unit,
ImprovementDirection improvement_direction) const {
GetGlobalMetricsLogger()->LogSingleValueMetric(
measurement,
>>>>>>> m108
::testing::UnitTest::GetInstance()->current_test_info()->name(), value,
unit, improvement_direction);
}
@ -407,23 +398,6 @@ void RampUpTester::TriggerTestDone() {
}
if (report_perf_stats_) {
<<<<<<< HEAD
ReportResult("ramp-up-media-sent", media_sent, "bytes",
test::ImproveDirection::kBiggerIsBetter);
ReportResult("ramp-up-padding-sent", padding_sent, "bytes",
test::ImproveDirection::kSmallerIsBetter);
ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes",
test::ImproveDirection::kBiggerIsBetter);
ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes",
test::ImproveDirection::kSmallerIsBetter);
if (ramp_up_finished_ms_ >= 0) {
ReportResult("ramp-up-time", ramp_up_finished_ms_ - test_start_ms_,
"milliseconds", test::ImproveDirection::kSmallerIsBetter);
}
ReportResult("ramp-up-average-network-latency",
send_transport_->GetAverageDelayMs(), "milliseconds",
test::ImproveDirection::kSmallerIsBetter);
=======
ReportResult("ramp-up-media-sent", media_sent, Unit::kBytes,
ImprovementDirection::kBiggerIsBetter);
ReportResult("ramp-up-padding-sent", padding_sent, Unit::kBytes,
@ -439,7 +413,6 @@ void RampUpTester::TriggerTestDone() {
ReportResult("ramp-up-average-network-latency",
send_transport_->GetAverageDelayMs(), Unit::kMilliseconds,
ImprovementDirection::kSmallerIsBetter);
>>>>>>> m108
}
}
@ -564,17 +537,10 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
EXPECT_FALSE(suspended);
if (bitrate_bps >= GetExpectedHighBitrate()) {
if (report_perf_stats_) {
<<<<<<< HEAD
webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
"first_rampup", now - state_start_ms_, "ms",
false,
test::ImproveDirection::kSmallerIsBetter);
=======
GetGlobalMetricsLogger()->LogSingleValueMetric(
"ramp_up_down_up" + GetModifierString(), "first_rampup",
now - state_start_ms_, Unit::kMilliseconds,
ImprovementDirection::kSmallerIsBetter);
>>>>>>> m108
}
// Apply loss during the transition between states if FEC is enabled.
forward_transport_config_.loss_percent = loss_rates_[test_state_];
@ -588,17 +554,10 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
if (bitrate_bps < kLowBandwidthLimitBps + kLowBitrateMarginBps &&
suspended == check_suspend_state) {
if (report_perf_stats_) {
<<<<<<< HEAD
webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
"rampdown", now - state_start_ms_, "ms",
false,
test::ImproveDirection::kSmallerIsBetter);
=======
GetGlobalMetricsLogger()->LogSingleValueMetric(
"ramp_up_down_up" + GetModifierString(), "rampdown",
now - state_start_ms_, Unit::kMilliseconds,
ImprovementDirection::kSmallerIsBetter);
>>>>>>> m108
}
// Apply loss during the transition between states if FEC is enabled.
forward_transport_config_.loss_percent = loss_rates_[test_state_];
@ -610,15 +569,6 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
case kSecondRampup:
if (bitrate_bps >= GetExpectedHighBitrate() && !suspended) {
if (report_perf_stats_) {
<<<<<<< HEAD
webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
"second_rampup", now - state_start_ms_,
"ms", false,
test::ImproveDirection::kSmallerIsBetter);
ReportResult("ramp-up-down-up-average-network-latency",
send_transport_->GetAverageDelayMs(), "milliseconds",
test::ImproveDirection::kSmallerIsBetter);
=======
GetGlobalMetricsLogger()->LogSingleValueMetric(
"ramp_up_down_up" + GetModifierString(), "second_rampup",
now - state_start_ms_, Unit::kMilliseconds,
@ -627,7 +577,6 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
send_transport_->GetAverageDelayMs(),
Unit::kMilliseconds,
ImprovementDirection::kSmallerIsBetter);
>>>>>>> m108
}
// Apply loss during the transition between states if FEC is enabled.
forward_transport_config_.loss_percent = loss_rates_[test_state_];

6
call/rampup_tests.h
View file

@ -27,7 +27,6 @@
#include "rtc_base/event.h"
#include "rtc_base/task_utils/repeating_task.h"
#include "test/call_test.h"
#include "test/testsupport/perf_test.h"
namespace webrtc {
@ -69,13 +68,8 @@ class RampUpTester : public test::EndToEndTest {
void ReportResult(absl::string_view measurement,
size_t value,
<<<<<<< HEAD
const std::string& units,
test::ImproveDirection improve_direction) const;
=======
test::Unit unit,
test::ImprovementDirection improvement_direction) const;
>>>>>>> m108
void TriggerTestDone();
Clock* const clock_;

8
call/rtp_demuxer_unittest.cc
View file

@ -61,20 +61,12 @@ class RtpDemuxerTest : public ::testing::Test {
return AddSink(criteria, sink);
}
<<<<<<< HEAD
bool AddSinkOnlyRsid(const std::string& rsid, RtpPacketSinkInterface* sink) {
=======
bool AddSinkOnlyRsid(absl::string_view rsid, RtpPacketSinkInterface* sink) {
>>>>>>> m108
RtpDemuxerCriteria criteria(absl::string_view(), rsid);
return AddSink(criteria, sink);
}
<<<<<<< HEAD
bool AddSinkOnlyMid(const std::string& mid, RtpPacketSinkInterface* sink) {
=======
bool AddSinkOnlyMid(absl::string_view mid, RtpPacketSinkInterface* sink) {
>>>>>>> m108
RtpDemuxerCriteria criteria(mid);
return AddSink(criteria, sink);
}

103
call/rtp_transport_controller_send.cc
View file

@ -76,16 +76,9 @@ bool IsRelayed(const rtc::NetworkRoute& route) {
RtpTransportControllerSend::PacerSettings::PacerSettings(
const FieldTrialsView& trials)
<<<<<<< HEAD
: tq_disabled("Disabled"),
holdback_window("holdback_window", TimeDelta::Millis(5)),
holdback_packets("holdback_packets", 3) {
ParseFieldTrial({&tq_disabled, &holdback_window, &holdback_packets},
=======
: holdback_window("holdback_window", TimeDelta::Millis(5)),
holdback_packets("holdback_packets", 3) {
ParseFieldTrial({&holdback_window, &holdback_packets},
>>>>>>> m108
trials.Lookup("WebRTC-TaskQueuePacer"));
}
@ -102,25 +95,6 @@ RtpTransportControllerSend::RtpTransportControllerSend(
task_queue_factory_(task_queue_factory),
bitrate_configurator_(bitrate_config),
pacer_started_(false),
<<<<<<< HEAD
process_thread_(std::move(process_thread)),
pacer_settings_(trials),
process_thread_pacer_(pacer_settings_.use_task_queue_pacer()
? nullptr
: new PacedSender(clock,
&packet_router_,
trials,
process_thread_.get())),
task_queue_pacer_(
pacer_settings_.use_task_queue_pacer()
? new TaskQueuePacedSender(clock,
&packet_router_,
trials,
task_queue_factory,
pacer_settings_.holdback_window.Get(),
pacer_settings_.holdback_packets.Get())
: nullptr),
=======
pacer_settings_(trials),
pacer_(clock,
&packet_router_,
@ -128,7 +102,6 @@ RtpTransportControllerSend::RtpTransportControllerSend(
task_queue_factory,
pacer_settings_.holdback_window.Get(),
pacer_settings_.holdback_packets.Get()),
>>>>>>> m108
observer_(nullptr),
controller_factory_override_(controller_factory),
controller_factory_fallback_(
@ -147,13 +120,7 @@ RtpTransportControllerSend::RtpTransportControllerSend(
congestion_window_size_(DataSize::PlusInfinity()),
is_congested_(false),
retransmission_rate_limiter_(clock, kRetransmitWindowSizeMs),
<<<<<<< HEAD
task_queue_(task_queue_factory->CreateTaskQueue(
"rtp_send_controller",
TaskQueueFactory::Priority::NORMAL)),
=======
task_queue_(trials, "rtp_send_controller", task_queue_factory),
>>>>>>> m108
field_trials_(trials) {
ParseFieldTrial({&relay_bandwidth_cap_},
trials.Lookup("WebRTC-Bwe-NetworkRouteConstraints"));
@ -162,17 +129,8 @@ RtpTransportControllerSend::RtpTransportControllerSend(
initial_config_.key_value_config = &trials;
RTC_DCHECK(bitrate_config.start_bitrate_bps > 0);
<<<<<<< HEAD
pacer()->SetPacingRates(
DataRate::BitsPerSec(bitrate_config.start_bitrate_bps), DataRate::Zero());
if (absl::StartsWith(trials.Lookup("WebRTC-LazyPacerStart"), "Disabled")) {
EnsureStarted();
}
=======
pacer_.SetPacingRates(DataRate::BitsPerSec(bitrate_config.start_bitrate_bps),
DataRate::Zero());
>>>>>>> m108
}
RtpTransportControllerSend::~RtpTransportControllerSend() {
@ -207,11 +165,7 @@ RtpVideoSenderInterface* RtpTransportControllerSend::CreateRtpVideoSender(
this, event_log, &retransmission_rate_limiter_, std::move(fec_controller),
frame_encryption_config.frame_encryptor,
frame_encryption_config.crypto_options, std::move(frame_transformer),
<<<<<<< HEAD
field_trials_));
=======
field_trials_, task_queue_factory_));
>>>>>>> m108
return video_rtp_senders_.back().get();
}
@ -244,24 +198,7 @@ void RtpTransportControllerSend::UpdateCongestedState() {
congestion_window_size_;
if (congested != is_congested_) {
is_congested_ = congested;
<<<<<<< HEAD
pacer()->SetCongested(congested);
}
}
RtpPacketPacer* RtpTransportControllerSend::pacer() {
if (pacer_settings_.use_task_queue_pacer()) {
return task_queue_pacer_.get();
}
return process_thread_pacer_.get();
}
const RtpPacketPacer* RtpTransportControllerSend::pacer() const {
if (pacer_settings_.use_task_queue_pacer()) {
return task_queue_pacer_.get();
=======
pacer_.SetCongested(congested);
>>>>>>> m108
}
}
@ -284,14 +221,7 @@ RtpTransportControllerSend::transport_feedback_observer() {
}
RtpPacketSender* RtpTransportControllerSend::packet_sender() {
<<<<<<< HEAD
if (pacer_settings_.use_task_queue_pacer()) {
return task_queue_pacer_.get();
}
return process_thread_pacer_.get();
=======
return &pacer_;
>>>>>>> m108
}
void RtpTransportControllerSend::SetAllocatedSendBitrateLimits(
@ -418,11 +348,7 @@ void RtpTransportControllerSend::OnNetworkRouteChanged(
UpdateInitialConstraints(msg.constraints);
}
is_congested_ = false;
<<<<<<< HEAD
pacer()->SetCongested(false);
=======
pacer_.SetCongested(false);
>>>>>>> m108
});
}
}
@ -444,11 +370,7 @@ void RtpTransportControllerSend::OnNetworkAvailability(bool network_available) {
pacer_.Pause();
}
is_congested_ = false;
<<<<<<< HEAD
pacer()->SetCongested(false);
=======
pacer_.SetCongested(false);
>>>>>>> m108
if (controller_) {
control_handler_->SetNetworkAvailability(network_available_);
@ -482,22 +404,6 @@ void RtpTransportControllerSend::EnablePeriodicAlrProbing(bool enable) {
}
void RtpTransportControllerSend::OnSentPacket(
const rtc::SentPacket& sent_packet) {
<<<<<<< HEAD
task_queue_.PostTask([this, sent_packet]() {
RTC_DCHECK_RUN_ON(&task_queue_);
absl::optional<SentPacket> packet_msg =
transport_feedback_adapter_.ProcessSentPacket(sent_packet);
if (packet_msg) {
// Only update outstanding data if:
// 1. Packet feadback is used.
// 2. The packet has not yet received an acknowledgement.
// 3. It is not a retransmission of an earlier packet.
UpdateCongestedState();
if (controller_)
PostUpdates(controller_->OnSentPacket(*packet_msg));
}
});
=======
// Normally called on the network thread !
// We can not use SafeTask here if we are using an owned task queue, because
@ -520,7 +426,6 @@ void RtpTransportControllerSend::OnSentPacket(
PostUpdates(controller_->OnSentPacket(*packet_msg));
}
}));
>>>>>>> m108
}
void RtpTransportControllerSend::OnReceivedPacket(
@ -608,15 +513,7 @@ void RtpTransportControllerSend::IncludeOverheadInPacedSender() {
void RtpTransportControllerSend::EnsureStarted() {
if (!pacer_started_) {
pacer_started_ = true;
<<<<<<< HEAD
if (pacer_settings_.use_task_queue_pacer()) {
task_queue_pacer_->EnsureStarted();
} else {
process_thread_->Start();
}
=======
pacer_.EnsureStarted();
>>>>>>> m108
}
}

29
call/rtp_transport_controller_send.h
View file

@ -33,11 +33,7 @@
#include "modules/pacing/packet_router.h"
#include "modules/pacing/rtp_packet_pacer.h"
#include "modules/pacing/task_queue_paced_sender.h"
<<<<<<< HEAD
#include "modules/utility/include/process_thread.h"
=======
#include "modules/utility/maybe_worker_thread.h"
>>>>>>> m108
#include "rtc_base/network_route.h"
#include "rtc_base/race_checker.h"
#include "rtc_base/task_queue.h"
@ -136,12 +132,6 @@ class RtpTransportControllerSend final
struct PacerSettings {
explicit PacerSettings(const FieldTrialsView& trials);
<<<<<<< HEAD
bool use_task_queue_pacer() const { return !tq_disabled.Get(); }
FieldTrialFlag tq_disabled; // Kill-switch not normally used.
=======
>>>>>>> m108
FieldTrialParameter<TimeDelta> holdback_window;
FieldTrialParameter<int> holdback_packets;
};
@ -164,11 +154,6 @@ class RtpTransportControllerSend final
void PostUpdates(NetworkControlUpdate update) RTC_RUN_ON(task_queue_);
void UpdateControlState() RTC_RUN_ON(task_queue_);
void UpdateCongestedState() RTC_RUN_ON(task_queue_);
<<<<<<< HEAD
RtpPacketPacer* pacer();
const RtpPacketPacer* pacer() const;
=======
>>>>>>> m108
Clock* const clock_;
RtcEventLog* const event_log_;
@ -180,15 +165,8 @@ class RtpTransportControllerSend final
RtpBitrateConfigurator bitrate_configurator_;
std::map<std::string, rtc::NetworkRoute> network_routes_;
bool pacer_started_;
<<<<<<< HEAD
const std::unique_ptr<ProcessThread> process_thread_;
const PacerSettings pacer_settings_;
std::unique_ptr<PacedSender> process_thread_pacer_;
std::unique_ptr<TaskQueuePacedSender> task_queue_pacer_;
=======
const PacerSettings pacer_settings_;
TaskQueuePacedSender pacer_;
>>>>>>> m108
TargetTransferRateObserver* observer_ RTC_GUARDED_BY(task_queue_);
TransportFeedbackDemuxer feedback_demuxer_;
@ -232,15 +210,8 @@ class RtpTransportControllerSend final
// Protected by internal locks.
RateLimiter retransmission_rate_limiter_;
<<<<<<< HEAD
// TODO(perkj): `task_queue_` is supposed to replace `process_thread_`.
// `task_queue_` is defined last to ensure all pending tasks are cancelled
// and deleted before any other members.
rtc::TaskQueue task_queue_;
=======
ScopedTaskSafety safety_;
MaybeWorkerThread task_queue_;
>>>>>>> m108
const FieldTrialsView& field_trials_;
};

9
call/rtp_transport_controller_send_factory.h
View file

@ -23,21 +23,12 @@ class RtpTransportControllerSendFactory
public:
std::unique_ptr<RtpTransportControllerSendInterface> Create(
const RtpTransportConfig& config,
<<<<<<< HEAD
Clock* clock,
std::unique_ptr<ProcessThread> process_thread) override {
=======
Clock* clock) override {
>>>>>>> m108
RTC_CHECK(config.trials);
return std::make_unique<RtpTransportControllerSend>(
clock, config.event_log, config.network_state_predictor_factory,
config.network_controller_factory, config.bitrate_config,
<<<<<<< HEAD
std::move(process_thread), config.task_queue_factory, *config.trials);
=======
config.task_queue_factory, *config.trials);
>>>>>>> m108
}
virtual ~RtpTransportControllerSendFactory() {}

15
call/rtp_video_sender.h
View file

@ -24,11 +24,8 @@
#include "api/field_trials_view.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "api/sequence_checker.h"
<<<<<<< HEAD
=======
#include "api/task_queue/task_queue_base.h"
#include "api/task_queue/task_queue_factory.h"
>>>>>>> m108
#include "api/video_codecs/video_encoder.h"
#include "call/rtp_config.h"
#include "call/rtp_payload_params.h"
@ -91,12 +88,8 @@ class RtpVideoSender : public RtpVideoSenderInterface,
FrameEncryptorInterface* frame_encryptor,
const CryptoOptions& crypto_options, // move inside RtpTransport
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
<<<<<<< HEAD
const FieldTrialsView& field_trials);
=======
const FieldTrialsView& field_trials,
TaskQueueFactory* task_queue_factory);
>>>>>>> m108
~RtpVideoSender() override;
RtpVideoSender(const RtpVideoSender&) = delete;
@ -169,10 +162,6 @@ class RtpVideoSender : public RtpVideoSenderInterface,
void UpdateModuleSendingState() RTC_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
void ConfigureProtection();
void ConfigureSsrcs(const std::map<uint32_t, RtpState>& suspended_ssrcs);
<<<<<<< HEAD
void ConfigureRids();
=======
>>>>>>> m108
bool NackEnabled() const;
uint32_t GetPacketizationOverheadRate() const;
DataRate CalculateOverheadRate(DataRate data_rate,
@ -184,10 +173,6 @@ class RtpVideoSender : public RtpVideoSenderInterface,
const bool send_side_bwe_with_overhead_;
const bool use_frame_rate_for_overhead_;
const bool has_packet_feedback_;
<<<<<<< HEAD
const bool simulate_generic_structure_;
=======
>>>>>>> m108
// Semantically equivalent to checking for `transport_->GetWorkerQueue()`
// but some tests need to be updated to call from the correct context.

86
call/rtp_video_sender_unittest.cc
View file

@ -129,17 +129,6 @@ class RtpVideoSenderTestFixture {
payload_type)),
send_delay_stats_(time_controller_.GetClock()),
bitrate_config_(GetBitrateConfig()),
<<<<<<< HEAD
transport_controller_(
time_controller_.GetClock(),
&event_log_,
nullptr,
nullptr,
bitrate_config_,
time_controller_.CreateProcessThread("PacerThread"),
time_controller_.GetTaskQueueFactory(),
field_trials ? *field_trials : field_trials_),
=======
transport_controller_(time_controller_.GetClock(),
&event_log_,
nullptr,
@ -147,7 +136,6 @@ class RtpVideoSenderTestFixture {
bitrate_config_,
time_controller_.GetTaskQueueFactory(),
field_trials ? *field_trials : field_trials_),
>>>>>>> m108
stats_proxy_(time_controller_.GetClock(),
config_,
VideoEncoderConfig::ContentType::kRealtimeVideo,
@ -165,12 +153,8 @@ class RtpVideoSenderTestFixture {
&transport_controller_, &event_log_, &retransmission_rate_limiter_,
std::make_unique<FecControllerDefault>(time_controller_.GetClock()),
nullptr, CryptoOptions{}, frame_transformer,
<<<<<<< HEAD
field_trials ? *field_trials : field_trials_);
=======
field_trials ? *field_trials : field_trials_,
time_controller_.GetTaskQueueFactory());
>>>>>>> m108
}
RtpVideoSenderTestFixture(
@ -221,20 +205,11 @@ class RtpVideoSenderTestFixture {
// default thread as the transport queue, explicit checks for the transport
// queue (not just using a SequenceChecker) aren't possible unless such a
// queue is actually active. So RunOnTransportQueue is a convenience function
<<<<<<< HEAD
// that allow for running a closure on the transport queue, similar to
// SendTask().
template <typename Closure>
void RunOnTransportQueue(Closure&& task) {
transport_controller_.GetWorkerQueue()->PostTask(std::move(task));
AdvanceTime(TimeDelta::Millis(0));
=======
// that allow for running a `task` on the transport queue, similar to
// SendTask().
void RunOnTransportQueue(absl::AnyInvocable<void() &&> task) {
transport_controller_.GetWorkerQueue()->RunOrPost(std::move(task));
AdvanceTime(TimeDelta::Zero());
>>>>>>> m108
}
private:
@ -1067,67 +1042,6 @@ TEST(RtpVideoSenderTest, SupportsStoppingUsingDependencyDescriptor) {
sent_packets.back().HasExtension<RtpDependencyDescriptorExtension>());
}
<<<<<<< HEAD
TEST(RtpVideoSenderTest,
SupportsStoppingUsingDependencyDescriptorForVp8Simulcast) {
RtpVideoSenderTestFixture test({kSsrc1, kSsrc2}, {}, kPayloadType, {});
test.SetActive(true);
RtpHeaderExtensionMap extensions;
extensions.Register<RtpDependencyDescriptorExtension>(
kDependencyDescriptorExtensionId);
std::vector<RtpPacket> sent_packets;
ON_CALL(test.transport(), SendRtp)
.WillByDefault([&](const uint8_t* packet, size_t length,
const PacketOptions& options) {
sent_packets.emplace_back(&extensions);
EXPECT_TRUE(sent_packets.back().Parse(packet, length));
return true;
});
const uint8_t kPayload[1] = {'a'};
EncodedImage encoded_image;
encoded_image.SetTimestamp(1);
encoded_image.capture_time_ms_ = 2;
encoded_image.SetEncodedData(
EncodedImageBuffer::Create(kPayload, sizeof(kPayload)));
// VP8 simulcast uses spatial index to communicate simulcast stream.
encoded_image.SetSpatialIndex(1);
CodecSpecificInfo codec_specific;
codec_specific.codecType = VideoCodecType::kVideoCodecVP8;
codec_specific.template_structure.emplace();
codec_specific.template_structure->num_decode_targets = 1;
codec_specific.template_structure->templates = {
FrameDependencyTemplate().T(0).Dtis("S")};
// Send two tiny images, mapping to single RTP packets.
// Send in a key frame.
encoded_image._frameType = VideoFrameType::kVideoFrameKey;
codec_specific.generic_frame_info =
GenericFrameInfo::Builder().T(0).Dtis("S").Build();
codec_specific.generic_frame_info->encoder_buffers = {{0, false, true}};
EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
EncodedImageCallback::Result::OK);
test.AdvanceTime(TimeDelta::Millis(33));
ASSERT_THAT(sent_packets, SizeIs(1));
EXPECT_TRUE(
sent_packets.back().HasExtension<RtpDependencyDescriptorExtension>());
// Send in a new key frame without the support for the dependency descriptor.
encoded_image._frameType = VideoFrameType::kVideoFrameKey;
codec_specific.template_structure = absl::nullopt;
codec_specific.generic_frame_info = absl::nullopt;
EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
EncodedImageCallback::Result::OK);
test.AdvanceTime(TimeDelta::Millis(33));
ASSERT_THAT(sent_packets, SizeIs(2));
EXPECT_FALSE(
sent_packets.back().HasExtension<RtpDependencyDescriptorExtension>());
}
=======
>>>>>>> m108
TEST(RtpVideoSenderTest, CanSetZeroBitrate) {
RtpVideoSenderTestFixture test({kSsrc1}, {kRtxSsrc1}, kPayloadType, {});
test.router()->OnBitrateUpdated(CreateBitrateAllocationUpdate(0),

4
call/version.cc
View file

@ -13,11 +13,7 @@
namespace webrtc {
// The timestamp is always in UTC.
<<<<<<< HEAD
const char* const kSourceTimestamp = "WebRTC source stamp 2022-04-14T04:03:30";
=======
const char* const kSourceTimestamp = "WebRTC source stamp 2022-10-09T04:11:21";
>>>>>>> m108
void LoadWebRTCVersionInRegister() {
// Using volatile to instruct the compiler to not optimize `p` away even

3
call/video_receive_stream.h
View file

@ -287,8 +287,6 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface {
virtual void SetRtcpMode(RtcpMode mode) = 0;
<<<<<<< HEAD
=======
// Sets or clears a flexfec RTP sink. This affects `rtp.packet_sink_` and
// `rtp.protected_by_flexfec` parts of the configuration. Must be called on
// the packet delivery thread.
@ -317,7 +315,6 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface {
virtual ~VideoReceiveStreamInterface() {}
};
>>>>>>> m108
} // namespace webrtc
#endif // CALL_VIDEO_RECEIVE_STREAM_H_

12
common_audio/BUILD.gn
View file

@ -49,10 +49,6 @@ rtc_library("common_audio") {
"../rtc_base:checks",
"../rtc_base:gtest_prod",
"../rtc_base:logging",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:safe_conversions",
"../rtc_base:sanitizer",
"../rtc_base:timeutils",
@ -201,10 +197,6 @@ rtc_library("common_audio_cc") {
]
deps = [
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:safe_conversions",
"../system_wrappers",
]
@ -382,10 +374,6 @@ if (rtc_include_tests && !build_with_chromium) {
":sinc_resampler",
"../rtc_base:checks",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:stringutils",
"../rtc_base:timeutils",

14
common_video/BUILD.gn
View file

@ -39,10 +39,7 @@ rtc_library("common_video") {
deps = [
"../api:array_view",
<<<<<<< HEAD
=======
"../api:make_ref_counted",
>>>>>>> m108
"../api:scoped_refptr",
"../api:sequence_checker",
"../api/task_queue",
@ -57,12 +54,6 @@ rtc_library("common_video") {
"../api/video_codecs:bitstream_parser_api",
"../api/video_codecs:video_codecs_api",
"../rtc_base",
<<<<<<< HEAD
"../rtc_base:bitstream_reader",
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
=======
"../rtc_base:bit_buffer",
"../rtc_base:bitstream_reader",
"../rtc_base:buffer",
@ -72,7 +63,6 @@ rtc_library("common_video") {
"../rtc_base:macromagic",
"../rtc_base:race_checker",
"../rtc_base:rate_statistics",
>>>>>>> m108
"../rtc_base:refcount",
"../rtc_base:rtc_task_queue",
"../rtc_base:safe_minmax",
@ -135,10 +125,6 @@ if (rtc_include_tests && !build_with_chromium) {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:timeutils",
"../system_wrappers:system_wrappers",

3
common_video/include/video_frame_buffer_pool.h
View file

@ -48,11 +48,8 @@ class VideoFrameBufferPool {
rtc::scoped_refptr<I420Buffer> CreateI420Buffer(int width, int height);
rtc::scoped_refptr<I422Buffer> CreateI422Buffer(int width, int height);
rtc::scoped_refptr<I444Buffer> CreateI444Buffer(int width, int height);
<<<<<<< HEAD
=======
rtc::scoped_refptr<I010Buffer> CreateI010Buffer(int width, int height);
rtc::scoped_refptr<I210Buffer> CreateI210Buffer(int width, int height);
>>>>>>> m108
rtc::scoped_refptr<NV12Buffer> CreateNV12Buffer(int width, int height);
// Changes the max amount of buffers in the pool to the new value.

3
common_video/video_frame_buffer_pool.cc
View file

@ -36,8 +36,6 @@ bool HasOneRef(const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
return static_cast<rtc::RefCountedObject<I422Buffer>*>(buffer.get())
->HasOneRef();
}
<<<<<<< HEAD
=======
case VideoFrameBuffer::Type::kI010: {
return static_cast<rtc::RefCountedObject<I010Buffer>*>(buffer.get())
->HasOneRef();
@ -46,7 +44,6 @@ bool HasOneRef(const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
return static_cast<rtc::RefCountedObject<I210Buffer>*>(buffer.get())
->HasOneRef();
}
>>>>>>> m108
case VideoFrameBuffer::Type::kNV12: {
return static_cast<rtc::RefCountedObject<NV12Buffer>*>(buffer.get())
->HasOneRef();

30
common_video/video_frame_unittest.cc
View file

@ -45,11 +45,8 @@ SubSampling SubSamplingForType(VideoFrameBuffer::Type type) {
return {.x = 1, .y = 1};
case VideoFrameBuffer::Type::kI010:
return {.x = 2, .y = 2};
<<<<<<< HEAD
=======
case VideoFrameBuffer::Type::kI210:
return {.x = 2, .y = 1};
>>>>>>> m108
default:
return {};
}
@ -178,14 +175,6 @@ void CheckRotate(int width,
int x = corners[j].x * (rotated_width - 1);
int y = corners[j].y * (rotated_height - 1);
EXPECT_EQ(colors[i].y, rotated.DataY()[x + y * rotated.StrideY()]);
<<<<<<< HEAD
EXPECT_EQ(colors[i].u,
rotated.DataU()[(x / plane_divider.x) +
(y / plane_divider.y) * rotated.StrideU()]);
EXPECT_EQ(colors[i].v,
rotated.DataV()[(x / plane_divider.x) +
(y / plane_divider.y) * rotated.StrideV()]);
=======
if (rotated.type() == VideoFrameBuffer::Type::kI422 ||
rotated.type() == VideoFrameBuffer::Type::kI210) {
EXPECT_NEAR(colors[i].u,
@ -204,7 +193,6 @@ void CheckRotate(int width,
rotated.DataV()[(x / plane_divider.x) +
(y / plane_divider.y) * rotated.StrideV()]);
}
>>>>>>> m108
}
}
@ -314,12 +302,8 @@ rtc::scoped_refptr<T> CreateAndFillBuffer() {
if (buf->type() == VideoFrameBuffer::Type::kI444) {
memset(buf->MutableDataU(), 2, 200);
memset(buf->MutableDataV(), 3, 200);
<<<<<<< HEAD
} else if (buf->type() == VideoFrameBuffer::Type::kI422) {
=======
} else if (buf->type() == VideoFrameBuffer::Type::kI422 ||
buf->type() == VideoFrameBuffer::Type::kI210) {
>>>>>>> m108
memset(buf->MutableDataU(), 2, 100);
memset(buf->MutableDataV(), 3, 100);
} else {
@ -400,13 +384,8 @@ REGISTER_TYPED_TEST_SUITE_P(TestPlanarYuvBuffer,
CropYNotCenter,
CropAndScale16x9);
<<<<<<< HEAD
using TestTypesAll =
::testing::Types<I420Buffer, I010Buffer, I444Buffer, I422Buffer>;
=======
using TestTypesAll = ::testing::
Types<I420Buffer, I010Buffer, I444Buffer, I422Buffer, I210Buffer>;
>>>>>>> m108
INSTANTIATE_TYPED_TEST_SUITE_P(All, TestPlanarYuvBuffer, TestTypesAll);
template <class T>
@ -424,11 +403,7 @@ TYPED_TEST_P(TestPlanarYuvBufferScale, Scale) {
REGISTER_TYPED_TEST_SUITE_P(TestPlanarYuvBufferScale, Scale);
<<<<<<< HEAD
using TestTypesScale = ::testing::Types<I420Buffer, I010Buffer>;
=======
using TestTypesScale = ::testing::Types<I420Buffer, I010Buffer, I210Buffer>;
>>>>>>> m108
INSTANTIATE_TYPED_TEST_SUITE_P(All, TestPlanarYuvBufferScale, TestTypesScale);
template <class T>
@ -452,13 +427,8 @@ TYPED_TEST_P(TestPlanarYuvBufferRotate, Rotates) {
REGISTER_TYPED_TEST_SUITE_P(TestPlanarYuvBufferRotate, Rotates);
<<<<<<< HEAD
using TestTypesRotate =
::testing::Types<I420Buffer, I010Buffer, I444Buffer, I422Buffer>;
=======
using TestTypesRotate = ::testing::
Types<I420Buffer, I010Buffer, I444Buffer, I422Buffer, I210Buffer>;
>>>>>>> m108
INSTANTIATE_TYPED_TEST_SUITE_P(Rotate,
TestPlanarYuvBufferRotate,
TestTypesRotate);

8
examples/BUILD.gn
View file

@ -781,10 +781,6 @@ if (is_linux || is_chromeos || is_win) {
]
deps = [
"../rtc_base:checks",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:stringutils",
"../system_wrappers:field_trial",
"../test:field_trial",
@ -943,10 +939,6 @@ if (!build_with_chromium) {
"../rtc_base",
"../rtc_base:checks",
"../rtc_base:logging",
<<<<<<< HEAD
"../rtc_base:rtc_base_approved",
=======
>>>>>>> m108
"../rtc_base:socket_address",
"../rtc_base:threading",
"../rtc_base:timeutils",

8
examples/androidnativeapi/jni/android_call_client.cc
View file

@ -208,11 +208,7 @@ void AndroidCallClient::CreatePeerConnection() {
void AndroidCallClient::Connect() {
webrtc::MutexLock lock(&pc_mutex_);
<<<<<<< HEAD
pc_->CreateOffer(rtc::make_ref_counted<CreateOfferObserver>(pc_),
=======
pc_->CreateOffer(rtc::make_ref_counted<CreateOfferObserver>(pc_).get(),
>>>>>>> m108
webrtc::PeerConnectionInterface::RTCOfferAnswerOptions());
}
@ -262,11 +258,7 @@ void CreateOfferObserver::OnSuccess(webrtc::SessionDescriptionInterface* desc) {
// Ownership of desc was transferred to us, now we transfer it forward.
pc_->SetLocalDescription(
<<<<<<< HEAD
rtc::make_ref_counted<SetLocalSessionDescriptionObserver>(), desc);
=======
rtc::make_ref_counted<SetLocalSessionDescriptionObserver>().get(), desc);
>>>>>>> m108
// Generate a fake answer.
std::unique_ptr<webrtc::SessionDescriptionInterface> answer(

8
examples/objcnativeapi/objc/objc_call_client.mm
View file

@ -167,11 +167,7 @@ void ObjCCallClient::CreatePeerConnection() {
void ObjCCallClient::Connect() {
webrtc::MutexLock lock(&pc_mutex_);
<<<<<<< HEAD
pc_->CreateOffer(rtc::make_ref_counted<CreateOfferObserver>(pc_),
=======
pc_->CreateOffer(rtc::make_ref_counted<CreateOfferObserver>(pc_).get(),
>>>>>>> m108
webrtc::PeerConnectionInterface::RTCOfferAnswerOptions());
}
@ -217,12 +213,8 @@ void CreateOfferObserver::OnSuccess(webrtc::SessionDescriptionInterface* desc) {
RTC_LOG(LS_INFO) << "Created offer: " << sdp;
// Ownership of desc was transferred to us, now we transfer it forward.
<<<<<<< HEAD
pc_->SetLocalDescription(rtc::make_ref_counted<SetLocalSessionDescriptionObserver>(), desc);
=======
pc_->SetLocalDescription(absl::WrapUnique(desc),
rtc::make_ref_counted<SetLocalSessionDescriptionObserver>());
>>>>>>> m108
// Generate a fake answer.
std::unique_ptr<webrtc::SessionDescriptionInterface> answer(

4
examples/peerconnection/client/conductor.cc
View file

@ -57,11 +57,7 @@ const char kSessionDescriptionSdpName[] = "sdp";
class DummySetSessionDescriptionObserver
: public webrtc::SetSessionDescriptionObserver {
public:
<<<<<<< HEAD
static DummySetSessionDescriptionObserver* Create() {
=======
static rtc::scoped_refptr<DummySetSessionDescriptionObserver> Create() {
>>>>>>> m108
return rtc::make_ref_counted<DummySetSessionDescriptionObserver>();
}
virtual void OnSuccess() { RTC_LOG(LS_INFO) << __FUNCTION__; }

5
examples/peerconnection/client/peer_connection_client.cc
View file

@ -479,13 +479,8 @@ void PeerConnectionClient::OnClose(rtc::Socket* socket, int err) {
} else {
if (socket == control_socket_.get()) {
RTC_LOG(LS_WARNING) << "Connection refused; retrying in 2 seconds";
<<<<<<< HEAD
rtc::Thread::Current()->PostDelayed(RTC_FROM_HERE, kReconnectDelay, this,
0);
=======
rtc::Thread::Current()->PostDelayedTask(
SafeTask(safety_.flag(), [this] { DoConnect(); }), kReconnectDelay);
>>>>>>> m108
} else {
Close();
callback_->OnDisconnected();

4
examples/unityplugin/simple_peer_connection.cc
View file

@ -98,11 +98,7 @@ std::string GetPeerConnectionString() {
class DummySetSessionDescriptionObserver
: public webrtc::SetSessionDescriptionObserver {
public:
<<<<<<< HEAD
static DummySetSessionDescriptionObserver* Create() {
=======
static rtc::scoped_refptr<DummySetSessionDescriptionObserver> Create() {
>>>>>>> m108
return rtc::make_ref_counted<DummySetSessionDescriptionObserver>();
}
virtual void OnSuccess() { RTC_LOG(LS_INFO) << __FUNCTION__; }

12
infra/config/commit-queue.cfg
View file

@ -146,11 +146,6 @@ config_groups {
name: "webrtc/try/mac_compile_dbg"
}
builders {
<<<<<<< HEAD
name: "webrtc/try/mac_rel"
}
builders {
=======
name: "webrtc/try/mac_dbg_m1"
}
builders {
@ -160,7 +155,6 @@ config_groups {
name: "webrtc/try/mac_rel_m1"
}
builders {
>>>>>>> m108
name: "webrtc/try/presubmit"
disable_reuse: true
}
@ -313,11 +307,6 @@ config_groups {
name: "webrtc/try/mac_compile_dbg"
}
builders {
<<<<<<< HEAD
name: "webrtc/try/mac_rel"
}
builders {
=======
name: "webrtc/try/mac_dbg_m1"
}
builders {
@ -327,7 +316,6 @@ config_groups {
name: "webrtc/try/mac_rel_m1"
}
builders {
>>>>>>> m108
name: "webrtc/try/presubmit"
disable_reuse: true
}

137
infra/config/config.star
View file

@ -13,10 +13,6 @@ lucicfg.check_version("1.30.9")
WEBRTC_GIT = "https://webrtc.googlesource.com/src"
WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src"
WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com"
<<<<<<< HEAD
WEBRTC_IOS_XCODE_VERSION = "12a7209"
=======
>>>>>>> m108
WEBRTC_XCODE13 = "13c100"
DEFAULT_CPU = "x86-64"
@ -41,8 +37,6 @@ def make_goma_properties(enable_ats = True, jobs = None):
goma_properties["jobs"] = jobs
return {"$build/goma": goma_properties}
<<<<<<< HEAD
=======
def make_reclient_properties(instance, jobs = None):
"""Makes a default reclient property with the specified argument.
@ -60,33 +54,21 @@ def make_reclient_properties(instance, jobs = None):
reclient_props["jobs"] = jobs
return {"$build/reclient": reclient_props}
>>>>>>> m108
# Add names of builders to remove from LKGR finder to this list. This is
# useful when a failure can be safely ignored while fixing it without
# blocking the LKGR finder on it.
skipped_lkgr_bots = [
<<<<<<< HEAD
=======
"Android32 (M Nexus5X)(reclient)",
"Linux64 Release (reclient)",
"Mac64 Release (reclient)",
"Win64 Release (Clang)(reclient)",
"iOS64 Release (reclient)",
"Fuchsia Release",
>>>>>>> m108
]
# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
lucicfg.enable_experiment("crbug.com/1182002")
<<<<<<< HEAD
luci.builder.defaults.experiments.set(
{
"luci.recipes.use_python3": 100,
},
)
=======
>>>>>>> m108
luci.builder.defaults.test_presentation.set(
resultdb.test_presentation(grouping_keys = ["status", "v.test_suite"]),
)
@ -94,12 +76,7 @@ luci.builder.defaults.test_presentation.set(
lucicfg.config(
config_dir = ".",
tracked_files = [
<<<<<<< HEAD
"chops-weetbix-dev.cfg",
"chops-weetbix.cfg",
=======
"luci-analysis.cfg",
>>>>>>> m108
"commit-queue.cfg",
"cr-buildbucket.cfg",
"luci-logdog.cfg",
@ -152,8 +129,6 @@ luci.project(
"chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
],
),
<<<<<<< HEAD
=======
# Roles for LUCI Analysis.
luci.binding(
roles = "role/analysis.reader",
@ -167,7 +142,6 @@ luci.project(
roles = "role/analysis.editor",
groups = "googlers",
),
>>>>>>> m108
],
)
@ -183,18 +157,8 @@ luci.milo(
################################################################################
lucicfg.emit(
<<<<<<< HEAD
dest = "chops-weetbix-dev.cfg",
data = io.read_file("chops-weetbix-dev.cfg"),
)
lucicfg.emit(
dest = "chops-weetbix.cfg",
data = io.read_file("chops-weetbix.cfg"),
=======
dest = "luci-analysis.cfg",
data = io.read_file("luci-analysis.cfg"),
>>>>>>> m108
)
################################################################################
@ -320,13 +284,6 @@ luci.bucket(
acl.entry(acl.BUILDBUCKET_TRIGGERER, groups = [
"project-webrtc-ci-schedulers",
]),
<<<<<<< HEAD
acl.entry(acl.BUILDBUCKET_TRIGGERER, groups = [
# Allow Pinpoint to trigger builds for bisection
"service-account-chromeperf",
]),
=======
>>>>>>> m108
],
)
@ -336,13 +293,10 @@ luci.bucket(
acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [
"webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
]),
<<<<<<< HEAD
=======
acl.entry(acl.BUILDBUCKET_TRIGGERER, groups = [
# Allow Pinpoint to trigger builds for bisection
"service-account-chromeperf",
]),
>>>>>>> m108
],
)
@ -451,12 +405,8 @@ luci.tree_closer(
"compile",
"gn",
],
<<<<<<< HEAD
failed_step_regexp_exclude = ".*\\(experimental\\).*",
=======
# TODO(b/239908030, b/243594984): remove reclient builders after migration.
failed_step_regexp_exclude = ".*(\\(experimental\\)|\\(reclient\\)).*",
>>>>>>> m108
)
# Recipe definitions:
@ -545,12 +495,6 @@ def webrtc_builder(
A luci.builder.
"""
properties = properties or {}
<<<<<<< HEAD
properties["$recipe_engine/isolated"] = {
"server": "https://isolateserver.appspot.com",
}
=======
>>>>>>> m108
resultdb_bq_table = "webrtc-ci.resultdb." + bucket + "_test_results"
return luci.builder(
name = name,
@ -605,13 +549,6 @@ def ci_builder(
if enabled:
add_milo(name, {"ci": ci_cat, "perf": perf_cat})
<<<<<<< HEAD
if ci_cat:
lkgr_builders.append(name)
dimensions.update({"pool": "luci.webrtc.ci", "cpu": kwargs.pop("cpu", DEFAULT_CPU)})
properties = properties or {}
properties["builder_group"] = "client.webrtc"
=======
if ci_cat and not perf_cat:
lkgr_builders.append(name)
dimensions.update({"pool": "luci.webrtc.ci", "cpu": kwargs.pop("cpu", DEFAULT_CPU)})
@ -621,7 +558,6 @@ def ci_builder(
properties.update(make_reclient_properties("rbe-webrtc-trusted"))
# TODO(b/245249582): remove goma properties after reclient migration.
>>>>>>> m108
properties.update(make_goma_properties())
notifies = ["post_submit_failure_notifier", "infra_failure_notifier"]
notifies += ["webrtc_tree_closer"] if name not in skipped_lkgr_bots else []
@ -629,11 +565,7 @@ def ci_builder(
name = name,
dimensions = dimensions,
properties = properties,
<<<<<<< HEAD
bucket = "ci",
=======
bucket = "perf" if perf_cat else "ci",
>>>>>>> m108
service_account = "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
triggered_by = ["webrtc-gitiles-trigger-main"] if enabled else None,
repo = WEBRTC_GIT,
@ -687,10 +619,6 @@ def try_builder(
)
def perf_builder(name, perf_cat, **kwargs):
<<<<<<< HEAD
add_milo(name, {"perf": perf_cat})
properties = make_goma_properties()
=======
"""Add a perf builder.
Args:
@ -705,7 +633,6 @@ def perf_builder(name, perf_cat, **kwargs):
add_milo(name, {"perf": perf_cat})
properties = make_goma_properties()
properties.update(make_reclient_properties("rbe-webrtc-trusted"))
>>>>>>> m108
properties["builder_group"] = "client.webrtc.perf"
return webrtc_builder(
name = name,
@ -772,20 +699,7 @@ mac_builder, mac_try_job = normal_builder_factory(
)
ios_builder, ios_try_job = normal_builder_factory(
<<<<<<< HEAD
dimensions = {"os": "Mac-10.15"},
properties = {"xcode_build_version": WEBRTC_IOS_XCODE_VERSION},
caches = [swarming.cache(
name = "xcode_ios_" + WEBRTC_IOS_XCODE_VERSION,
path = "xcode_ios_" + WEBRTC_IOS_XCODE_VERSION + ".app",
)],
)
ios_builder_macos11, ios_try_job_macos11 = normal_builder_factory(
dimensions = {"os": "Mac-11"},
=======
dimensions = {"os": "Mac"},
>>>>>>> m108
properties = {"xcode_build_version": WEBRTC_XCODE13},
caches = [swarming.cache(
name = "xcode_ios_" + WEBRTC_XCODE13,
@ -799,10 +713,7 @@ android_builder("Android32 (M Nexus5X)(dbg)", "Android|arm|dbg")
android_try_job("android_compile_arm_dbg", cq = None)
android_try_job("android_arm_dbg")
android_builder("Android32 (M Nexus5X)", "Android|arm|rel")
<<<<<<< HEAD
=======
android_builder("Android32 (M Nexus5X)(reclient)", "Android|arm|re")
>>>>>>> m108
android_try_job("android_arm_rel")
android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True)
android_try_job("android_compile_arm_rel")
@ -830,26 +741,16 @@ android_try_job("android_chromium_compile", recipe = "chromium_trybot", branch_c
ios_builder("iOS64 Debug", "iOS|arm64|dbg")
ios_try_job("ios_compile_arm64_dbg")
ios_builder("iOS64 Release", "iOS|arm64|rel")
<<<<<<< HEAD
ios_try_job("ios_compile_arm64_rel")
ios_builder("iOS64 Sim Debug (iOS 14.0)", "iOS|x64|14")
=======
ios_builder("iOS64 Release (reclient)", "iOS|arm64|re")
ios_try_job("ios_compile_arm64_rel")
ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14")
>>>>>>> m108
ios_try_job("ios_sim_x64_dbg_ios14")
ios_builder("iOS64 Sim Debug (iOS 13)", "iOS|x64|13")
ios_try_job("ios_sim_x64_dbg_ios13")
ios_builder("iOS64 Sim Debug (iOS 12)", "iOS|x64|12")
ios_try_job("ios_sim_x64_dbg_ios12")
<<<<<<< HEAD
ios_builder_macos11("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
ios_try_job_macos11("ios_api_framework", recipe = "ios_api_framework")
=======
ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
ios_try_job("ios_api_framework", recipe = "ios_api_framework")
>>>>>>> m108
linux_builder("Linux32 Debug", "Linux|x86|dbg")
linux_try_job("linux_x86_dbg")
@ -859,17 +760,10 @@ linux_builder("Linux64 Debug", "Linux|x64|dbg")
linux_try_job("linux_dbg", cq = None)
linux_try_job("linux_compile_dbg")
linux_builder("Linux64 Release", "Linux|x64|rel")
<<<<<<< HEAD
linux_try_job("linux_rel")
linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True)
linux_try_job("linux_compile_rel")
perf_builder("Perf Linux Trusty", "Linux|x64|Tester|Trusty", triggered_by = ["Linux64 Builder"])
=======
linux_builder("Linux64 Release (reclient)", "Linux|x64|re")
linux_try_job("linux_rel")
linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True)
linux_try_job("linux_compile_rel")
>>>>>>> m108
perf_builder("Perf Linux Bionic", "Linux|x64|Tester|Bionic", triggered_by = ["Linux64 Builder"])
linux_builder("Linux32 Debug (ARM)", "Linux|arm|dbg")
linux_try_job("linux_compile_arm_dbg")
@ -895,22 +789,13 @@ linux_builder("Linux (more configs)", "Linux|x64|more")
linux_try_job("linux_more_configs")
linux_try_job("linux_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
linux_try_job("linux_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
<<<<<<< HEAD
=======
linux_builder("Fuchsia Release", "Fuchsia|x64|rel")
linux_try_job("fuchsia_rel", cq = None)
>>>>>>> m108
mac_builder("Mac64 Debug", "Mac|x64|dbg")
mac_try_job("mac_dbg", cq = None)
mac_try_job("mac_compile_dbg")
mac_builder("Mac64 Release", "Mac|x64|rel")
<<<<<<< HEAD
mac_try_job("mac_rel")
mac_try_job("mac_compile_rel", cq = None)
mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|")
perf_builder("Perf Mac 10.11", "Mac|x64|Tester|10.11", triggered_by = ["Mac64 Builder"])
=======
mac_builder("Mac64 Release (reclient)", "Mac|x64|re")
mac_try_job("mac_rel")
mac_try_job("mac_compile_rel", cq = None)
@ -919,18 +804,12 @@ mac_builder("MacArm64 Builder", ci_cat = None, perf_cat = "Mac|arm64|Builder")
perf_builder("Perf Mac 11", "Mac|x64|Tester|11", triggered_by = ["Mac64 Builder"])
perf_builder("Perf Mac M1 Arm64 12", "Mac|arm64|Tester|12", triggered_by = ["MacArm64 Builder"])
>>>>>>> m108
mac_builder("Mac Asan", "Mac|x64|asan")
mac_try_job("mac_asan")
mac_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
mac_builder("MacARM64 M1 Release", "Mac|arm64M1|rel", cpu = "arm64-64-Apple_M1")
<<<<<<< HEAD
mac_try_job("mac_rel_m1", try_cat = None, cq = None)
mac_try_job("mac_dbg_m1", try_cat = None, cq = None)
=======
mac_try_job("mac_rel_m1")
mac_try_job("mac_dbg_m1")
>>>>>>> m108
win_builder("Win32 Debug (Clang)", "Win Clang|x86|dbg")
win_try_job("win_x86_clang_dbg", cq = None)
@ -945,10 +824,7 @@ win_try_job("win_x64_clang_dbg", cq = None)
win_try_job("win_x64_clang_dbg_win10", cq = None)
win_try_job("win_compile_x64_clang_dbg")
win_builder("Win64 Release (Clang)", "Win Clang|x64|rel")
<<<<<<< HEAD
=======
win_builder("Win64 Release (Clang)(reclient)", "Win Clang|x64|re")
>>>>>>> m108
win_try_job("win_x64_clang_rel", cq = None)
win_try_job("win_compile_x64_clang_rel")
win_builder("Win64 ASan", "Win Clang|x64|asan")
@ -983,13 +859,8 @@ lkgr_config = {
"project": "webrtc",
"source_url": WEBRTC_GIT,
"status_url": "https://webrtc-status.appspot.com",
<<<<<<< HEAD
"allowed_lag": 150, # hours
"allowed_gap": 4, # commits behind
=======
"allowed_lag": 9, # hours (up to 10x during low commit volume periods)
"allowed_gap": 150, # commits behind
>>>>>>> m108
"error_recipients": WEBRTC_TROOPER_EMAIL,
"buckets": {
"webrtc/ci": {
@ -1007,10 +878,6 @@ lkgr_config = {
"WebRTC Chromium FYI Android Builder ARM64 (dbg)",
"WebRTC Chromium FYI Android Builder",
"WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)",
<<<<<<< HEAD
"WebRTC Chromium FYI Android Tests (dbg) (N Nexus5X)",
=======
>>>>>>> m108
"WebRTC Chromium FYI Linux Builder (dbg)",
"WebRTC Chromium FYI Linux Builder",
"WebRTC Chromium FYI Linux Tester",
@ -1020,10 +887,6 @@ lkgr_config = {
"WebRTC Chromium FYI Win Builder (dbg)",
"WebRTC Chromium FYI Win Builder",
"WebRTC Chromium FYI Win10 Tester",
<<<<<<< HEAD
"WebRTC Chromium FYI Win7 Tester",
=======
>>>>>>> m108
"WebRTC Chromium FYI ios-device",
"WebRTC Chromium FYI ios-simulator",
],

978
infra/config/cr-buildbucket.cfg
View file

File diff suppressed because it is too large Load diff

64
infra/config/luci-milo.cfg
View file

@ -22,16 +22,12 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Android32 Builder arm"
=======
name: "buildbucket/luci.webrtc.ci/Android32 (M Nexus5X)(reclient)"
category: "Android|arm"
short_name: "re"
}
builders {
name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
>>>>>>> m108
category: "Android|arm"
short_name: "size"
}
@ -41,11 +37,7 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Android64 Builder arm64"
=======
name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
>>>>>>> m108
category: "Android|arm64"
short_name: "size"
}
@ -80,16 +72,12 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 14.0)"
=======
name: "buildbucket/luci.webrtc.ci/iOS64 Release (reclient)"
category: "iOS|arm64"
short_name: "re"
}
builders {
name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 14)"
>>>>>>> m108
category: "iOS|x64"
short_name: "14"
}
@ -129,16 +117,12 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Linux64 Builder"
=======
name: "buildbucket/luci.webrtc.ci/Linux64 Release (reclient)"
category: "Linux|x64"
short_name: "re"
}
builders {
name: "buildbucket/luci.webrtc.perf/Linux64 Builder"
>>>>>>> m108
category: "Linux|x64"
short_name: "size"
}
@ -198,14 +182,11 @@ consoles {
short_name: "more"
}
builders {
<<<<<<< HEAD
=======
name: "buildbucket/luci.webrtc.ci/Fuchsia Release"
category: "Fuchsia|x64"
short_name: "rel"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.ci/Mac64 Debug"
category: "Mac|x64"
short_name: "dbg"
@ -216,14 +197,11 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
=======
name: "buildbucket/luci.webrtc.ci/Mac64 Release (reclient)"
category: "Mac|x64"
short_name: "re"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.ci/Mac Asan"
category: "Mac|x64"
short_name: "asan"
@ -254,14 +232,11 @@ consoles {
short_name: "rel"
}
builders {
<<<<<<< HEAD
=======
name: "buildbucket/luci.webrtc.ci/Win64 Release (Clang)(reclient)"
category: "Win Clang|x64"
short_name: "re"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.ci/Win64 ASan"
category: "Win Clang|x64"
short_name: "asan"
@ -341,11 +316,7 @@ consoles {
refs: "regexp:refs/heads/main"
manifest_name: "REVISION"
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Android32 Builder arm"
=======
name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
>>>>>>> m108
category: "Android|arm|Builder"
}
builders {
@ -359,11 +330,7 @@ consoles {
short_name: "M AOSP Nexus6"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Android64 Builder arm64"
=======
name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
>>>>>>> m108
category: "Android|arm64|Builder"
}
builders {
@ -377,39 +344,15 @@ consoles {
short_name: "O Pixel2"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Linux64 Builder"
category: "Linux|x64|Builder"
}
builders {
name: "buildbucket/luci.webrtc.perf/Perf Linux Trusty"
category: "Linux|x64|Tester"
short_name: "Trusty"
}
builders {
=======
name: "buildbucket/luci.webrtc.perf/Linux64 Builder"
category: "Linux|x64|Builder"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.perf/Perf Linux Bionic"
category: "Linux|x64|Tester"
short_name: "Bionic"
}
builders {
<<<<<<< HEAD
name: "buildbucket/luci.webrtc.ci/Mac64 Builder"
category: "Mac|x64|Builder"
}
builders {
name: "buildbucket/luci.webrtc.perf/Perf Mac 10.11"
category: "Mac|x64|Tester"
short_name: "10.11"
}
builders {
name: "buildbucket/luci.webrtc.ci/Win32 Builder (Clang)"
=======
name: "buildbucket/luci.webrtc.perf/Mac64 Builder"
category: "Mac|x64|Builder"
}
@ -430,7 +373,6 @@ consoles {
}
builders {
name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)"
>>>>>>> m108
category: "Win|x86|Builder"
}
builders {
@ -635,12 +577,9 @@ consoles {
name: "buildbucket/luci.webrtc.try/linux_chromium_compile_dbg"
}
builders {
<<<<<<< HEAD
=======
name: "buildbucket/luci.webrtc.try/fuchsia_rel"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.try/mac_dbg"
}
builders {
@ -659,15 +598,12 @@ consoles {
name: "buildbucket/luci.webrtc.try/mac_chromium_compile"
}
builders {
<<<<<<< HEAD
=======
name: "buildbucket/luci.webrtc.try/mac_rel_m1"
}
builders {
name: "buildbucket/luci.webrtc.try/mac_dbg_m1"
}
builders {
>>>>>>> m108
name: "buildbucket/luci.webrtc.try/win_x86_clang_dbg"
}
builders {

404
infra/config/luci-notify.cfg
View file

@ -28,11 +28,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -59,11 +55,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -84,20 +76,9 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Android32 (more configs)"
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
failed_step_regexp_exclude: ".*\\(experimental\\).*"
}
=======
name: "Android32 (M Nexus5X)(reclient)"
repository: "https://webrtc.googlesource.com/src"
}
>>>>>>> m108
}
notifiers {
notifications {
@ -117,21 +98,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Android32 Builder arm"
=======
name: "Android32 (more configs)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -158,11 +131,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -189,11 +158,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -220,11 +185,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -245,21 +206,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Android64 Builder arm64"
=======
name: "Android64 Builder x64 (dbg)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -280,20 +233,9 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Android64 Builder x64 (dbg)"
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
failed_step_regexp_exclude: ".*\\(experimental\\).*"
}
=======
name: "Fuchsia Release"
repository: "https://webrtc.googlesource.com/src"
}
>>>>>>> m108
}
notifiers {
notifications {
@ -319,11 +261,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -350,11 +288,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -381,11 +315,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -412,11 +342,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -443,11 +369,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -474,11 +396,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -505,11 +423,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -536,11 +450,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -567,11 +477,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -598,11 +504,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -623,21 +525,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Builder"
=======
name: "Linux64 Debug"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -658,21 +552,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Debug"
=======
name: "Linux64 Debug (ARM)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -693,21 +579,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Debug (ARM)"
=======
name: "Linux64 Release"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -728,21 +606,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Release"
=======
name: "Linux64 Release (ARM)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -763,55 +633,36 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Release (ARM)"
=======
name: "Linux64 Release (Libfuzzer)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Linux64 Release (Libfuzzer)"
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
failed_step_regexp_exclude: ".*\\(experimental\\).*"
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
}
=======
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
name: "Linux64 Release (reclient)"
repository: "https://webrtc.googlesource.com/src"
}
>>>>>>> m108
}
notifiers {
notifications {
@ -837,11 +688,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -862,21 +709,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Mac64 Builder"
=======
name: "Mac64 Debug"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -897,55 +736,36 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Mac64 Debug"
=======
name: "Mac64 Release"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Mac64 Release"
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
failed_step_regexp_exclude: ".*\\(experimental\\).*"
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
}
=======
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
name: "Mac64 Release (reclient)"
repository: "https://webrtc.googlesource.com/src"
}
>>>>>>> m108
}
notifiers {
notifications {
@ -971,11 +791,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1002,11 +818,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1027,21 +839,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win32 Builder (Clang)"
=======
name: "Win32 Debug (Clang)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1062,21 +866,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win32 Debug (Clang)"
=======
name: "Win32 Release (Clang)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1097,21 +893,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win32 Release (Clang)"
=======
name: "Win64 ASan"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1132,21 +920,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win64 ASan"
=======
name: "Win64 Debug (Clang)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1167,55 +947,36 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win64 Debug (Clang)"
=======
name: "Win64 Release (Clang)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "Win64 Release (Clang)"
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
failed_step_regexp_exclude: ".*\\(experimental\\).*"
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
}
=======
}
notifiers {
notifications {
on_new_status: INFRA_FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "infra_failure"
}
notifications {
on_new_status: FAILURE
email {
recipients: "webrtc-troopers-robots@google.com"
}
template: "build_failure"
notify_blamelist {}
}
builders {
bucket: "ci"
name: "Win64 Release (Clang)(reclient)"
repository: "https://webrtc.googlesource.com/src"
}
>>>>>>> m108
}
notifiers {
notifications {
@ -1241,11 +1002,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1272,11 +1029,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1303,9 +1056,6 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
}
}
@ -1329,7 +1079,6 @@ notifiers {
bucket: "ci"
name: "iOS64 Release (reclient)"
repository: "https://webrtc.googlesource.com/src"
>>>>>>> m108
}
}
notifiers {
@ -1356,11 +1105,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1387,11 +1132,7 @@ notifiers {
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1412,21 +1153,13 @@ notifiers {
}
builders {
bucket: "ci"
<<<<<<< HEAD
name: "iOS64 Sim Debug (iOS 14.0)"
=======
name: "iOS64 Sim Debug (iOS 14)"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
tree_closers {
tree_status_host: "webrtc-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
<<<<<<< HEAD
failed_step_regexp_exclude: ".*\\(experimental\\).*"
=======
failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*"
>>>>>>> m108
}
}
notifiers {
@ -1489,8 +1222,6 @@ notifiers {
}
builders {
bucket: "perf"
<<<<<<< HEAD
=======
name: "Android32 Builder arm"
repository: "https://webrtc.googlesource.com/src"
}
@ -1626,7 +1357,6 @@ notifiers {
}
builders {
bucket: "perf"
>>>>>>> m108
name: "Perf Android32 (M AOSP Nexus6)"
repository: "https://webrtc.googlesource.com/src"
}
@ -1737,11 +1467,7 @@ notifiers {
}
builders {
bucket: "perf"
<<<<<<< HEAD
name: "Perf Linux Trusty"
=======
name: "Perf Mac 11"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
}
@ -1763,11 +1489,7 @@ notifiers {
}
builders {
bucket: "perf"
<<<<<<< HEAD
name: "Perf Mac 10.11"
=======
name: "Perf Mac M1 Arm64 12"
>>>>>>> m108
repository: "https://webrtc.googlesource.com/src"
}
}
@ -1801,8 +1523,6 @@ notifiers {
}
template: "infra_failure"
}
<<<<<<< HEAD
=======
notifications {
on_new_status: FAILURE
email {
@ -1830,7 +1550,6 @@ notifiers {
}
template: "infra_failure"
}
>>>>>>> m108
builders {
bucket: "try"
name: "android_arm64_dbg"
@ -2015,8 +1734,6 @@ notifiers {
}
builders {
bucket: "try"
<<<<<<< HEAD
=======
name: "fuchsia_rel"
}
}
@ -2030,7 +1747,6 @@ notifiers {
}
builders {
bucket: "try"
>>>>>>> m108
name: "ios_api_framework"
}
}

125
infra/config/luci-scheduler.cfg
View file

@ -25,8 +25,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "Android32 (M Nexus5X)(reclient)"
realm: "ci"
acl_sets: "ci"
@ -37,7 +35,6 @@ job {
}
}
job {
>>>>>>> m108
id: "Android32 (more configs)"
realm: "ci"
acl_sets: "ci"
@ -49,13 +46,8 @@ job {
}
job {
id: "Android32 Builder arm"
<<<<<<< HEAD
realm: "ci"
acl_sets: "ci"
=======
realm: "perf"
acl_sets: "perf"
>>>>>>> m108
triggering_policy {
kind: GREEDY_BATCHING
max_concurrent_invocations: 3
@ -63,11 +55,7 @@ job {
}
buildbucket {
server: "cr-buildbucket.appspot.com"
<<<<<<< HEAD
bucket: "ci"
=======
bucket: "perf"
>>>>>>> m108
builder: "Android32 Builder arm"
}
}
@ -103,13 +91,8 @@ job {
}
job {
id: "Android64 Builder arm64"
<<<<<<< HEAD
realm: "ci"
acl_sets: "ci"
=======
realm: "perf"
acl_sets: "perf"
>>>>>>> m108
triggering_policy {
kind: GREEDY_BATCHING
max_concurrent_invocations: 3
@ -117,11 +100,7 @@ job {
}
buildbucket {
server: "cr-buildbucket.appspot.com"
<<<<<<< HEAD
bucket: "ci"
=======
bucket: "perf"
>>>>>>> m108
builder: "Android64 Builder arm64"
}
}
@ -147,8 +126,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "Fuchsia Release"
realm: "ci"
acl_sets: "ci"
@ -159,7 +136,6 @@ job {
}
}
job {
>>>>>>> m108
id: "Linux (more configs)"
realm: "ci"
acl_sets: "ci"
@ -261,13 +237,8 @@ job {
}
job {
id: "Linux64 Builder"
<<<<<<< HEAD
realm: "ci"
acl_sets: "ci"
=======
realm: "perf"
acl_sets: "perf"
>>>>>>> m108
triggering_policy {
kind: GREEDY_BATCHING
max_concurrent_invocations: 3
@ -275,11 +246,7 @@ job {
}
buildbucket {
server: "cr-buildbucket.appspot.com"
<<<<<<< HEAD
bucket: "ci"
=======
bucket: "perf"
>>>>>>> m108
builder: "Linux64 Builder"
}
}
@ -334,36 +301,22 @@ job {
}
}
job {
<<<<<<< HEAD
id: "Mac Asan"
=======
id: "Linux64 Release (reclient)"
>>>>>>> m108
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
<<<<<<< HEAD
builder: "Mac Asan"
}
}
job {
id: "Mac64 Builder"
=======
builder: "Linux64 Release (reclient)"
}
}
job {
id: "Mac Asan"
>>>>>>> m108
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
<<<<<<< HEAD
=======
builder: "Mac Asan"
}
}
@ -374,7 +327,6 @@ job {
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "perf"
>>>>>>> m108
builder: "Mac64 Builder"
}
}
@ -399,8 +351,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "Mac64 Release (reclient)"
realm: "ci"
acl_sets: "ci"
@ -411,7 +361,6 @@ job {
}
}
job {
>>>>>>> m108
id: "MacARM64 M1 Release"
realm: "ci"
acl_sets: "ci"
@ -422,8 +371,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "MacArm64 Builder"
realm: "perf"
acl_sets: "perf"
@ -434,7 +381,6 @@ job {
}
}
job {
>>>>>>> m108
id: "Perf Android32 (M AOSP Nexus6)"
realm: "perf"
acls {
@ -525,11 +471,7 @@ job {
}
}
job {
<<<<<<< HEAD
id: "Perf Linux Trusty"
=======
id: "Perf Mac 11"
>>>>>>> m108
realm: "perf"
acls {
role: TRIGGERER
@ -543,19 +485,11 @@ job {
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "perf"
<<<<<<< HEAD
builder: "Perf Linux Trusty"
}
}
job {
id: "Perf Mac 10.11"
=======
builder: "Perf Mac 11"
}
}
job {
id: "Perf Mac M1 Arm64 12"
>>>>>>> m108
realm: "perf"
acls {
role: TRIGGERER
@ -569,11 +503,7 @@ job {
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "perf"
<<<<<<< HEAD
builder: "Perf Mac 10.11"
=======
builder: "Perf Mac M1 Arm64 12"
>>>>>>> m108
}
}
job {
@ -628,19 +558,11 @@ job {
}
job {
id: "Win32 Builder (Clang)"
<<<<<<< HEAD
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
=======
realm: "perf"
acl_sets: "perf"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "perf"
>>>>>>> m108
builder: "Win32 Builder (Clang)"
}
}
@ -695,8 +617,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "Win64 Release (Clang)(reclient)"
realm: "ci"
acl_sets: "ci"
@ -707,7 +627,6 @@ job {
}
}
job {
>>>>>>> m108
id: "iOS API Framework Builder"
realm: "ci"
acl_sets: "ci"
@ -743,8 +662,6 @@ job {
}
}
job {
<<<<<<< HEAD
=======
id: "iOS64 Release (reclient)"
realm: "ci"
acl_sets: "ci"
@ -755,7 +672,6 @@ job {
}
}
job {
>>>>>>> m108
id: "iOS64 Sim Debug (iOS 12)"
realm: "ci"
acl_sets: "ci"
@ -776,21 +692,13 @@ job {
}
}
job {
<<<<<<< HEAD
id: "iOS64 Sim Debug (iOS 14.0)"
=======
id: "iOS64 Sim Debug (iOS 14)"
>>>>>>> m108
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
<<<<<<< HEAD
builder: "iOS64 Sim Debug (iOS 14.0)"
=======
builder: "iOS64 Sim Debug (iOS 14)"
>>>>>>> m108
}
}
trigger {
@ -799,15 +707,6 @@ trigger {
acl_sets: "ci"
triggers: "Android32 (M Nexus5X)"
triggers: "Android32 (M Nexus5X)(dbg)"
<<<<<<< HEAD
triggers: "Android32 (more configs)"
triggers: "Android32 Builder arm"
triggers: "Android32 Builder x86"
triggers: "Android32 Builder x86 (dbg)"
triggers: "Android64 (M Nexus5X)"
triggers: "Android64 Builder arm64"
triggers: "Android64 Builder x64 (dbg)"
=======
triggers: "Android32 (M Nexus5X)(reclient)"
triggers: "Android32 (more configs)"
triggers: "Android32 Builder x86"
@ -815,7 +714,6 @@ trigger {
triggers: "Android64 (M Nexus5X)"
triggers: "Android64 Builder x64 (dbg)"
triggers: "Fuchsia Release"
>>>>>>> m108
triggers: "Linux (more configs)"
triggers: "Linux Asan"
triggers: "Linux MSan"
@ -826,24 +724,11 @@ trigger {
triggers: "Linux32 Debug (ARM)"
triggers: "Linux32 Release"
triggers: "Linux32 Release (ARM)"
<<<<<<< HEAD
triggers: "Linux64 Builder"
=======
>>>>>>> m108
triggers: "Linux64 Debug"
triggers: "Linux64 Debug (ARM)"
triggers: "Linux64 Release"
triggers: "Linux64 Release (ARM)"
triggers: "Linux64 Release (Libfuzzer)"
<<<<<<< HEAD
triggers: "Mac Asan"
triggers: "Mac64 Builder"
triggers: "Mac64 Debug"
triggers: "Mac64 Release"
triggers: "MacARM64 M1 Release"
triggers: "Win (more configs)"
triggers: "Win32 Builder (Clang)"
=======
triggers: "Linux64 Release (reclient)"
triggers: "Mac Asan"
triggers: "Mac64 Debug"
@ -851,20 +736,11 @@ trigger {
triggers: "Mac64 Release (reclient)"
triggers: "MacARM64 M1 Release"
triggers: "Win (more configs)"
>>>>>>> m108
triggers: "Win32 Debug (Clang)"
triggers: "Win32 Release (Clang)"
triggers: "Win64 ASan"
triggers: "Win64 Debug (Clang)"
triggers: "Win64 Release (Clang)"
<<<<<<< HEAD
triggers: "iOS API Framework Builder"
triggers: "iOS64 Debug"
triggers: "iOS64 Release"
triggers: "iOS64 Sim Debug (iOS 12)"
triggers: "iOS64 Sim Debug (iOS 13)"
triggers: "iOS64 Sim Debug (iOS 14.0)"
=======
triggers: "Win64 Release (Clang)(reclient)"
triggers: "iOS API Framework Builder"
triggers: "iOS64 Debug"
@ -879,7 +755,6 @@ trigger {
triggers: "Mac64 Builder"
triggers: "MacArm64 Builder"
triggers: "Win32 Builder (Clang)"
>>>>>>> m108
gitiles {
repo: "https://webrtc.googlesource.com/src"
refs: "regexp:refs/heads/main"

4
infra/config/project.cfg
View file

@ -7,11 +7,7 @@
name: "webrtc"
access: "group:all"
lucicfg {
<<<<<<< HEAD
version: "1.30.11"
=======
version: "1.32.1"
>>>>>>> m108
package_dir: "."
config_dir: "."
entry_point: "config.star"

15
infra/config/realms.cfg
View file

@ -7,8 +7,6 @@
realms {
name: "@root"
bindings {
<<<<<<< HEAD
=======
role: "role/analysis.editor"
principals: "group:googlers"
}
@ -21,7 +19,6 @@ realms {
principals: "group:all"
}
bindings {
>>>>>>> m108
role: "role/buildbucket.reader"
principals: "group:all"
}
@ -79,10 +76,6 @@ realms {
bindings {
role: "role/buildbucket.triggerer"
principals: "group:project-webrtc-ci-schedulers"
<<<<<<< HEAD
principals: "group:service-account-chromeperf"
=======
>>>>>>> m108
}
bindings {
role: "role/resultdb.invocationCreator"
@ -105,10 +98,7 @@ realms {
}
bindings {
role: "role/buildbucket.triggerer"
<<<<<<< HEAD
=======
principals: "group:service-account-chromeperf"
>>>>>>> m108
principals: "user:webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
bindings {
@ -126,13 +116,8 @@ realms {
values: "Perf Android64 (M Nexus5X)"
values: "Perf Android64 (O Pixel2)"
values: "Perf Linux Bionic"
<<<<<<< HEAD
values: "Perf Linux Trusty"
values: "Perf Mac 10.11"
=======
values: "Perf Mac 11"
values: "Perf Mac M1 Arm64 12"
>>>>>>> m108
values: "Perf Win7"
}
}

15
infra/specs/PRESUBMIT.py
View file

@ -1,8 +1,5 @@
<<<<<<< HEAD
=======
#!/usr/bin/env vpython3
>>>>>>> m108
# Copyright (c) 2022 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
@ -13,12 +10,9 @@
import os
<<<<<<< HEAD
=======
# Runs PRESUBMIT.py in py3 mode by git cl presubmit.
USE_PYTHON3 = True
>>>>>>> m108
def _HasLocalChanges(input_api):
ret = input_api.subprocess.call(['git', 'diff', '--quiet'])
@ -46,23 +40,14 @@ def CheckPatchFormatted(input_api, output_api):
def CheckSourceSideSpecs(input_api, output_api):
d = os.path.dirname
<<<<<<< HEAD
angle_root = d(d(input_api.PresubmitLocalPath()))
gen_script = os.path.join(angle_root, 'testing', 'buildbot',
=======
webrtc_root = d(d(input_api.PresubmitLocalPath()))
gen_script = os.path.join(webrtc_root, 'testing', 'buildbot',
>>>>>>> m108
'generate_buildbot_json.py')
commands = [
input_api.Command(name='generate_buildbot_json',
cmd=[
<<<<<<< HEAD
input_api.python_executable, gen_script, '--check',
=======
input_api.python3_executable, gen_script, '--check',
>>>>>>> m108
'--verbose', '--pyl-files-dir',
input_api.PresubmitLocalPath()
],

2011
infra/specs/client.webrtc.json
View file

File diff suppressed because it is too large Load diff

128
infra/specs/client.webrtc.perf.json
View file

@ -17,11 +17,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -55,11 +51,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -101,11 +93,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -139,11 +127,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -185,11 +169,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -223,11 +203,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -269,11 +245,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -306,11 +278,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"resultdb": {
"enable": true,
@ -349,11 +317,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "low_bandwidth_audio_perf_test",
"resultdb": {
@ -387,11 +351,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "webrtc_perf_tests",
"resultdb": {
@ -414,11 +374,7 @@
}
]
},
<<<<<<< HEAD
"Perf Linux Trusty": {
=======
"Perf Mac 11": {
>>>>>>> m108
"isolated_scripts": [
{
"args": [
@ -432,11 +388,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "low_bandwidth_audio_perf_test",
"resultdb": {
@ -447,12 +399,8 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
<<<<<<< HEAD
"os": "Ubuntu-14.04",
=======
"cpu": "x86-64",
"os": "Mac-11",
>>>>>>> m108
"pool": "WebRTC-perf"
}
],
@ -475,11 +423,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "webrtc_perf_tests",
"resultdb": {
@ -490,12 +434,8 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
<<<<<<< HEAD
"os": "Ubuntu-14.04",
=======
"cpu": "x86-64",
"os": "Mac-11",
>>>>>>> m108
"pool": "WebRTC-perf"
}
],
@ -507,53 +447,10 @@
}
]
},
<<<<<<< HEAD
"Perf Mac 10.11": {
"isolated_scripts": [
{
"args": [
".",
"--remove",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
"isolate_name": "low_bandwidth_audio_perf_test",
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "low_bandwidth_audio_perf_test",
"resultdb": {
"result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
"result_format": "gtest_json"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac-10.12.6",
"pool": "WebRTC-perf"
}
],
"hard_timeout": 10800,
"idempotent": false,
"io_timeout": 10800
},
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
"--save_worst_frame",
=======
"Perf Mac M1 Arm64 12": {
"isolated_scripts": [
{
"args": [
>>>>>>> m108
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json",
"--nologs"
],
@ -563,11 +460,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "webrtc_perf_tests",
"resultdb": {
@ -578,13 +471,8 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
<<<<<<< HEAD
"cpu": "x86-64",
"os": "Mac-10.12.6",
=======
"cpu": "arm64-64-Apple_M1",
"os": "Mac-12",
>>>>>>> m108
"pool": "WebRTC-perf"
}
],
@ -610,11 +498,7 @@
"--test-suite",
"low_bandwidth_audio_perf_test"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "low_bandwidth_audio_perf_test",
"resultdb": {
@ -625,11 +509,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
<<<<<<< HEAD
"os": "Windows",
=======
"os": "Windows-10",
>>>>>>> m108
"pool": "WebRTC-perf"
}
],
@ -652,11 +532,7 @@
"--test-suite",
"webrtc_perf_tests"
],
<<<<<<< HEAD
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
=======
"script": "//tools_webrtc/perf/process_perf_results.py"
>>>>>>> m108
},
"name": "webrtc_perf_tests",
"resultdb": {
@ -667,11 +543,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
<<<<<<< HEAD
"os": "Windows",
=======
"os": "Windows-10",
>>>>>>> m108
"pool": "WebRTC-perf"
}
],

3
infra/specs/gn_isolate_map.pyl
View file

@ -102,8 +102,6 @@
},
"sdk_unittests": {
"label": "//sdk:sdk_unittests",
<<<<<<< HEAD:infra/specs/gn_isolate_map.pyl
=======
"type": "console_test_launcher",
},
"slow_peer_connection_unittests": {
@ -112,7 +110,6 @@
},
"svc_tests": {
"label": "//pc:svc_tests",
>>>>>>> m108:tools_webrtc/mb/gn_isolate_map.pyl
"type": "console_test_launcher",
},
"system_wrappers_unittests": {

Some files were not shown because too many files have changed in this diff Show more