14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
64 lines
1.9 KiB
C++
64 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/modules/interface/module_common_types.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// Interface class for an object receiving raw output audio from test
|
|
// applications.
|
|
class AudioSink {
|
|
public:
|
|
AudioSink() {}
|
|
virtual ~AudioSink() {}
|
|
|
|
// Writes |num_samples| from |audio| to the AudioSink. Returns true if
|
|
// successful, otherwise false.
|
|
virtual bool WriteArray(const int16_t* audio, size_t num_samples) = 0;
|
|
|
|
// Writes |audio_frame| to the AudioSink. Returns true if successful,
|
|
// otherwise false.
|
|
bool WriteAudioFrame(const AudioFrame& audio_frame) {
|
|
return WriteArray(
|
|
audio_frame.data_,
|
|
audio_frame.samples_per_channel_ * audio_frame.num_channels_);
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioSink);
|
|
};
|
|
|
|
// Forks the output audio to two AudioSink objects.
|
|
class AudioSinkFork : public AudioSink {
|
|
public:
|
|
AudioSinkFork(AudioSink* left, AudioSink* right)
|
|
: left_sink_(left), right_sink_(right) {}
|
|
|
|
bool WriteArray(const int16_t* audio, size_t num_samples) override {
|
|
return left_sink_->WriteArray(audio, num_samples) &&
|
|
right_sink_->WriteArray(audio, num_samples);
|
|
}
|
|
|
|
private:
|
|
AudioSink* left_sink_;
|
|
AudioSink* right_sink_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(AudioSinkFork);
|
|
};
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
|