be5c7135f9
This reverts commit 97ba853295578975a04fc504315cccd465f9f0bd. Reason for revert: Suspected in breaking WebRTC into Chrome rolls https://chromium-review.googlesource.com/c/chromium/src/+/4132644?tab=checks Original change's description: > Remove use of ReceiveStreamRtpConfig:transport_cc > > With this change, webrtc will send RTCP transport feedback for all received packets that have a transport sequence number, if the header extension > http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions is negotiated. > I.e the SDP attribute a=rtcp-fb:96 transport-cc is ignored. > > > Change-Id: I95d8d4405dc86a2f872f7883b7bafd623d5f7841 > > Bug: webrtc:14802 > Change-Id: I95d8d4405dc86a2f872f7883b7bafd623d5f7841 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290403 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Per Kjellander <perkj@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#38980} Bug: webrtc:14802 Change-Id: I2b04274466a5a81d767a48ff2e001b0a04f7f541 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288943 Reviewed-by: Christoffer Jansson <jansson@webrtc.org> Auto-Submit: Olga Sharonova <olka@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Christoffer Jansson <jansson@webrtc.org> Owners-Override: Christoffer Jansson <jansson@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#38988}
102 lines
3.7 KiB
C++
102 lines
3.7 KiB
C++
/*
|
|
* Copyright (c) 2021 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 CALL_RECEIVE_STREAM_H_
|
|
#define CALL_RECEIVE_STREAM_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/crypto/frame_decryptor_interface.h"
|
|
#include "api/frame_transformer_interface.h"
|
|
#include "api/media_types.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/transport/rtp/rtp_source.h"
|
|
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Common base interface for MediaReceiveStreamInterface based classes and
|
|
// FlexfecReceiveStream.
|
|
class ReceiveStreamInterface {
|
|
public:
|
|
// Receive-stream specific RTP settings.
|
|
// TODO(tommi): This struct isn't needed at this level anymore. Move it closer
|
|
// to where it's used.
|
|
struct ReceiveStreamRtpConfig {
|
|
// Synchronization source (stream identifier) to be received.
|
|
// This member will not change mid-stream and can be assumed to be const
|
|
// post initialization.
|
|
uint32_t remote_ssrc = 0;
|
|
|
|
// Sender SSRC used for sending RTCP (such as receiver reports).
|
|
// This value may change mid-stream and must be done on the same thread
|
|
// that the value is read on (i.e. packet delivery).
|
|
uint32_t local_ssrc = 0;
|
|
|
|
// Enable feedback for send side bandwidth estimation.
|
|
// See
|
|
// https://tools.ietf.org/html/draft-holmer-rmcat-transport-wide-cc-extensions
|
|
// for details.
|
|
// This value may change mid-stream and must be done on the same thread
|
|
// that the value is read on (i.e. packet delivery).
|
|
bool transport_cc = false;
|
|
|
|
// RTP header extensions used for the received stream.
|
|
// This value may change mid-stream and must be done on the same thread
|
|
// that the value is read on (i.e. packet delivery).
|
|
std::vector<RtpExtension> extensions;
|
|
};
|
|
|
|
// Set/change the rtp header extensions. Must be called on the packet
|
|
// delivery thread.
|
|
virtual void SetRtpExtensions(std::vector<RtpExtension> extensions) = 0;
|
|
virtual RtpHeaderExtensionMap GetRtpExtensionMap() const = 0;
|
|
|
|
// Returns a bool for whether feedback for send side bandwidth estimation is
|
|
// enabled. See
|
|
// https://tools.ietf.org/html/draft-holmer-rmcat-transport-wide-cc-extensions
|
|
// for details.
|
|
// This value may change mid-stream and must be done on the same thread
|
|
// that the value is read on (i.e. packet delivery).
|
|
virtual bool transport_cc() const = 0;
|
|
|
|
virtual void SetTransportCc(bool transport_cc) = 0;
|
|
|
|
protected:
|
|
virtual ~ReceiveStreamInterface() {}
|
|
};
|
|
|
|
// Either an audio or video receive stream.
|
|
class MediaReceiveStreamInterface : public ReceiveStreamInterface {
|
|
public:
|
|
// Starts stream activity.
|
|
// When a stream is active, it can receive, process and deliver packets.
|
|
virtual void Start() = 0;
|
|
|
|
// Stops stream activity. Must be called to match with a previous call to
|
|
// `Start()`. When a stream has been stopped, it won't receive, decode,
|
|
// process or deliver packets to downstream objects such as callback pointers
|
|
// set in the config struct.
|
|
virtual void Stop() = 0;
|
|
|
|
virtual void SetDepacketizerToDecoderFrameTransformer(
|
|
rtc::scoped_refptr<webrtc::FrameTransformerInterface>
|
|
frame_transformer) = 0;
|
|
|
|
virtual void SetFrameDecryptor(
|
|
rtc::scoped_refptr<webrtc::FrameDecryptorInterface> frame_decryptor) = 0;
|
|
|
|
virtual std::vector<RtpSource> GetSources() const = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // CALL_RECEIVE_STREAM_H_
|