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
68 lines
2.0 KiB
C++
68 lines
2.0 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.
|
|
*/
|
|
|
|
// ViESyncModule is responsible for synchronization audio and video for a given
|
|
// VoE and ViE channel couple.
|
|
|
|
#ifndef WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_
|
|
#define WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/modules/interface/module.h"
|
|
#include "webrtc/system_wrappers/interface/tick_util.h"
|
|
#include "webrtc/video_engine/stream_synchronization.h"
|
|
#include "webrtc/voice_engine/include/voe_video_sync.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class CriticalSectionWrapper;
|
|
class RtpRtcp;
|
|
class VideoCodingModule;
|
|
class ViEChannel;
|
|
class VoEVideoSync;
|
|
|
|
class ViESyncModule : public Module {
|
|
public:
|
|
ViESyncModule(VideoCodingModule* vcm,
|
|
ViEChannel* vie_channel);
|
|
~ViESyncModule();
|
|
|
|
int ConfigureSync(int voe_channel_id,
|
|
VoEVideoSync* voe_sync_interface,
|
|
RtpRtcp* video_rtcp_module,
|
|
RtpReceiver* video_receiver);
|
|
|
|
int VoiceChannel();
|
|
|
|
// Set target delay for buffering mode (0 = real-time mode).
|
|
int SetTargetBufferingDelay(int target_delay_ms);
|
|
|
|
// Implements Module.
|
|
int64_t TimeUntilNextProcess() override;
|
|
int32_t Process() override;
|
|
|
|
private:
|
|
rtc::scoped_ptr<CriticalSectionWrapper> data_cs_;
|
|
VideoCodingModule* vcm_;
|
|
ViEChannel* vie_channel_;
|
|
RtpReceiver* video_receiver_;
|
|
RtpRtcp* video_rtp_rtcp_;
|
|
int voe_channel_id_;
|
|
VoEVideoSync* voe_sync_interface_;
|
|
TickTime last_sync_time_;
|
|
rtc::scoped_ptr<StreamSynchronization> sync_;
|
|
StreamSynchronization::Measurements audio_measurement_;
|
|
StreamSynchronization::Measurements video_measurement_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_
|