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
104 lines
3.7 KiB
C++
104 lines
3.7 KiB
C++
/*
|
|
* Copyright (c) 2013 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_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h"
|
|
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtpReceiverImpl : public RtpReceiver {
|
|
public:
|
|
// Callbacks passed in here may not be NULL (use Null Object callbacks if you
|
|
// want callbacks to do nothing). This class takes ownership of the media
|
|
// receiver but nothing else.
|
|
RtpReceiverImpl(int32_t id,
|
|
Clock* clock,
|
|
RtpAudioFeedback* incoming_audio_messages_callback,
|
|
RtpFeedback* incoming_messages_callback,
|
|
RTPPayloadRegistry* rtp_payload_registry,
|
|
RTPReceiverStrategy* rtp_media_receiver);
|
|
|
|
virtual ~RtpReceiverImpl();
|
|
|
|
int32_t RegisterReceivePayload(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
|
|
const int8_t payload_type,
|
|
const uint32_t frequency,
|
|
const uint8_t channels,
|
|
const uint32_t rate) override;
|
|
|
|
int32_t DeRegisterReceivePayload(const int8_t payload_type) override;
|
|
|
|
bool IncomingRtpPacket(const RTPHeader& rtp_header,
|
|
const uint8_t* payload,
|
|
size_t payload_length,
|
|
PayloadUnion payload_specific,
|
|
bool in_order) override;
|
|
|
|
NACKMethod NACK() const override;
|
|
|
|
// Turn negative acknowledgement requests on/off.
|
|
void SetNACKStatus(const NACKMethod method) override;
|
|
|
|
// Returns the last received timestamp.
|
|
bool Timestamp(uint32_t* timestamp) const override;
|
|
bool LastReceivedTimeMs(int64_t* receive_time_ms) const override;
|
|
|
|
uint32_t SSRC() const override;
|
|
|
|
int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override;
|
|
|
|
int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override;
|
|
|
|
TelephoneEventHandler* GetTelephoneEventHandler() override;
|
|
|
|
private:
|
|
bool HaveReceivedFrame() const;
|
|
|
|
void CheckSSRCChanged(const RTPHeader& rtp_header);
|
|
void CheckCSRC(const WebRtcRTPHeader& rtp_header);
|
|
int32_t CheckPayloadChanged(const RTPHeader& rtp_header,
|
|
const int8_t first_payload_byte,
|
|
bool& is_red,
|
|
PayloadUnion* payload,
|
|
bool* should_reset_statistics);
|
|
|
|
Clock* clock_;
|
|
RTPPayloadRegistry* rtp_payload_registry_;
|
|
rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_;
|
|
|
|
int32_t id_;
|
|
|
|
RtpFeedback* cb_rtp_feedback_;
|
|
|
|
rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtp_receiver_;
|
|
int64_t last_receive_time_;
|
|
size_t last_received_payload_length_;
|
|
|
|
// SSRCs.
|
|
uint32_t ssrc_;
|
|
uint8_t num_csrcs_;
|
|
uint32_t current_remote_csrc_[kRtpCsrcSize];
|
|
|
|
uint32_t last_received_timestamp_;
|
|
int64_t last_received_frame_time_ms_;
|
|
uint16_t last_received_sequence_number_;
|
|
|
|
NACKMethod nack_method_;
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
|