zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RTC_DISALLOW_COPY_AND_ASSIGN from modules/

Browse Source 
Bug: webrtc:13555, webrtc:13082
Change-Id: I2c2cbcbd918f0cfa970c1a964893220ba11d4b41
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/247960
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: (Daniel.L) Byoungchan Lee <daniel.l@hpcnt.com>
Cr-Commit-Position: refs/heads/main@{#35771}
This commit is contained in:
Byoungchan Lee
2022-01-21 09:49:39 +09:00
committed by WebRTC LUCI CQ
parent ce6170fcdf
commit 604fd2f1ab
127 changed files with 466 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
View File

@ -21,7 +21,6 @@
#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -44,6 +43,9 @@ class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor {
~AudioNetworkAdaptorImpl() override;
AudioNetworkAdaptorImpl(const AudioNetworkAdaptorImpl&) = delete;
AudioNetworkAdaptorImpl& operator=(const AudioNetworkAdaptorImpl&) = delete;
void SetUplinkBandwidth(int uplink_bandwidth_bps) override;
void SetUplinkPacketLossFraction(float uplink_packet_loss_fraction) override;
@ -80,8 +82,6 @@ class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor {
absl::optional<AudioEncoderRuntimeConfig> prev_config_;
ANAStats stats_;
RTC_DISALLOW_COPY_AND_ASSIGN(AudioNetworkAdaptorImpl);
};
} // namespace webrtc

5
modules/audio_coding/audio_network_adaptor/bitrate_controller.h
View File

@ -16,7 +16,6 @@
#include "absl/types/optional.h"
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
namespace audio_network_adaptor {
@ -39,6 +38,9 @@ class BitrateController final : public Controller {
~BitrateController() override;
BitrateController(const BitrateController&) = delete;
BitrateController& operator=(const BitrateController&) = delete;
void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override;
void MakeDecision(AudioEncoderRuntimeConfig* config) override;
@ -49,7 +51,6 @@ class BitrateController final : public Controller {
int frame_length_ms_;
absl::optional<int> target_audio_bitrate_bps_;
absl::optional<size_t> overhead_bytes_per_packet_;
RTC_DISALLOW_COPY_AND_ASSIGN(BitrateController);
};
} // namespace audio_network_adaptor

5
modules/audio_coding/audio_network_adaptor/channel_controller.h
View File

@ -16,7 +16,6 @@
#include "absl/types/optional.h"
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -41,6 +40,9 @@ class ChannelController final : public Controller {
~ChannelController() override;
ChannelController(const ChannelController&) = delete;
ChannelController& operator=(const ChannelController&) = delete;
void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override;
void MakeDecision(AudioEncoderRuntimeConfig* config) override;
@ -49,7 +51,6 @@ class ChannelController final : public Controller {
const Config config_;
size_t channels_to_encode_;
absl::optional<int> uplink_bandwidth_bps_;
RTC_DISALLOW_COPY_AND_ASSIGN(ChannelController);
};
} // namespace webrtc

6
modules/audio_coding/audio_network_adaptor/controller_manager.h
View File

@ -17,7 +17,6 @@
#include <vector>
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -80,6 +79,9 @@ class ControllerManagerImpl final : public ControllerManager {
~ControllerManagerImpl() override;
ControllerManagerImpl(const ControllerManagerImpl&) = delete;
ControllerManagerImpl& operator=(const ControllerManagerImpl&) = delete;
// Sort controllers based on their significance.
std::vector<Controller*> GetSortedControllers(
const Controller::NetworkMetrics& metrics) override;
@ -114,8 +116,6 @@ class ControllerManagerImpl final : public ControllerManager {
// `scoring_points_` saves the scoring points of various
// controllers.
std::map<const Controller*, ScoringPoint> controller_scoring_points_;
RTC_DISALLOW_COPY_AND_ASSIGN(ControllerManagerImpl);
};
} // namespace webrtc

5
modules/audio_coding/audio_network_adaptor/dtx_controller.h
View File

@ -14,7 +14,6 @@
#include "absl/types/optional.h"
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -35,6 +34,9 @@ class DtxController final : public Controller {
~DtxController() override;
DtxController(const DtxController&) = delete;
DtxController& operator=(const DtxController&) = delete;
void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override;
void MakeDecision(AudioEncoderRuntimeConfig* config) override;
@ -43,7 +45,6 @@ class DtxController final : public Controller {
const Config config_;
bool dtx_enabled_;
absl::optional<int> uplink_bandwidth_bps_;
RTC_DISALLOW_COPY_AND_ASSIGN(DtxController);
};
} // namespace webrtc

6
modules/audio_coding/audio_network_adaptor/event_log_writer.h
View File

@ -12,7 +12,6 @@
#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
class RtcEventLog;
@ -24,6 +23,10 @@ class EventLogWriter final {
float min_bitrate_change_fraction,
float min_packet_loss_change_fraction);
~EventLogWriter();
EventLogWriter(const EventLogWriter&) = delete;
EventLogWriter& operator=(const EventLogWriter&) = delete;
void MaybeLogEncoderConfig(const AudioEncoderRuntimeConfig& config);
private:
@ -34,7 +37,6 @@ class EventLogWriter final {
const float min_bitrate_change_fraction_;
const float min_packet_loss_change_fraction_;
AudioEncoderRuntimeConfig last_logged_config_;
RTC_DISALLOW_COPY_AND_ASSIGN(EventLogWriter);
};
} // namespace webrtc

6
modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
View File

@ -18,7 +18,6 @@
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -53,6 +52,9 @@ class FecControllerPlrBased final : public Controller {
~FecControllerPlrBased() override;
FecControllerPlrBased(const FecControllerPlrBased&) = delete;
FecControllerPlrBased& operator=(const FecControllerPlrBased&) = delete;
void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override;
void MakeDecision(AudioEncoderRuntimeConfig* config) override;
@ -65,8 +67,6 @@ class FecControllerPlrBased final : public Controller {
bool fec_enabled_;
absl::optional<int> uplink_bandwidth_bps_;
const std::unique_ptr<SmoothingFilter> packet_loss_smoother_;
RTC_DISALLOW_COPY_AND_ASSIGN(FecControllerPlrBased);
};
} // namespace webrtc

6
modules/audio_coding/audio_network_adaptor/frame_length_controller.h
View File

@ -19,7 +19,6 @@
#include "absl/types/optional.h"
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "rtc_base/constructor_magic.h"
namespace webrtc {
@ -62,6 +61,9 @@ class FrameLengthController final : public Controller {
~FrameLengthController() override;
FrameLengthController(const FrameLengthController&) = delete;
FrameLengthController& operator=(const FrameLengthController&) = delete;
void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override;
void MakeDecision(AudioEncoderRuntimeConfig* config) override;
@ -84,8 +86,6 @@ class FrameLengthController final : public Controller {
// True if the previous frame length decision was an increase, otherwise
// false.
bool prev_decision_increase_ = false;
RTC_DISALLOW_COPY_AND_ASSIGN(FrameLengthController);
};
} // namespace webrtc