Reason for revert: Re-land, reverting did not fix bug. https://bugs.chromium.org/p/webrtc/issues/detail?id=7465 Original issue's description: > Revert of Implemented the GetSources() in native code. (patchset #11 id:510001 of https://codereview.webrtc.org/2770233003/ ) > > Reason for revert: > Suspected of WebRtcApprtcBrowserTest.MANUAL_WorksOnApprtc breakage, see > > https://bugs.chromium.org/p/webrtc/issues/detail?id=7465 > > Original issue's description: > > Added the GetSources() to the RtpReceiverInterface and implemented > > it for the AudioRtpReceiver. > > > > This method returns a vector of RtpSource(both CSRC source and SSRC > > source) which contains the ID of a source, the timestamp, the source > > type (SSRC or CSRC) and the audio level. > > > > The RtpSource objects are buffered and maintained by the > > RtpReceiver in webrtc/modules/rtp_rtcp/. When the method is called, > > the info of the contributing source will be pulled along the object > > chain: > > AudioRtpReceiver -> VoiceChannel -> WebRtcVoiceMediaChannel -> > > AudioReceiveStream -> voe::Channel -> RtpRtcp module > > > > Spec:https://w3c.github.io/webrtc-pc/archives/20151006/webrtc.html#widl-RTCRtpReceiver-getContributingSources-sequence-RTCRtpContributingSource > > > > BUG=chromium:703122 > > TBR=stefan@webrtc.org, danilchap@webrtc.org > > > > Review-Url: https://codereview.webrtc.org/2770233003 > > Cr-Commit-Position: refs/heads/master@{#17591} > > Committed:292084c376> > TBR=deadbeef@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,philipel@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,zhihuang@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=chromium:703122 > > Review-Url: https://codereview.webrtc.org/2809613002 > Cr-Commit-Position: refs/heads/master@{#17616} > Committed:fbcc5cb386TBR=deadbeef@webrtc.org,solenberg@webrtc.org,philipel@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,zhihuang@webrtc.org,olka@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:703122 Review-Url: https://codereview.webrtc.org/2810623003 Cr-Commit-Position: refs/heads/master@{#17621}
101 lines
3.7 KiB
C++
101 lines
3.7 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_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "webrtc/api/rtpreceiverinterface.h"
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
struct CodecInst;
|
|
class RTPPayloadRegistry;
|
|
class VideoCodec;
|
|
|
|
class TelephoneEventHandler {
|
|
public:
|
|
virtual ~TelephoneEventHandler() {}
|
|
|
|
// The following three methods implement the TelephoneEventHandler interface.
|
|
// Forward DTMFs to decoder for playout.
|
|
virtual void SetTelephoneEventForwardToDecoder(bool forward_to_decoder) = 0;
|
|
|
|
// Is forwarding of outband telephone events turned on/off?
|
|
virtual bool TelephoneEventForwardToDecoder() const = 0;
|
|
|
|
// Is TelephoneEvent configured with payload type payload_type
|
|
virtual bool TelephoneEventPayloadType(const int8_t payload_type) const = 0;
|
|
};
|
|
|
|
class RtpReceiver {
|
|
public:
|
|
// Creates a video-enabled RTP receiver.
|
|
static RtpReceiver* CreateVideoReceiver(
|
|
Clock* clock,
|
|
RtpData* incoming_payload_callback,
|
|
RtpFeedback* incoming_messages_callback,
|
|
RTPPayloadRegistry* rtp_payload_registry);
|
|
|
|
// Creates an audio-enabled RTP receiver.
|
|
static RtpReceiver* CreateAudioReceiver(
|
|
Clock* clock,
|
|
RtpData* incoming_payload_callback,
|
|
RtpFeedback* incoming_messages_callback,
|
|
RTPPayloadRegistry* rtp_payload_registry);
|
|
|
|
virtual ~RtpReceiver() {}
|
|
|
|
// Returns a TelephoneEventHandler if available.
|
|
virtual TelephoneEventHandler* GetTelephoneEventHandler() = 0;
|
|
|
|
// Registers a receive payload in the payload registry and notifies the media
|
|
// receiver strategy.
|
|
virtual int32_t RegisterReceivePayload(const CodecInst& audio_codec) = 0;
|
|
// Registers a receive payload in the payload registry.
|
|
virtual int32_t RegisterReceivePayload(const VideoCodec& video_codec) = 0;
|
|
|
|
// De-registers |payload_type| from the payload registry.
|
|
virtual int32_t DeRegisterReceivePayload(const int8_t payload_type) = 0;
|
|
|
|
// Parses the media specific parts of an RTP packet and updates the receiver
|
|
// state. This for instance means that any changes in SSRC and payload type is
|
|
// detected and acted upon.
|
|
virtual bool IncomingRtpPacket(const RTPHeader& rtp_header,
|
|
const uint8_t* payload,
|
|
size_t payload_length,
|
|
PayloadUnion payload_specific,
|
|
bool in_order) = 0;
|
|
|
|
// Gets the last received timestamp. Returns true if a packet has been
|
|
// received, false otherwise.
|
|
virtual bool Timestamp(uint32_t* timestamp) const = 0;
|
|
// Gets the time in milliseconds when the last timestamp was received.
|
|
// Returns true if a packet has been received, false otherwise.
|
|
virtual bool LastReceivedTimeMs(int64_t* receive_time_ms) const = 0;
|
|
|
|
// Returns the remote SSRC of the currently received RTP stream.
|
|
virtual uint32_t SSRC() const = 0;
|
|
|
|
// Returns the current remote CSRCs.
|
|
virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const = 0;
|
|
|
|
// Returns the current energy of the RTP stream received.
|
|
virtual int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const = 0;
|
|
|
|
virtual std::vector<RtpSource> GetSources() const = 0;
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|