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
89 lines
3.3 KiB
C++
89 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2012 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_VIDEO_ENGINE_VIE_BASE_IMPL_H_
|
|
#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
|
|
|
|
#include "webrtc/video_engine/include/vie_base.h"
|
|
#include "webrtc/video_engine/vie_defines.h"
|
|
#include "webrtc/video_engine/vie_ref_count.h"
|
|
#include "webrtc/video_engine/vie_shared_data.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Config;
|
|
class Module;
|
|
class VoiceEngine;
|
|
|
|
class ViEBaseImpl
|
|
: public ViEBase,
|
|
public ViERefCount {
|
|
public:
|
|
virtual int Release();
|
|
|
|
// Implements ViEBase.
|
|
virtual int Init();
|
|
virtual int SetVoiceEngine(VoiceEngine* voice_engine);
|
|
virtual int RegisterCpuOveruseObserver(int channel,
|
|
CpuOveruseObserver* observer);
|
|
virtual int SetCpuOveruseOptions(int channel,
|
|
const CpuOveruseOptions& options);
|
|
void RegisterCpuOveruseMetricsObserver(
|
|
int channel,
|
|
CpuOveruseMetricsObserver* observer) override;
|
|
virtual int GetCpuOveruseMetrics(int channel,
|
|
CpuOveruseMetrics* metrics);
|
|
void RegisterSendSideDelayObserver(int channel,
|
|
SendSideDelayObserver* observer) override;
|
|
virtual int CreateChannel(int& video_channel); // NOLINT
|
|
virtual int CreateChannel(int& video_channel, // NOLINT
|
|
const Config* config);
|
|
virtual int CreateChannel(int& video_channel, // NOLINT
|
|
int original_channel);
|
|
virtual int CreateChannelWithoutDefaultEncoder(int& video_channel, // NOLINT
|
|
int original_channel);
|
|
|
|
virtual int CreateReceiveChannel(int& video_channel, // NOLINT
|
|
int original_channel);
|
|
virtual int DeleteChannel(const int video_channel);
|
|
virtual int ConnectAudioChannel(const int video_channel,
|
|
const int audio_channel);
|
|
virtual int DisconnectAudioChannel(const int video_channel);
|
|
virtual int StartSend(const int video_channel);
|
|
virtual int StopSend(const int video_channel);
|
|
virtual int StartReceive(const int video_channel);
|
|
virtual int StopReceive(const int video_channel);
|
|
virtual int GetVersion(char version[1024]);
|
|
virtual int LastError();
|
|
|
|
protected:
|
|
explicit ViEBaseImpl(const Config& config);
|
|
virtual ~ViEBaseImpl();
|
|
|
|
ViESharedData* shared_data() { return &shared_data_; }
|
|
|
|
private:
|
|
int CreateChannel(int& video_channel, int original_channel, // NOLINT
|
|
bool sender, bool disable_default_encoder);
|
|
|
|
void RegisterSendStatisticsProxy(
|
|
int channel,
|
|
SendStatisticsProxy* send_statistics_proxy) override;
|
|
void RegisterReceiveStatisticsProxy(
|
|
int channel,
|
|
ReceiveStatisticsProxy* receive_statistics_proxy) override;
|
|
// ViEBaseImpl owns ViESharedData used by all interface implementations.
|
|
ViESharedData shared_data_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
|