zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some chromium-style warnings in webrtc/modules/rtp_rtcp/

Browse Source 
BUG=163
R=pwestin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1904005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4444 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-07-31 15:17:19 +00:00
parent 8f23df51d4
commit f3e4ceee47
16 changed files with 218 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -36,119 +36,119 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
// Returns the number of milliseconds until the module want a worker thread to
// call Process.
virtual int32_t TimeUntilNextProcess();
virtual int32_t TimeUntilNextProcess() OVERRIDE;
// Process any pending tasks such as timeouts.
virtual int32_t Process();
virtual int32_t Process() OVERRIDE;
// Receiver part.
// Configure a timeout value.
virtual int32_t SetPacketTimeout(const uint32_t rtp_timeout_ms,
const uint32_t rtcp_timeout_ms);
const uint32_t rtcp_timeout_ms) OVERRIDE;
// Set periodic dead or alive notification.
virtual int32_t SetPeriodicDeadOrAliveStatus(
const bool enable,
const uint8_t sample_time_seconds);
const uint8_t sample_time_seconds) OVERRIDE;
// Get periodic dead or alive notification status.
virtual int32_t PeriodicDeadOrAliveStatus(
bool& enable,
uint8_t& sample_time_seconds);
uint8_t& sample_time_seconds) OVERRIDE;
virtual int32_t RegisterReceivePayload(const CodecInst& voice_codec);
virtual int32_t RegisterReceivePayload(const CodecInst& voice_codec) OVERRIDE;
virtual int32_t RegisterReceivePayload(const VideoCodec& video_codec);
virtual int32_t RegisterReceivePayload(
const VideoCodec& video_codec) OVERRIDE;
virtual int32_t ReceivePayloadType(const CodecInst& voice_codec,
int8_t* pl_type);
int8_t* pl_type) OVERRIDE;
virtual int32_t ReceivePayloadType(const VideoCodec& video_codec,
int8_t* pl_type);
int8_t* pl_type) OVERRIDE;
virtual int32_t DeRegisterReceivePayload(
const int8_t payload_type);
virtual int32_t DeRegisterReceivePayload(const int8_t payload_type) OVERRIDE;
// Get the currently configured SSRC filter.
virtual int32_t SSRCFilter(uint32_t& allowed_ssrc) const;
virtual int32_t SSRCFilter(uint32_t& allowed_ssrc) const OVERRIDE;
// Set a SSRC to be used as a filter for incoming RTP streams.
virtual int32_t SetSSRCFilter(const bool enable,
const uint32_t allowed_ssrc);
const uint32_t allowed_ssrc) OVERRIDE;
// Get last received remote timestamp.
virtual uint32_t RemoteTimestamp() const;
virtual uint32_t RemoteTimestamp() const OVERRIDE;
// Get the local time of the last received remote timestamp.
virtual int64_t LocalTimeOfRemoteTimeStamp() const;
virtual int64_t LocalTimeOfRemoteTimeStamp() const OVERRIDE;
// Get the current estimated remote timestamp.
virtual int32_t EstimatedRemoteTimeStamp(
uint32_t& timestamp) const;
virtual int32_t EstimatedRemoteTimeStamp(uint32_t& timestamp) const OVERRIDE;
virtual uint32_t RemoteSSRC() const;
virtual uint32_t RemoteSSRC() const OVERRIDE;
virtual int32_t RemoteCSRCs(
uint32_t arr_of_csrc[kRtpCsrcSize]) const;
virtual int32_t RemoteCSRCs(uint32_t arr_of_csrc[kRtpCsrcSize]) const
OVERRIDE;
virtual int32_t SetRTXReceiveStatus(const bool enable,
const uint32_t ssrc);
const uint32_t ssrc) OVERRIDE;
virtual int32_t RTXReceiveStatus(bool* enable, uint32_t* ssrc,
int* payloadType) const;
int* payloadType) const OVERRIDE;
virtual void SetRtxReceivePayloadType(int payload_type);
virtual void SetRtxReceivePayloadType(int payload_type) OVERRIDE;
// Called when we receive an RTP packet.
virtual int32_t IncomingRtpPacket(const uint8_t* incoming_packet,
const uint16_t packet_length,
const RTPHeader& parsed_rtp_header);
virtual int32_t IncomingRtpPacket(
const uint8_t* incoming_packet,
const uint16_t packet_length,
const RTPHeader& parsed_rtp_header) OVERRIDE;
// Called when we receive an RTCP packet.
virtual int32_t IncomingRtcpPacket(const uint8_t* incoming_packet,
uint16_t incoming_packet_length);
uint16_t incoming_packet_length) OVERRIDE;
// Sender part.
virtual int32_t RegisterSendPayload(const CodecInst& voice_codec);
virtual int32_t RegisterSendPayload(const CodecInst& voice_codec) OVERRIDE;
virtual int32_t RegisterSendPayload(const VideoCodec& video_codec);
virtual int32_t RegisterSendPayload(const VideoCodec& video_codec) OVERRIDE;
virtual int32_t DeRegisterSendPayload(const int8_t payload_type);
virtual int32_t DeRegisterSendPayload(const int8_t payload_type) OVERRIDE;
virtual int8_t SendPayloadType() const;
// Register RTP header extension.
virtual int32_t RegisterSendRtpHeaderExtension(
const RTPExtensionType type,
const uint8_t id);
const uint8_t id) OVERRIDE;
virtual int32_t DeregisterSendRtpHeaderExtension(
const RTPExtensionType type);
const RTPExtensionType type) OVERRIDE;
// Get start timestamp.
virtual uint32_t StartTimestamp() const;
virtual uint32_t StartTimestamp() const OVERRIDE;
// Configure start timestamp, default is a random number.
virtual int32_t SetStartTimestamp(const uint32_t timestamp);
virtual int32_t SetStartTimestamp(const uint32_t timestamp) OVERRIDE;
virtual uint16_t SequenceNumber() const;
virtual uint16_t SequenceNumber() const OVERRIDE;
// Set SequenceNumber, default is a random number.
virtual int32_t SetSequenceNumber(const uint16_t seq);
virtual int32_t SetSequenceNumber(const uint16_t seq) OVERRIDE;
virtual uint32_t SSRC() const;
virtual uint32_t SSRC() const OVERRIDE;
// Configure SSRC, default is a random number.
virtual int32_t SetSSRC(const uint32_t ssrc);
virtual int32_t SetSSRC(const uint32_t ssrc) OVERRIDE;
virtual int32_t CSRCs(uint32_t arr_of_csrc[kRtpCsrcSize]) const;
virtual int32_t CSRCs(uint32_t arr_of_csrc[kRtpCsrcSize]) const OVERRIDE;
virtual int32_t SetCSRCs(const uint32_t arr_of_csrc[kRtpCsrcSize],
const uint8_t arr_length);
const uint8_t arr_length) OVERRIDE;
virtual int32_t SetCSRCStatus(const bool include);
virtual int32_t SetCSRCStatus(const bool include) OVERRIDE;
virtual uint32_t PacketCountSent() const;
@ -158,23 +158,23 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual int32_t SetRTXSendStatus(const RtxMode mode,
const bool set_ssrc,
const uint32_t ssrc);
const uint32_t ssrc) OVERRIDE;
virtual int32_t RTXSendStatus(RtxMode* mode, uint32_t* ssrc,
int* payloadType) const;
int* payloadType) const OVERRIDE;
virtual void SetRtxSendPayloadType(int payload_type);
virtual void SetRtxSendPayloadType(int payload_type) OVERRIDE;
// Sends kRtcpByeCode when going from true to false.
virtual int32_t SetSendingStatus(const bool sending);
virtual int32_t SetSendingStatus(const bool sending) OVERRIDE;
virtual bool Sending() const;
virtual bool Sending() const OVERRIDE;
// Drops or relays media packets.
virtual int32_t SetSendingMediaStatus(const bool sending);
virtual int32_t SetSendingMediaStatus(const bool sending) OVERRIDE;
virtual bool SendingMedia() const;
virtual bool SendingMedia() const OVERRIDE;
// Used by the codec module to deliver a video or audio frame for
// packetization.
@ -186,78 +186,78 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
const uint8_t* payload_data,
const uint32_t payload_size,
const RTPFragmentationHeader* fragmentation = NULL,
const RTPVideoHeader* rtp_video_hdr = NULL);
const RTPVideoHeader* rtp_video_hdr = NULL) OVERRIDE;
virtual bool TimeToSendPacket(uint32_t ssrc, uint16_t sequence_number,
int64_t capture_time_ms);
int64_t capture_time_ms) OVERRIDE;
// Returns the number of padding bytes actually sent, which can be more or
// less than |bytes|.
virtual int TimeToSendPadding(int bytes);
virtual int TimeToSendPadding(int bytes) OVERRIDE;
// RTCP part.
// Get RTCP status.
virtual RTCPMethod RTCP() const;
virtual RTCPMethod RTCP() const OVERRIDE;
// Configure RTCP status i.e on/off.
virtual int32_t SetRTCPStatus(const RTCPMethod method);
virtual int32_t SetRTCPStatus(const RTCPMethod method) OVERRIDE;
// Set RTCP CName.
virtual int32_t SetCNAME(const char c_name[RTCP_CNAME_SIZE]);
virtual int32_t SetCNAME(const char c_name[RTCP_CNAME_SIZE]) OVERRIDE;
// Get RTCP CName.
virtual int32_t CNAME(char c_name[RTCP_CNAME_SIZE]);
virtual int32_t CNAME(char c_name[RTCP_CNAME_SIZE]) OVERRIDE;
// Get remote CName.
virtual int32_t RemoteCNAME(const uint32_t remote_ssrc,
char c_name[RTCP_CNAME_SIZE]) const;
char c_name[RTCP_CNAME_SIZE]) const OVERRIDE;
// Get remote NTP.
virtual int32_t RemoteNTP(uint32_t* received_ntp_secs,
uint32_t* received_ntp_frac,
uint32_t* rtcp_arrival_time_secs,
uint32_t* rtcp_arrival_time_frac,
uint32_t* rtcp_timestamp) const;
uint32_t* rtcp_timestamp) const OVERRIDE;
virtual int32_t AddMixedCNAME(const uint32_t ssrc,
const char c_name[RTCP_CNAME_SIZE]);
const char c_name[RTCP_CNAME_SIZE]) OVERRIDE;
virtual int32_t RemoveMixedCNAME(const uint32_t ssrc);
virtual int32_t RemoveMixedCNAME(const uint32_t ssrc) OVERRIDE;
// Get RoundTripTime.
virtual int32_t RTT(const uint32_t remote_ssrc,
uint16_t* rtt,
uint16_t* avg_rtt,
uint16_t* min_rtt,
uint16_t* max_rtt) const;
uint16_t* max_rtt) const OVERRIDE;
// Reset RoundTripTime statistics.
virtual int32_t ResetRTT(const uint32_t remote_ssrc);
virtual int32_t ResetRTT(const uint32_t remote_ssrc) OVERRIDE;
virtual void SetRtt(uint32_t rtt);
virtual void SetRtt(uint32_t rtt) OVERRIDE;
// Force a send of an RTCP packet.
// Normal SR and RR are triggered via the process function.
virtual int32_t SendRTCP(uint32_t rtcp_packet_type = kRtcpReport);
virtual int32_t SendRTCP(uint32_t rtcp_packet_type = kRtcpReport) OVERRIDE;
// Statistics of our locally created statistics of the received RTP stream.
virtual int32_t StatisticsRTP(uint8_t* fraction_lost,
uint32_t* cum_lost,
uint32_t* ext_max,
uint32_t* jitter,
uint32_t* max_jitter = NULL) const;
uint32_t* max_jitter = NULL) const OVERRIDE;
// Reset RTP statistics.
virtual int32_t ResetStatisticsRTP();
virtual int32_t ResetStatisticsRTP() OVERRIDE;
virtual int32_t ResetReceiveDataCountersRTP();
virtual int32_t ResetReceiveDataCountersRTP() OVERRIDE;
virtual int32_t ResetSendDataCountersRTP();
virtual int32_t ResetSendDataCountersRTP() OVERRIDE;
// Statistics of the amount of data sent and received.
virtual int32_t DataCountersRTP(uint32_t* bytes_sent,
uint32_t* packets_sent,
uint32_t* bytes_received,
uint32_t* packets_received) const;
uint32_t* packets_received) const OVERRIDE;
virtual int32_t ReportBlockStatistics(
uint8_t* fraction_lost,
@ -267,118 +267,120 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
uint32_t* jitter_transmission_time_offset);
// Get received RTCP report, sender info.
virtual int32_t RemoteRTCPStat(RTCPSenderInfo* sender_info);
virtual int32_t RemoteRTCPStat(RTCPSenderInfo* sender_info) OVERRIDE;
// Get received RTCP report, report block.
virtual int32_t RemoteRTCPStat(
std::vector<RTCPReportBlock>* receive_blocks) const;
std::vector<RTCPReportBlock>* receive_blocks) const OVERRIDE;
// Set received RTCP report block.
virtual int32_t AddRTCPReportBlock(
const uint32_t ssrc, const RTCPReportBlock* receive_block);
const uint32_t ssrc, const RTCPReportBlock* receive_block) OVERRIDE;
virtual int32_t RemoveRTCPReportBlock(const uint32_t ssrc);
virtual int32_t RemoveRTCPReportBlock(const uint32_t ssrc) OVERRIDE;
// (REMB) Receiver Estimated Max Bitrate.
virtual bool REMB() const;
virtual bool REMB() const OVERRIDE;
virtual int32_t SetREMBStatus(const bool enable);
virtual int32_t SetREMBStatus(const bool enable) OVERRIDE;
virtual int32_t SetREMBData(const uint32_t bitrate,
const uint8_t number_of_ssrc,
const uint32_t* ssrc);
const uint32_t* ssrc) OVERRIDE;
// (IJ) Extended jitter report.
virtual bool IJ() const;
virtual bool IJ() const OVERRIDE;
virtual int32_t SetIJStatus(const bool enable);
virtual int32_t SetIJStatus(const bool enable) OVERRIDE;
// (TMMBR) Temporary Max Media Bit Rate.
virtual bool TMMBR() const;
virtual bool TMMBR() const OVERRIDE;
virtual int32_t SetTMMBRStatus(const bool enable);
virtual int32_t SetTMMBRStatus(const bool enable) OVERRIDE;
int32_t SetTMMBN(const TMMBRSet* bounding_set);
virtual uint16_t MaxPayloadLength() const;
virtual uint16_t MaxPayloadLength() const OVERRIDE;
virtual uint16_t MaxDataPayloadLength() const;
virtual uint16_t MaxDataPayloadLength() const OVERRIDE;
virtual int32_t SetMaxTransferUnit(const uint16_t size);
virtual int32_t SetMaxTransferUnit(const uint16_t size) OVERRIDE;
virtual int32_t SetTransportOverhead(
const bool tcp,
const bool ipv6,
const uint8_t authentication_overhead = 0);
const uint8_t authentication_overhead = 0) OVERRIDE;
// (NACK) Negative acknowledgment part.
// Is Negative acknowledgment requests on/off?
virtual NACKMethod NACK() const;
virtual NACKMethod NACK() const OVERRIDE;
// Turn negative acknowledgment requests on/off.
virtual int32_t SetNACKStatus(const NACKMethod method,
int max_reordering_threshold);
int max_reordering_threshold) OVERRIDE;
virtual int SelectiveRetransmissions() const;
virtual int SelectiveRetransmissions() const OVERRIDE;
virtual int SetSelectiveRetransmissions(uint8_t settings);
virtual int SetSelectiveRetransmissions(uint8_t settings) OVERRIDE;
// Send a Negative acknowledgment packet.
virtual int32_t SendNACK(const uint16_t* nack_list, const uint16_t size);
virtual int32_t SendNACK(const uint16_t* nack_list,
const uint16_t size) OVERRIDE;
// Store the sent packets, needed to answer to a negative acknowledgment
// requests.
virtual int32_t SetStorePacketsStatus(
const bool enable, const uint16_t number_to_store);
const bool enable, const uint16_t number_to_store) OVERRIDE;
// (APP) Application specific data.
virtual int32_t SetRTCPApplicationSpecificData(
const uint8_t sub_type,
const uint32_t name,
const uint8_t* data,
const uint16_t length);
const uint16_t length) OVERRIDE;
// (XR) VOIP metric.
virtual int32_t SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric);
virtual int32_t SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric) OVERRIDE;
// Audio part.
// Set audio packet size, used to determine when it's time to send a DTMF
// packet in silence (CNG).
virtual int32_t SetAudioPacketSize(
const uint16_t packet_size_samples);
const uint16_t packet_size_samples) OVERRIDE;
// Forward DTMFs to decoder for playout.
virtual int SetTelephoneEventForwardToDecoder(bool forward_to_decoder);
virtual int SetTelephoneEventForwardToDecoder(
bool forward_to_decoder) OVERRIDE;
// Is forwarding of outband telephone events turned on/off?
virtual bool TelephoneEventForwardToDecoder() const;
virtual bool TelephoneEventForwardToDecoder() const OVERRIDE;
virtual bool SendTelephoneEventActive(int8_t& telephone_event) const;
virtual bool SendTelephoneEventActive(int8_t& telephone_event) const OVERRIDE;
// Send a TelephoneEvent tone using RFC 2833 (4733).
virtual int32_t SendTelephoneEventOutband(const uint8_t key,
const uint16_t time_ms,
const uint8_t level);
const uint8_t level) OVERRIDE;
// Set payload type for Redundant Audio Data RFC 2198.
virtual int32_t SetSendREDPayloadType(const int8_t payload_type);
virtual int32_t SetSendREDPayloadType(const int8_t payload_type) OVERRIDE;
// Get payload type for Redundant Audio Data RFC 2198.
virtual int32_t SendREDPayloadType(int8_t& payload_type) const;
virtual int32_t SendREDPayloadType(int8_t& payload_type) const OVERRIDE;
// Set status and id for header-extension-for-audio-level-indication.
virtual int32_t SetRTPAudioLevelIndicationStatus(
const bool enable, const uint8_t id);
const bool enable, const uint8_t id) OVERRIDE;
// Get status and id for header-extension-for-audio-level-indication.
virtual int32_t GetRTPAudioLevelIndicationStatus(
bool& enable, uint8_t& id) const;
bool& enable, uint8_t& id) const OVERRIDE;
// Store the audio level in d_bov for header-extension-for-audio-level-
// indication.
virtual int32_t SetAudioLevel(const uint8_t level_d_bov);
virtual int32_t SetAudioLevel(const uint8_t level_d_bov) OVERRIDE;
// Video part.
@ -387,32 +389,32 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual RtpVideoCodecTypes SendVideoCodec() const;
virtual int32_t SendRTCPSliceLossIndication(
const uint8_t picture_id);
const uint8_t picture_id) OVERRIDE;
// Set method for requestion a new key frame.
virtual int32_t SetKeyFrameRequestMethod(
const KeyFrameRequestMethod method);
const KeyFrameRequestMethod method) OVERRIDE;
// Send a request for a keyframe.
virtual int32_t RequestKeyFrame();
virtual int32_t RequestKeyFrame() OVERRIDE;
virtual int32_t SetCameraDelay(const int32_t delay_ms);
virtual int32_t SetCameraDelay(const int32_t delay_ms) OVERRIDE;
virtual void SetTargetSendBitrate(const uint32_t bitrate);
virtual void SetTargetSendBitrate(const uint32_t bitrate) OVERRIDE;
virtual int32_t SetGenericFECStatus(
const bool enable,
const uint8_t payload_type_red,
const uint8_t payload_type_fec);
const uint8_t payload_type_fec) OVERRIDE;
virtual int32_t GenericFECStatus(
bool& enable,
uint8_t& payload_type_red,
uint8_t& payload_type_fec);
uint8_t& payload_type_fec) OVERRIDE;
virtual int32_t SetFecParameters(
const FecProtectionParams* delta_params,
const FecProtectionParams* key_params);
const FecProtectionParams* key_params) OVERRIDE;
virtual int32_t LastReceivedNTP(uint32_t& NTPsecs,
uint32_t& NTPfrac,
@ -423,7 +425,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual void BitrateSent(uint32_t* total_rate,
uint32_t* video_rate,
uint32_t* fec_rate,
uint32_t* nackRate) const;
uint32_t* nackRate) const OVERRIDE;
virtual void SetRemoteSSRC(const uint32_t ssrc);
@ -431,7 +433,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
// Good state of RTP receiver inform sender.
virtual int32_t SendRTCPReferencePictureSelection(
const uint64_t picture_id);
const uint64_t picture_id) OVERRIDE;
void OnReceivedTMMBR();