2015-11-04 08:31:52 +01:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|
|
|
|
|
#define MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|
2015-11-04 08:31:52 +01:00
|
|
|
|
Reland of Implemented the GetSources() in native code. (patchset #1 id:1 of https://codereview.webrtc.org/2809613002/ )
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: https://chromium.googlesource.com/external/webrtc/+/292084c3765d9f3ee406ca2ec86eae206b540053
>
> 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: https://chromium.googlesource.com/external/webrtc/+/fbcc5cb3869d1370008e40f24fc03ac8fb69c675
TBR=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}
2017-04-10 07:39:05 -07:00
|
|
|
#include <vector>
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/rtpreceiverinterface.h"
|
|
|
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
2015-11-04 08:31:52 +01:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
class RTPPayloadRegistry;
|
2016-11-24 09:34:46 -08:00
|
|
|
class VideoCodec;
|
2015-11-04 08:31:52 +01:00
|
|
|
|
|
|
|
|
class RtpReceiver {
|
|
|
|
|
public:
|
|
|
|
|
// Creates a video-enabled RTP receiver.
|
|
|
|
|
static RtpReceiver* CreateVideoReceiver(
|
|
|
|
|
Clock* clock,
|
|
|
|
|
RtpData* incoming_payload_callback,
|
|
|
|
|
RTPPayloadRegistry* rtp_payload_registry);
|
|
|
|
|
|
|
|
|
|
// Creates an audio-enabled RTP receiver.
|
2016-03-30 02:42:32 -07:00
|
|
|
static RtpReceiver* CreateAudioReceiver(
|
|
|
|
|
Clock* clock,
|
|
|
|
|
RtpData* incoming_payload_callback,
|
|
|
|
|
RTPPayloadRegistry* rtp_payload_registry);
|
|
|
|
|
|
2015-11-04 08:31:52 +01:00
|
|
|
virtual ~RtpReceiver() {}
|
|
|
|
|
|
|
|
|
|
// Registers a receive payload in the payload registry and notifies the media
|
|
|
|
|
// receiver strategy.
|
2017-10-04 12:38:53 +02:00
|
|
|
virtual int32_t RegisterReceivePayload(
|
|
|
|
|
int payload_type,
|
|
|
|
|
const SdpAudioFormat& audio_format) = 0;
|
|
|
|
|
|
|
|
|
|
// Deprecated version of the above.
|
|
|
|
|
int32_t RegisterReceivePayload(const CodecInst& audio_codec);
|
|
|
|
|
|
2016-11-25 02:29:39 -08:00
|
|
|
// Registers a receive payload in the payload registry.
|
|
|
|
|
virtual int32_t RegisterReceivePayload(const VideoCodec& video_codec) = 0;
|
2015-11-04 08:31:52 +01:00
|
|
|
|
|
|
|
|
// 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,
|
2017-10-05 08:39:15 +02:00
|
|
|
PayloadUnion payload_specific) = 0;
|
|
|
|
|
// TODO(nisse): Deprecated version, delete as soon as downstream
|
|
|
|
|
// applications are updated.
|
|
|
|
|
bool IncomingRtpPacket(const RTPHeader& rtp_header,
|
|
|
|
|
const uint8_t* payload,
|
|
|
|
|
size_t payload_length,
|
|
|
|
|
PayloadUnion payload_specific,
|
|
|
|
|
bool in_order /* Ignored */) {
|
|
|
|
|
return IncomingRtpPacket(rtp_header, payload, payload_length,
|
|
|
|
|
payload_specific);
|
|
|
|
|
}
|
2015-11-04 08:31:52 +01:00
|
|
|
|
2017-10-03 15:28:26 +02:00
|
|
|
// Gets the RTP timestamp and the corresponding monotonic system
|
|
|
|
|
// time for the most recent in-order packet. Returns true on
|
|
|
|
|
// success, false if no packet has been received.
|
|
|
|
|
virtual bool GetLatestTimestamps(uint32_t* timestamp,
|
|
|
|
|
int64_t* receive_time_ms) const = 0;
|
2015-11-04 08:31:52 +01:00
|
|
|
|
|
|
|
|
// Returns the remote SSRC of the currently received RTP stream.
|
|
|
|
|
virtual uint32_t SSRC() const = 0;
|
|
|
|
|
|
Reland of Implemented the GetSources() in native code. (patchset #1 id:1 of https://codereview.webrtc.org/2809613002/ )
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: https://chromium.googlesource.com/external/webrtc/+/292084c3765d9f3ee406ca2ec86eae206b540053
>
> 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: https://chromium.googlesource.com/external/webrtc/+/fbcc5cb3869d1370008e40f24fc03ac8fb69c675
TBR=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}
2017-04-10 07:39:05 -07:00
|
|
|
virtual std::vector<RtpSource> GetSources() const = 0;
|
2015-11-04 08:31:52 +01:00
|
|
|
};
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
|