admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes in the wav_file implementation in order to

Browse Source 
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}
This commit is contained in:
peah 2016-02-22 02:13:28 -08:00 committed by Commit bot
parent 253d8fa82c
commit d1f718bb1e
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/common_audio/wav_file.cc
View File

@ -64,6 +64,18 @@ WavReader::~WavReader() {
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 @@ WavWriter::~WavWriter() {
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"

16
webrtc/common_audio/wav_file.h
View File

@ -42,7 +42,7 @@ class WavWriter final : public WavFile {
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 @@ class WavWriter final : public WavFile {
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 @@ class WavReader final : public WavFile {
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();