Remove RTC_DISALLOW_COPY_AND_ASSIGN from modules/
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:
committed by
WebRTC LUCI CQ
parent
ce6170fcdf
commit
604fd2f1ab
@ -21,7 +21,6 @@
|
||||
#include "api/audio_codecs/opus/audio_decoder_multi_channel_opus_config.h"
|
||||
#include "modules/audio_coding/codecs/opus/opus_interface.h"
|
||||
#include "rtc_base/buffer.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -32,6 +31,11 @@ class AudioDecoderMultiChannelOpusImpl final : public AudioDecoder {
|
||||
|
||||
~AudioDecoderMultiChannelOpusImpl() override;
|
||||
|
||||
AudioDecoderMultiChannelOpusImpl(const AudioDecoderMultiChannelOpusImpl&) =
|
||||
delete;
|
||||
AudioDecoderMultiChannelOpusImpl& operator=(
|
||||
const AudioDecoderMultiChannelOpusImpl&) = delete;
|
||||
|
||||
std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
|
||||
uint32_t timestamp) override;
|
||||
void Reset() override;
|
||||
@ -63,7 +67,6 @@ class AudioDecoderMultiChannelOpusImpl final : public AudioDecoder {
|
||||
|
||||
OpusDecInst* dec_state_;
|
||||
const AudioDecoderMultiChannelOpusConfig config_;
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderMultiChannelOpusImpl);
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#include "api/audio_codecs/audio_decoder.h"
|
||||
#include "modules/audio_coding/codecs/opus/opus_interface.h"
|
||||
#include "rtc_base/buffer.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -29,6 +28,9 @@ class AudioDecoderOpusImpl final : public AudioDecoder {
|
||||
int sample_rate_hz = 48000);
|
||||
~AudioDecoderOpusImpl() override;
|
||||
|
||||
AudioDecoderOpusImpl(const AudioDecoderOpusImpl&) = delete;
|
||||
AudioDecoderOpusImpl& operator=(const AudioDecoderOpusImpl&) = delete;
|
||||
|
||||
std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
|
||||
uint32_t timestamp) override;
|
||||
void Reset() override;
|
||||
@ -55,7 +57,6 @@ class AudioDecoderOpusImpl final : public AudioDecoder {
|
||||
OpusDecInst* dec_state_;
|
||||
const size_t channels_;
|
||||
const int sample_rate_hz_;
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpusImpl);
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
#include "api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.h"
|
||||
#include "api/units/time_delta.h"
|
||||
#include "modules/audio_coding/codecs/opus/opus_interface.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -34,6 +33,11 @@ class AudioEncoderMultiChannelOpusImpl final : public AudioEncoder {
|
||||
int payload_type);
|
||||
~AudioEncoderMultiChannelOpusImpl() override;
|
||||
|
||||
AudioEncoderMultiChannelOpusImpl(const AudioEncoderMultiChannelOpusImpl&) =
|
||||
delete;
|
||||
AudioEncoderMultiChannelOpusImpl& operator=(
|
||||
const AudioEncoderMultiChannelOpusImpl&) = delete;
|
||||
|
||||
// Static interface for use by BuiltinAudioEncoderFactory.
|
||||
static constexpr const char* GetPayloadName() { return "multiopus"; }
|
||||
static absl::optional<AudioCodecInfo> QueryAudioEncoder(
|
||||
@ -81,7 +85,6 @@ class AudioEncoderMultiChannelOpusImpl final : public AudioEncoder {
|
||||
int next_frame_length_ms_;
|
||||
|
||||
friend struct AudioEncoderMultiChannelOpus;
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderMultiChannelOpusImpl);
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
#include "common_audio/smoothing_filter.h"
|
||||
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
|
||||
#include "modules/audio_coding/codecs/opus/opus_interface.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -61,6 +60,9 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
|
||||
AudioEncoderOpusImpl(int payload_type, const SdpAudioFormat& format);
|
||||
~AudioEncoderOpusImpl() override;
|
||||
|
||||
AudioEncoderOpusImpl(const AudioEncoderOpusImpl&) = delete;
|
||||
AudioEncoderOpusImpl& operator=(const AudioEncoderOpusImpl&) = delete;
|
||||
|
||||
int SampleRateHz() const override;
|
||||
size_t NumChannels() const override;
|
||||
int RtpTimestampRateHz() const override;
|
||||
@ -175,7 +177,6 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
|
||||
int consecutive_dtx_frames_;
|
||||
|
||||
friend struct AudioEncoderOpus;
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderOpusImpl);
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
Reference in New Issue
Block a user