Changes in the wav_file implementation in order to
avoid clang warnings.
The changes does not change any of the functionality
in the code.
BUG=webrtc:163
Review URL: https://codereview.webrtc.org/1710083006
Cr-Commit-Position: refs/heads/master@{#11705}
diff --git a/webrtc/common_audio/wav_file.cc b/webrtc/common_audio/wav_file.cc
index 94b7a3c..572c94b 100644
--- a/webrtc/common_audio/wav_file.cc
+++ b/webrtc/common_audio/wav_file.cc
@@ -64,6 +64,18 @@
Close();
}
+int WavReader::sample_rate() const {
+ return sample_rate_;
+}
+
+size_t WavReader::num_channels() const {
+ return num_channels_;
+}
+
+size_t WavReader::num_samples() const {
+ return num_samples_;
+}
+
size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
#error "Need to convert samples to big-endian when reading from WAV file"
@@ -118,6 +130,18 @@
Close();
}
+int WavWriter::sample_rate() const {
+ return sample_rate_;
+}
+
+size_t WavWriter::num_channels() const {
+ return num_channels_;
+}
+
+size_t WavWriter::num_samples() const {
+ return num_samples_;
+}
+
void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
#error "Need to convert samples to little-endian when writing to WAV file"
diff --git a/webrtc/common_audio/wav_file.h b/webrtc/common_audio/wav_file.h
index e656eb8..812c21d 100644
--- a/webrtc/common_audio/wav_file.h
+++ b/webrtc/common_audio/wav_file.h
@@ -42,7 +42,7 @@
WavWriter(const std::string& filename, int sample_rate, size_t num_channels);
// Close the WAV file, after writing its header.
- ~WavWriter();
+ ~WavWriter() override;
// Write additional samples to the file. Each sample is in the range
// [-32768,32767], and there must be the previously specified number of
@@ -50,9 +50,9 @@
void WriteSamples(const float* samples, size_t num_samples);
void WriteSamples(const int16_t* samples, size_t num_samples);
- int sample_rate() const override { return sample_rate_; }
- size_t num_channels() const override { return num_channels_; }
- size_t num_samples() const override { return num_samples_; }
+ int sample_rate() const override;
+ size_t num_channels() const override;
+ size_t num_samples() const override;
private:
void Close();
@@ -71,16 +71,16 @@
explicit WavReader(const std::string& filename);
// Close the WAV file.
- ~WavReader();
+ ~WavReader() override;
// Returns the number of samples read. If this is less than requested,
// verifies that the end of the file was reached.
size_t ReadSamples(size_t num_samples, float* samples);
size_t ReadSamples(size_t num_samples, int16_t* samples);
- int sample_rate() const override { return sample_rate_; }
- size_t num_channels() const override { return num_channels_; }
- size_t num_samples() const override { return num_samples_; }
+ int sample_rate() const override;
+ size_t num_channels() const override;
+ size_t num_samples() const override;
private:
void Close();
