Reformatted rtp_rtcp_impl*.

BUG=
TEST=Trybots.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3374 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2013-01-16 10:27:33 +00:00
parent 77a584be1d
commit acfdd96ee3
2 changed files with 1311 additions and 1337 deletions

File diff suppressed because it is too large Load Diff

View File

@ -12,13 +12,14 @@
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
#include <list> #include <list>
#include <vector>
#include "modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "modules/rtp_rtcp/source/rtcp_receiver.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
#include "modules/rtp_rtcp/source/rtcp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
#include "modules/rtp_rtcp/source/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver.h"
#include "modules/rtp_rtcp/source/rtp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#ifdef MATLAB #ifdef MATLAB
class MatlabPlot; class MatlabPlot;
@ -32,43 +33,43 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual ~ModuleRtpRtcpImpl(); virtual ~ModuleRtpRtcpImpl();
// returns the number of milliseconds until the module want a worker thread to call Process // Returns the number of milliseconds until the module want a worker thread to
// call Process.
virtual WebRtc_Word32 TimeUntilNextProcess(); virtual WebRtc_Word32 TimeUntilNextProcess();
// Process any pending tasks such as timeouts // Process any pending tasks such as timeouts.
virtual WebRtc_Word32 Process(); virtual WebRtc_Word32 Process();
/** // Receiver part.
* Receiver
*/
// configure a timeout value
virtual WebRtc_Word32 SetPacketTimeout(const WebRtc_UWord32 RTPtimeoutMS,
const WebRtc_UWord32 RTCPtimeoutMS);
// Set periodic dead or alive notification // Configure a timeout value.
virtual WebRtc_Word32 SetPacketTimeout(const WebRtc_UWord32 rtp_timeout_ms,
const WebRtc_UWord32 rtcp_timeout_ms);
// Set periodic dead or alive notification.
virtual WebRtc_Word32 SetPeriodicDeadOrAliveStatus( virtual WebRtc_Word32 SetPeriodicDeadOrAliveStatus(
const bool enable, const bool enable,
const WebRtc_UWord8 sampleTimeSeconds); const WebRtc_UWord8 sample_time_seconds);
// Get periodic dead or alive notification status // Get periodic dead or alive notification status.
virtual WebRtc_Word32 PeriodicDeadOrAliveStatus( virtual WebRtc_Word32 PeriodicDeadOrAliveStatus(
bool &enable, bool& enable,
WebRtc_UWord8 &sampleTimeSeconds); WebRtc_UWord8& sample_time_seconds);
virtual WebRtc_Word32 RegisterReceivePayload(const CodecInst& voiceCodec); virtual WebRtc_Word32 RegisterReceivePayload(const CodecInst& voice_codec);
virtual WebRtc_Word32 RegisterReceivePayload(const VideoCodec& videoCodec); virtual WebRtc_Word32 RegisterReceivePayload(const VideoCodec& video_codec);
virtual WebRtc_Word32 ReceivePayloadType(const CodecInst& voiceCodec, virtual WebRtc_Word32 ReceivePayloadType(const CodecInst& voice_codec,
WebRtc_Word8* plType); WebRtc_Word8* pl_type);
virtual WebRtc_Word32 ReceivePayloadType(const VideoCodec& videoCodec, virtual WebRtc_Word32 ReceivePayloadType(const VideoCodec& video_codec,
WebRtc_Word8* plType); WebRtc_Word8* pl_type);
virtual WebRtc_Word32 DeRegisterReceivePayload( virtual WebRtc_Word32 DeRegisterReceivePayload(
const WebRtc_Word8 payloadType); const WebRtc_Word8 payload_type);
// register RTP header extension // Register RTP header extension.
virtual WebRtc_Word32 RegisterReceiveRtpHeaderExtension( virtual WebRtc_Word32 RegisterReceiveRtpHeaderExtension(
const RTPExtensionType type, const RTPExtensionType type,
const WebRtc_UWord8 id); const WebRtc_UWord8 id);
@ -76,47 +77,49 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual WebRtc_Word32 DeregisterReceiveRtpHeaderExtension( virtual WebRtc_Word32 DeregisterReceiveRtpHeaderExtension(
const RTPExtensionType type); const RTPExtensionType type);
// get the currently configured SSRC filter // Get the currently configured SSRC filter.
virtual WebRtc_Word32 SSRCFilter(WebRtc_UWord32& allowedSSRC) const; virtual WebRtc_Word32 SSRCFilter(WebRtc_UWord32& allowed_ssrc) const;
// set a SSRC to be used as a filter for incoming RTP streams // Set a SSRC to be used as a filter for incoming RTP streams.
virtual WebRtc_Word32 SetSSRCFilter(const bool enable, const WebRtc_UWord32 allowedSSRC); virtual WebRtc_Word32 SetSSRCFilter(const bool enable,
const WebRtc_UWord32 allowed_ssrc);
// Get last received remote timestamp // Get last received remote timestamp.
virtual WebRtc_UWord32 RemoteTimestamp() const; virtual WebRtc_UWord32 RemoteTimestamp() const;
// Get the local time of the last received remote timestamp. // Get the local time of the last received remote timestamp.
virtual int64_t LocalTimeOfRemoteTimeStamp() const; virtual int64_t LocalTimeOfRemoteTimeStamp() const;
// Get the current estimated remote timestamp // Get the current estimated remote timestamp.
virtual WebRtc_Word32 EstimatedRemoteTimeStamp(WebRtc_UWord32& timestamp) const; virtual WebRtc_Word32 EstimatedRemoteTimeStamp(
WebRtc_UWord32& timestamp) const;
virtual WebRtc_UWord32 RemoteSSRC() const; virtual WebRtc_UWord32 RemoteSSRC() const;
virtual WebRtc_Word32 RemoteCSRCs( WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize]) const ; virtual WebRtc_Word32 RemoteCSRCs(
WebRtc_UWord32 arr_of_csrc[kRtpCsrcSize]) const;
virtual WebRtc_Word32 SetRTXReceiveStatus(const bool enable, virtual WebRtc_Word32 SetRTXReceiveStatus(const bool enable,
const WebRtc_UWord32 SSRC); const WebRtc_UWord32 ssrc);
virtual WebRtc_Word32 RTXReceiveStatus(bool* enable, virtual WebRtc_Word32 RTXReceiveStatus(bool* enable,
WebRtc_UWord32* SSRC) const; WebRtc_UWord32* ssrc) const;
// called by the network module when we receive a packet // Called by the network module when we receive a packet.
virtual WebRtc_Word32 IncomingPacket( const WebRtc_UWord8* incomingPacket, virtual WebRtc_Word32 IncomingPacket(const WebRtc_UWord8* incoming_packet,
const WebRtc_UWord16 packetLength); const WebRtc_UWord16 packet_length);
/** // Sender part.
* Sender
*/
virtual WebRtc_Word32 RegisterSendPayload(const CodecInst& voiceCodec);
virtual WebRtc_Word32 RegisterSendPayload(const VideoCodec& videoCodec); virtual WebRtc_Word32 RegisterSendPayload(const CodecInst& voice_codec);
virtual WebRtc_Word32 DeRegisterSendPayload(const WebRtc_Word8 payloadType); virtual WebRtc_Word32 RegisterSendPayload(const VideoCodec& video_codec);
virtual WebRtc_Word32 DeRegisterSendPayload(const WebRtc_Word8 payload_type);
virtual WebRtc_Word8 SendPayloadType() const; virtual WebRtc_Word8 SendPayloadType() const;
// register RTP header extension // Register RTP header extension.
virtual WebRtc_Word32 RegisterSendRtpHeaderExtension( virtual WebRtc_Word32 RegisterSendRtpHeaderExtension(
const RTPExtensionType type, const RTPExtensionType type,
const WebRtc_UWord8 id); const WebRtc_UWord8 id);
@ -124,26 +127,26 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual WebRtc_Word32 DeregisterSendRtpHeaderExtension( virtual WebRtc_Word32 DeregisterSendRtpHeaderExtension(
const RTPExtensionType type); const RTPExtensionType type);
// get start timestamp // Get start timestamp.
virtual WebRtc_UWord32 StartTimestamp() const; virtual WebRtc_UWord32 StartTimestamp() const;
// configure start timestamp, default is a random number // Configure start timestamp, default is a random number.
virtual WebRtc_Word32 SetStartTimestamp(const WebRtc_UWord32 timestamp); virtual WebRtc_Word32 SetStartTimestamp(const WebRtc_UWord32 timestamp);
virtual WebRtc_UWord16 SequenceNumber() const; virtual WebRtc_UWord16 SequenceNumber() const;
// Set SequenceNumber, default is a random number // Set SequenceNumber, default is a random number.
virtual WebRtc_Word32 SetSequenceNumber(const WebRtc_UWord16 seq); virtual WebRtc_Word32 SetSequenceNumber(const WebRtc_UWord16 seq);
virtual WebRtc_UWord32 SSRC() const; virtual WebRtc_UWord32 SSRC() const;
// configure SSRC, default is a random number // Configure SSRC, default is a random number.
virtual WebRtc_Word32 SetSSRC(const WebRtc_UWord32 ssrc); virtual WebRtc_Word32 SetSSRC(const WebRtc_UWord32 ssrc);
virtual WebRtc_Word32 CSRCs( WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize]) const ; virtual WebRtc_Word32 CSRCs(WebRtc_UWord32 arr_of_csrc[kRtpCsrcSize]) const;
virtual WebRtc_Word32 SetCSRCs( const WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize], virtual WebRtc_Word32 SetCSRCs(const WebRtc_UWord32 arr_of_csrc[kRtpCsrcSize],
const WebRtc_UWord8 arrLength); const WebRtc_UWord8 arr_length);
virtual WebRtc_Word32 SetCSRCStatus(const bool include); virtual WebRtc_Word32 SetCSRCStatus(const bool include);
@ -154,149 +157,142 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual WebRtc_UWord32 ByteCountSent() const; virtual WebRtc_UWord32 ByteCountSent() const;
virtual WebRtc_Word32 SetRTXSendStatus(const bool enable, virtual WebRtc_Word32 SetRTXSendStatus(const bool enable,
const bool setSSRC, const bool set_ssrc,
const WebRtc_UWord32 SSRC); const WebRtc_UWord32 ssrc);
virtual WebRtc_Word32 RTXSendStatus(bool* enable, virtual WebRtc_Word32 RTXSendStatus(bool* enable,
WebRtc_UWord32* SSRC) const; WebRtc_UWord32* ssrc) const;
// sends kRtcpByeCode when going from true to false // Sends kRtcpByeCode when going from true to false.
virtual WebRtc_Word32 SetSendingStatus(const bool sending); virtual WebRtc_Word32 SetSendingStatus(const bool sending);
virtual bool Sending() const; virtual bool Sending() const;
// Drops or relays media packets // Drops or relays media packets.
virtual WebRtc_Word32 SetSendingMediaStatus(const bool sending); virtual WebRtc_Word32 SetSendingMediaStatus(const bool sending);
virtual bool SendingMedia() const; virtual bool SendingMedia() const;
// Used by the codec module to deliver a video or audio frame for packetization // Used by the codec module to deliver a video or audio frame for
// packetization.
virtual WebRtc_Word32 SendOutgoingData( virtual WebRtc_Word32 SendOutgoingData(
const FrameType frameType, const FrameType frame_type,
const WebRtc_Word8 payloadType, const WebRtc_Word8 payload_type,
const WebRtc_UWord32 timeStamp, const WebRtc_UWord32 time_stamp,
int64_t capture_time_ms, int64_t capture_time_ms,
const WebRtc_UWord8* payloadData, const WebRtc_UWord8* payload_data,
const WebRtc_UWord32 payloadSize, const WebRtc_UWord32 payload_size,
const RTPFragmentationHeader* fragmentation = NULL, const RTPFragmentationHeader* fragmentation = NULL,
const RTPVideoHeader* rtpVideoHdr = NULL); const RTPVideoHeader* rtp_video_hdr = NULL);
virtual void TimeToSendPacket(uint32_t ssrc, uint16_t sequence_number, virtual void TimeToSendPacket(uint32_t ssrc, uint16_t sequence_number,
int64_t capture_time_ms); int64_t capture_time_ms);
/* // RTCP part.
* RTCP
*/
// Get RTCP status // Get RTCP status.
virtual RTCPMethod RTCP() const; virtual RTCPMethod RTCP() const;
// configure RTCP status i.e on/off // Configure RTCP status i.e on/off.
virtual WebRtc_Word32 SetRTCPStatus(const RTCPMethod method); virtual WebRtc_Word32 SetRTCPStatus(const RTCPMethod method);
// Set RTCP CName // Set RTCP CName.
virtual WebRtc_Word32 SetCNAME(const char cName[RTCP_CNAME_SIZE]); virtual WebRtc_Word32 SetCNAME(const char c_name[RTCP_CNAME_SIZE]);
// Get RTCP CName // Get RTCP CName.
virtual WebRtc_Word32 CNAME(char cName[RTCP_CNAME_SIZE]); virtual WebRtc_Word32 CNAME(char c_name[RTCP_CNAME_SIZE]);
// Get remote CName // Get remote CName.
virtual WebRtc_Word32 RemoteCNAME(const WebRtc_UWord32 remoteSSRC, virtual WebRtc_Word32 RemoteCNAME(const WebRtc_UWord32 remote_ssrc,
char cName[RTCP_CNAME_SIZE]) const; char c_name[RTCP_CNAME_SIZE]) const;
// Get remote NTP // Get remote NTP.
virtual WebRtc_Word32 RemoteNTP(WebRtc_UWord32 *ReceivedNTPsecs, virtual WebRtc_Word32 RemoteNTP(WebRtc_UWord32* received_ntp_secs,
WebRtc_UWord32 *ReceivedNTPfrac, WebRtc_UWord32* received_ntp_frac,
WebRtc_UWord32 *RTCPArrivalTimeSecs, WebRtc_UWord32* rtcp_arrival_time_secs,
WebRtc_UWord32 *RTCPArrivalTimeFrac, WebRtc_UWord32* rtcp_arrival_time_frac,
WebRtc_UWord32 *rtcp_timestamp) const; WebRtc_UWord32* rtcp_timestamp) const;
virtual WebRtc_Word32 AddMixedCNAME(const WebRtc_UWord32 SSRC, virtual WebRtc_Word32 AddMixedCNAME(const WebRtc_UWord32 ssrc,
const char cName[RTCP_CNAME_SIZE]); const char c_name[RTCP_CNAME_SIZE]);
virtual WebRtc_Word32 RemoveMixedCNAME(const WebRtc_UWord32 SSRC); virtual WebRtc_Word32 RemoveMixedCNAME(const WebRtc_UWord32 ssrc);
// Get RoundTripTime // Get RoundTripTime.
virtual WebRtc_Word32 RTT(const WebRtc_UWord32 remoteSSRC, virtual WebRtc_Word32 RTT(const WebRtc_UWord32 remote_ssrc,
WebRtc_UWord16* RTT, WebRtc_UWord16* rtt,
WebRtc_UWord16* avgRTT, WebRtc_UWord16* avg_rtt,
WebRtc_UWord16* minRTT, WebRtc_UWord16* min_rtt,
WebRtc_UWord16* maxRTT) const; WebRtc_UWord16* max_rtt) const;
// Reset RoundTripTime statistics // Reset RoundTripTime statistics.
virtual WebRtc_Word32 ResetRTT(const WebRtc_UWord32 remoteSSRC); virtual WebRtc_Word32 ResetRTT(const WebRtc_UWord32 remote_ssrc);
virtual void SetRtt(uint32_t rtt); virtual void SetRtt(uint32_t rtt);
// Force a send of an RTCP packet // Force a send of an RTCP packet.
// normal SR and RR are triggered via the process function // Normal SR and RR are triggered via the process function.
virtual WebRtc_Word32 SendRTCP(WebRtc_UWord32 rtcpPacketType = kRtcpReport); virtual WebRtc_Word32 SendRTCP(WebRtc_UWord32 rtcp_packet_type = kRtcpReport);
// statistics of our localy created statistics of the received RTP stream // Statistics of our locally created statistics of the received RTP stream.
virtual WebRtc_Word32 StatisticsRTP(WebRtc_UWord8 *fraction_lost, virtual WebRtc_Word32 StatisticsRTP(WebRtc_UWord8* fraction_lost,
WebRtc_UWord32 *cum_lost, WebRtc_UWord32* cum_lost,
WebRtc_UWord32 *ext_max, WebRtc_UWord32* ext_max,
WebRtc_UWord32 *jitter, WebRtc_UWord32* jitter,
WebRtc_UWord32 *max_jitter = NULL) const; WebRtc_UWord32* max_jitter = NULL) const;
// Reset RTP statistics // Reset RTP statistics.
virtual WebRtc_Word32 ResetStatisticsRTP(); virtual WebRtc_Word32 ResetStatisticsRTP();
virtual WebRtc_Word32 ResetReceiveDataCountersRTP(); virtual WebRtc_Word32 ResetReceiveDataCountersRTP();
virtual WebRtc_Word32 ResetSendDataCountersRTP(); virtual WebRtc_Word32 ResetSendDataCountersRTP();
// statistics of the amount of data sent and received // Statistics of the amount of data sent and received.
virtual WebRtc_Word32 DataCountersRTP(WebRtc_UWord32 *bytesSent, virtual WebRtc_Word32 DataCountersRTP(WebRtc_UWord32* bytes_sent,
WebRtc_UWord32 *packetsSent, WebRtc_UWord32* packets_sent,
WebRtc_UWord32 *bytesReceived, WebRtc_UWord32* bytes_received,
WebRtc_UWord32 *packetsReceived) const; WebRtc_UWord32* packets_received) const;
virtual WebRtc_Word32 ReportBlockStatistics( virtual WebRtc_Word32 ReportBlockStatistics(
WebRtc_UWord8 *fraction_lost, WebRtc_UWord8* fraction_lost,
WebRtc_UWord32 *cum_lost, WebRtc_UWord32* cum_lost,
WebRtc_UWord32 *ext_max, WebRtc_UWord32* ext_max,
WebRtc_UWord32 *jitter, WebRtc_UWord32* jitter,
WebRtc_UWord32 *jitter_transmission_time_offset); WebRtc_UWord32* jitter_transmission_time_offset);
// Get received RTCP report, sender info // Get received RTCP report, sender info.
virtual WebRtc_Word32 RemoteRTCPStat( RTCPSenderInfo* senderInfo); virtual WebRtc_Word32 RemoteRTCPStat(RTCPSenderInfo* sender_info);
// Get received RTCP report, report block // Get received RTCP report, report block.
virtual WebRtc_Word32 RemoteRTCPStat( virtual WebRtc_Word32 RemoteRTCPStat(
std::vector<RTCPReportBlock>* receiveBlocks) const; std::vector<RTCPReportBlock>* receive_blocks) const;
// Set received RTCP report block // Set received RTCP report block.
virtual WebRtc_Word32 AddRTCPReportBlock(const WebRtc_UWord32 SSRC, virtual WebRtc_Word32 AddRTCPReportBlock(
const RTCPReportBlock* receiveBlock); const WebRtc_UWord32 ssrc, const RTCPReportBlock* receive_block);
virtual WebRtc_Word32 RemoveRTCPReportBlock(const WebRtc_UWord32 SSRC); virtual WebRtc_Word32 RemoveRTCPReportBlock(const WebRtc_UWord32 ssrc);
/* // (REMB) Receiver Estimated Max Bitrate.
* (REMB) Receiver Estimated Max Bitrate
*/
virtual bool REMB() const; virtual bool REMB() const;
virtual WebRtc_Word32 SetREMBStatus(const bool enable); virtual WebRtc_Word32 SetREMBStatus(const bool enable);
virtual WebRtc_Word32 SetREMBData(const WebRtc_UWord32 bitrate, virtual WebRtc_Word32 SetREMBData(const WebRtc_UWord32 bitrate,
const WebRtc_UWord8 numberOfSSRC, const WebRtc_UWord8 number_of_ssrc,
const WebRtc_UWord32* SSRC); const WebRtc_UWord32* ssrc);
/* // (IJ) Extended jitter report.
* (IJ) Extended jitter report.
*/
virtual bool IJ() const; virtual bool IJ() const;
virtual WebRtc_Word32 SetIJStatus(const bool enable); virtual WebRtc_Word32 SetIJStatus(const bool enable);
/* // (TMMBR) Temporary Max Media Bit Rate.
* (TMMBR) Temporary Max Media Bit Rate virtual bool TMMBR() const;
*/
virtual bool TMMBR() const ;
virtual WebRtc_Word32 SetTMMBRStatus(const bool enable); virtual WebRtc_Word32 SetTMMBRStatus(const bool enable);
WebRtc_Word32 SetTMMBN(const TMMBRSet* boundingSet); WebRtc_Word32 SetTMMBN(const TMMBRSet* bounding_set);
virtual WebRtc_UWord16 MaxPayloadLength() const; virtual WebRtc_UWord16 MaxPayloadLength() const;
@ -304,54 +300,54 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual WebRtc_Word32 SetMaxTransferUnit(const WebRtc_UWord16 size); virtual WebRtc_Word32 SetMaxTransferUnit(const WebRtc_UWord16 size);
virtual WebRtc_Word32 SetTransportOverhead(const bool TCP, virtual WebRtc_Word32 SetTransportOverhead(
const bool IPV6, const bool tcp,
const WebRtc_UWord8 authenticationOverhead = 0); const bool ipv6,
const WebRtc_UWord8 authentication_overhead = 0);
/* // (NACK) Negative acknowledgment part.
* (NACK) Negative acknowledgement
*/
// Is Negative acknowledgement requests on/off? // Is Negative acknowledgment requests on/off?
virtual NACKMethod NACK() const ; virtual NACKMethod NACK() const;
// Turn negative acknowledgement requests on/off // Turn negative acknowledgment requests on/off.
virtual WebRtc_Word32 SetNACKStatus(const NACKMethod method); virtual WebRtc_Word32 SetNACKStatus(const NACKMethod method);
virtual int SelectiveRetransmissions() const; virtual int SelectiveRetransmissions() const;
virtual int SetSelectiveRetransmissions(uint8_t settings); virtual int SetSelectiveRetransmissions(uint8_t settings);
// Send a Negative acknowledgement packet // Send a Negative acknowledgment packet.
virtual WebRtc_Word32 SendNACK(const WebRtc_UWord16* nackList, virtual WebRtc_Word32 SendNACK(const WebRtc_UWord16* nack_list,
const WebRtc_UWord16 size); const WebRtc_UWord16 size);
// Store the sent packets, needed to answer to a Negative acknowledgement requests // Store the sent packets, needed to answer to a negative acknowledgment
virtual WebRtc_Word32 SetStorePacketsStatus(const bool enable, const WebRtc_UWord16 numberToStore = 200); // requests.
virtual WebRtc_Word32 SetStorePacketsStatus(
const bool enable, const WebRtc_UWord16 number_to_store = 200);
/* // (APP) Application specific data.
* (APP) Application specific data virtual WebRtc_Word32 SetRTCPApplicationSpecificData(
*/ const WebRtc_UWord8 sub_type,
virtual WebRtc_Word32 SetRTCPApplicationSpecificData(const WebRtc_UWord8 subType,
const WebRtc_UWord32 name, const WebRtc_UWord32 name,
const WebRtc_UWord8* data, const WebRtc_UWord8* data,
const WebRtc_UWord16 length); const WebRtc_UWord16 length);
/*
* (XR) VOIP metric // (XR) VOIP metric.
*/
virtual WebRtc_Word32 SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric); virtual WebRtc_Word32 SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric);
/* // Audio part.
* Audio
*/
// set audio packet size, used to determine when it's time to send a DTMF packet in silence (CNG) // Set audio packet size, used to determine when it's time to send a DTMF
virtual WebRtc_Word32 SetAudioPacketSize(const WebRtc_UWord16 packetSizeSamples); // packet in silence (CNG).
virtual WebRtc_Word32 SetAudioPacketSize(
const WebRtc_UWord16 packet_size_samples);
// Outband DTMF detection // Outband DTMF detection.
virtual WebRtc_Word32 SetTelephoneEventStatus(const bool enable, virtual WebRtc_Word32 SetTelephoneEventStatus(
const bool forwardToDecoder, const bool enable,
const bool detectEndOfTone = false); const bool forward_to_decoder,
const bool detect_end_of_tone = false);
// Is outband DTMF turned on/off? // Is outband DTMF turned on/off?
virtual bool TelephoneEvent() const; virtual bool TelephoneEvent() const;
@ -359,56 +355,60 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
// Is forwarding of outband telephone events turned on/off? // Is forwarding of outband telephone events turned on/off?
virtual bool TelephoneEventForwardToDecoder() const; virtual bool TelephoneEventForwardToDecoder() const;
virtual bool SendTelephoneEventActive(WebRtc_Word8& telephoneEvent) const; virtual bool SendTelephoneEventActive(WebRtc_Word8& telephone_event) const;
// Send a TelephoneEvent tone using RFC 2833 (4733) // Send a TelephoneEvent tone using RFC 2833 (4733).
virtual WebRtc_Word32 SendTelephoneEventOutband(const WebRtc_UWord8 key, virtual WebRtc_Word32 SendTelephoneEventOutband(const WebRtc_UWord8 key,
const WebRtc_UWord16 time_ms, const WebRtc_UWord16 time_ms,
const WebRtc_UWord8 level); const WebRtc_UWord8 level);
// Set payload type for Redundant Audio Data RFC 2198 // Set payload type for Redundant Audio Data RFC 2198.
virtual WebRtc_Word32 SetSendREDPayloadType(const WebRtc_Word8 payloadType); virtual WebRtc_Word32 SetSendREDPayloadType(const WebRtc_Word8 payload_type);
// Get payload type for Redundant Audio Data RFC 2198 // Get payload type for Redundant Audio Data RFC 2198.
virtual WebRtc_Word32 SendREDPayloadType(WebRtc_Word8& payloadType) const; virtual WebRtc_Word32 SendREDPayloadType(WebRtc_Word8& payload_type) const;
// Set status and ID for header-extension-for-audio-level-indication. // Set status and id for header-extension-for-audio-level-indication.
virtual WebRtc_Word32 SetRTPAudioLevelIndicationStatus(const bool enable, virtual WebRtc_Word32 SetRTPAudioLevelIndicationStatus(
const WebRtc_UWord8 ID); const bool enable, const WebRtc_UWord8 id);
// Get status and ID for header-extension-for-audio-level-indication. // Get status and id for header-extension-for-audio-level-indication.
virtual WebRtc_Word32 GetRTPAudioLevelIndicationStatus(bool& enable, virtual WebRtc_Word32 GetRTPAudioLevelIndicationStatus(
WebRtc_UWord8& ID) const; bool& enable, WebRtc_UWord8& id) const;
// Store the audio level in dBov for header-extension-for-audio-level-indication. // Store the audio level in d_bov for header-extension-for-audio-level-
virtual WebRtc_Word32 SetAudioLevel(const WebRtc_UWord8 level_dBov); // indication.
virtual WebRtc_Word32 SetAudioLevel(const WebRtc_UWord8 level_d_bov);
// Video part.
/*
* Video
*/
virtual RtpVideoCodecTypes ReceivedVideoCodec() const; virtual RtpVideoCodecTypes ReceivedVideoCodec() const;
virtual RtpVideoCodecTypes SendVideoCodec() const; virtual RtpVideoCodecTypes SendVideoCodec() const;
virtual WebRtc_Word32 SendRTCPSliceLossIndication(const WebRtc_UWord8 pictureID); virtual WebRtc_Word32 SendRTCPSliceLossIndication(
const WebRtc_UWord8 picture_id);
// Set method for requestion a new key frame // Set method for requestion a new key frame.
virtual WebRtc_Word32 SetKeyFrameRequestMethod(const KeyFrameRequestMethod method); virtual WebRtc_Word32 SetKeyFrameRequestMethod(
const KeyFrameRequestMethod method);
// send a request for a keyframe // Send a request for a keyframe.
virtual WebRtc_Word32 RequestKeyFrame(); virtual WebRtc_Word32 RequestKeyFrame();
virtual WebRtc_Word32 SetCameraDelay(const WebRtc_Word32 delayMS); virtual WebRtc_Word32 SetCameraDelay(const WebRtc_Word32 delay_ms);
virtual void SetTargetSendBitrate(const WebRtc_UWord32 bitrate); virtual void SetTargetSendBitrate(const WebRtc_UWord32 bitrate);
virtual WebRtc_Word32 SetGenericFECStatus(const bool enable, virtual WebRtc_Word32 SetGenericFECStatus(
const WebRtc_UWord8 payloadTypeRED, const bool enable,
const WebRtc_UWord8 payloadTypeFEC); const WebRtc_UWord8 payload_type_red,
const WebRtc_UWord8 payload_type_fec);
virtual WebRtc_Word32 GenericFECStatus(bool& enable, virtual WebRtc_Word32 GenericFECStatus(
WebRtc_UWord8& payloadTypeRED, bool& enable,
WebRtc_UWord8& payloadTypeFEC); WebRtc_UWord8& payload_type_red,
WebRtc_UWord8& payload_type_fec);
virtual WebRtc_Word32 SetFecParameters( virtual WebRtc_Word32 SetFecParameters(
const FecProtectionParams* delta_params, const FecProtectionParams* delta_params,
@ -416,48 +416,51 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
virtual WebRtc_Word32 LastReceivedNTP(WebRtc_UWord32& NTPsecs, virtual WebRtc_Word32 LastReceivedNTP(WebRtc_UWord32& NTPsecs,
WebRtc_UWord32& NTPfrac, WebRtc_UWord32& NTPfrac,
WebRtc_UWord32& remoteSR); WebRtc_UWord32& remote_sr);
virtual WebRtc_Word32 BoundingSet(bool &tmmbrOwner, virtual WebRtc_Word32 BoundingSet(bool& tmmbr_owner,
TMMBRSet*& boundingSetRec); TMMBRSet*& bounding_set_rec);
virtual void BitrateSent(WebRtc_UWord32* totalRate, virtual void BitrateSent(WebRtc_UWord32* total_rate,
WebRtc_UWord32* videoRate, WebRtc_UWord32* video_rate,
WebRtc_UWord32* fecRate, WebRtc_UWord32* fec_rate,
WebRtc_UWord32* nackRate) const; WebRtc_UWord32* nackRate) const;
virtual int EstimatedReceiveBandwidth( virtual int EstimatedReceiveBandwidth(
WebRtc_UWord32* available_bandwidth) const; WebRtc_UWord32* available_bandwidth) const;
virtual void SetRemoteSSRC(const WebRtc_UWord32 SSRC); virtual void SetRemoteSSRC(const WebRtc_UWord32 ssrc);
virtual WebRtc_UWord32 SendTimeOfSendReport(const WebRtc_UWord32 sendReport); virtual WebRtc_UWord32 SendTimeOfSendReport(const WebRtc_UWord32 send_report);
// good state of RTP receiver inform sender // Good state of RTP receiver inform sender.
virtual WebRtc_Word32 SendRTCPReferencePictureSelection(const WebRtc_UWord64 pictureID); virtual WebRtc_Word32 SendRTCPReferencePictureSelection(
const WebRtc_UWord64 picture_id);
void OnReceivedTMMBR(); void OnReceivedTMMBR();
// bad state of RTP receiver request a keyframe // Bad state of RTP receiver request a keyframe.
void OnRequestIntraFrame(); void OnRequestIntraFrame();
// received a request for a new SLI // Received a request for a new SLI.
void OnReceivedSliceLossIndication(const WebRtc_UWord8 pictureID); void OnReceivedSliceLossIndication(const WebRtc_UWord8 picture_id);
// received a new refereence frame // Received a new reference frame.
void OnReceivedReferencePictureSelectionIndication( void OnReceivedReferencePictureSelectionIndication(
const WebRtc_UWord64 pitureID); const WebRtc_UWord64 picture_id);
void OnReceivedNACK(const WebRtc_UWord16 nackSequenceNumbersLength, void OnReceivedNACK(const WebRtc_UWord16 nack_sequence_numbers_length,
const WebRtc_UWord16* nackSequenceNumbers); const WebRtc_UWord16* nack_sequence_numbers);
void OnRequestSendReport(); void OnRequestSendReport();
// Following function is only called when constructing the object so no // Following function is only called when constructing the object so no
// need to worry about data race. // need to worry about data race.
void OwnsClock() { _owns_clock = true; } void OwnsClock() {
owns_clock_ = true;
}
protected: protected:
void RegisterChildModule(RtpRtcp* module); void RegisterChildModule(RtpRtcp* module);
void DeRegisterChildModule(RtpRtcp* module); void DeRegisterChildModule(RtpRtcp* module);
@ -468,56 +471,59 @@ protected:
WebRtc_UWord32 BitrateReceivedNow() const; WebRtc_UWord32 BitrateReceivedNow() const;
// Get remote SequenceNumber // Get remote SequenceNumber.
WebRtc_UWord16 RemoteSequenceNumber() const; WebRtc_UWord16 RemoteSequenceNumber() const;
// only for internal testing // Only for internal testing.
WebRtc_UWord32 LastSendReport(WebRtc_UWord32& lastRTCPTime); WebRtc_UWord32 LastSendReport(WebRtc_UWord32& last_rtcptime);
RTPSender _rtpSender; RTPSender rtp_sender_;
RTPReceiver _rtpReceiver; RTPReceiver rtp_receiver_;
RTCPSender _rtcpSender; RTCPSender rtcp_sender_;
RTCPReceiver _rtcpReceiver; RTCPReceiver rtcp_receiver_;
bool _owns_clock; bool owns_clock_;
RtpRtcpClock& _clock; RtpRtcpClock& clock_;
private:
private:
int64_t RtcpReportInterval(); int64_t RtcpReportInterval();
WebRtc_Word32 _id; WebRtc_Word32 id_;
const bool _audio; const bool audio_;
bool _collisionDetected; bool collision_detected_;
WebRtc_Word64 _lastProcessTime; WebRtc_Word64 last_process_time_;
WebRtc_Word64 _lastBitrateProcessTime; WebRtc_Word64 last_bitrate_process_time_;
WebRtc_Word64 _lastPacketTimeoutProcessTime; WebRtc_Word64 last_packet_timeout_process_time_;
WebRtc_UWord16 _packetOverHead; WebRtc_UWord16 packet_overhead_;
scoped_ptr<CriticalSectionWrapper> _criticalSectionModulePtrs; scoped_ptr<CriticalSectionWrapper> critical_section_module_ptrs_;
scoped_ptr<CriticalSectionWrapper> _criticalSectionModulePtrsFeedback; scoped_ptr<CriticalSectionWrapper> critical_section_module_ptrs_feedback_;
ModuleRtpRtcpImpl* _defaultModule; ModuleRtpRtcpImpl* default_module_;
std::list<ModuleRtpRtcpImpl*> _childModules; std::list<ModuleRtpRtcpImpl*> child_modules_;
// Dead or alive // Dead or alive.
bool _deadOrAliveActive; bool dead_or_alive_active_;
WebRtc_UWord32 _deadOrAliveTimeoutMS; WebRtc_UWord32 dead_or_alive_timeout_ms_;
WebRtc_Word64 _deadOrAliveLastTimer; WebRtc_Word64 dead_or_alive_last_timer_;
// send side // Send side
NACKMethod _nackMethod; NACKMethod nack_method_;
WebRtc_UWord32 _nackLastTimeSent; WebRtc_UWord32 nack_last_time_sent_;
WebRtc_UWord16 _nackLastSeqNumberSent; WebRtc_UWord16 nack_last_seq_number_sent_;
bool _simulcast; bool simulcast_;
VideoCodec _sendVideoCodec; VideoCodec send_video_codec_;
KeyFrameRequestMethod _keyFrameReqMethod; KeyFrameRequestMethod key_frame_req_method_;
RemoteBitrateEstimator* remote_bitrate_; RemoteBitrateEstimator* remote_bitrate_;
RtcpRttObserver* rtt_observer_; RtcpRttObserver* rtt_observer_;
#ifdef MATLAB #ifdef MATLAB
MatlabPlot* _plot1; MatlabPlot* plot1_;
#endif #endif
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_