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
@ -23,7 +23,6 @@
|
||||
#include "common_audio/channel_buffer.h"
|
||||
#include "common_audio/wav_file.h"
|
||||
#include "modules/audio_processing/include/audio_processing.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -35,13 +34,14 @@ class RawFile final {
|
||||
explicit RawFile(const std::string& filename);
|
||||
~RawFile();
|
||||
|
||||
RawFile(const RawFile&) = delete;
|
||||
RawFile& operator=(const RawFile&) = delete;
|
||||
|
||||
void WriteSamples(const int16_t* samples, size_t num_samples);
|
||||
void WriteSamples(const float* samples, size_t num_samples);
|
||||
|
||||
private:
|
||||
FILE* file_handle_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(RawFile);
|
||||
};
|
||||
|
||||
// Encapsulates samples and metadata for an integer frame.
|
||||
@ -78,6 +78,9 @@ class ChannelBufferWavReader final {
|
||||
explicit ChannelBufferWavReader(std::unique_ptr<WavReader> file);
|
||||
~ChannelBufferWavReader();
|
||||
|
||||
ChannelBufferWavReader(const ChannelBufferWavReader&) = delete;
|
||||
ChannelBufferWavReader& operator=(const ChannelBufferWavReader&) = delete;
|
||||
|
||||
// Reads data from the file according to the `buffer` format. Returns false if
|
||||
// a full buffer can't be read from the file.
|
||||
bool Read(ChannelBuffer<float>* buffer);
|
||||
@ -85,8 +88,6 @@ class ChannelBufferWavReader final {
|
||||
private:
|
||||
std::unique_ptr<WavReader> file_;
|
||||
std::vector<float> interleaved_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(ChannelBufferWavReader);
|
||||
};
|
||||
|
||||
// Writes ChannelBuffers to a provided WavWriter.
|
||||
@ -95,13 +96,14 @@ class ChannelBufferWavWriter final {
|
||||
explicit ChannelBufferWavWriter(std::unique_ptr<WavWriter> file);
|
||||
~ChannelBufferWavWriter();
|
||||
|
||||
ChannelBufferWavWriter(const ChannelBufferWavWriter&) = delete;
|
||||
ChannelBufferWavWriter& operator=(const ChannelBufferWavWriter&) = delete;
|
||||
|
||||
void Write(const ChannelBuffer<float>& buffer);
|
||||
|
||||
private:
|
||||
std::unique_ptr<WavWriter> file_;
|
||||
std::vector<float> interleaved_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(ChannelBufferWavWriter);
|
||||
};
|
||||
|
||||
// Takes a pointer to a vector. Allows appending the samples of channel buffers
|
||||
|
||||
Reference in New Issue
Block a user