This reverts commit 97d5e5b32c77bf550f1d788454f2db10ac9fbb1c. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Replace BundleFilter with RtpDemuxer in RtpTransport." > > This reverts commit ea8b62a3e74fe91cd6bf66304839cd5677880a4e. > > Reason for revert: Broke chromium tests. > Original change's description: > > Replace BundleFilter with RtpDemuxer in RtpTransport. > > > > BundleFilter is replaced by RtpDemuxer in RtpTransport for payload > > type-based demuxing. RtpTransport will support MID-based demuxing later. > > > > Each BaseChannel has its own RTP demuxing criteria and when connecting > > to the RtpTransport, BaseChannel will register itself as a demuxer sink. > > > > The inheritance model is changed. New inheritance chain: > > DtlsSrtpTransport->SrtpTransport->RtpTranpsort > > > > NOTE: > > When RTCP packets are received, Call::DeliverRtcp will be called for > > multiple times (webrtc:9035) which is an existing issue. With this CL, > > it will become more of a problem and should be fixed. > > > > Bug: webrtc:8587 > > Change-Id: I1d8a00443bd4bcbacc56e5e19b7294205cdc38f0 > > Reviewed-on: https://webrtc-review.googlesource.com/61360 > > Commit-Queue: Zhi Huang <zhihuang@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22613} > > TBR=steveanton@webrtc.org,deadbeef@webrtc.org,zhihuang@webrtc.org > > Change-Id: If245da9d1ce970ac8dab7f45015e9b268a5dbcbd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8587 > Reviewed-on: https://webrtc-review.googlesource.com/64860 > Reviewed-by: Zhi Huang <zhihuang@webrtc.org> > Commit-Queue: Zhi Huang <zhihuang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22614} TBR=steveanton@webrtc.org,deadbeef@webrtc.org,zhihuang@webrtc.org Change-Id: I3c272588ab4388ecadc4edc6786d5195c701855f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8587 Reviewed-on: https://webrtc-review.googlesource.com/64862 Commit-Queue: Zhi Huang <zhihuang@webrtc.org> Reviewed-by: Zhi Huang <zhihuang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22615}
152 lines
5.0 KiB
C++
152 lines
5.0 KiB
C++
/*
|
|
* Copyright 2017 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 PC_RTPTRANSPORT_H_
|
|
#define PC_RTPTRANSPORT_H_
|
|
|
|
#include <string>
|
|
|
|
#include "call/rtp_demuxer.h"
|
|
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
|
|
#include "pc/rtptransportinternal.h"
|
|
#include "rtc_base/sigslot.h"
|
|
|
|
namespace rtc {
|
|
|
|
class CopyOnWriteBuffer;
|
|
struct PacketOptions;
|
|
struct PacketTime;
|
|
class PacketTransportInternal;
|
|
|
|
} // namespace rtc
|
|
|
|
namespace webrtc {
|
|
|
|
class RtpTransport : public RtpTransportInternal {
|
|
public:
|
|
RtpTransport(const RtpTransport&) = delete;
|
|
RtpTransport& operator=(const RtpTransport&) = delete;
|
|
|
|
explicit RtpTransport(bool rtcp_mux_enabled)
|
|
: rtcp_mux_enabled_(rtcp_mux_enabled) {}
|
|
|
|
bool rtcp_mux_enabled() const override { return rtcp_mux_enabled_; }
|
|
void SetRtcpMuxEnabled(bool enable) override;
|
|
|
|
rtc::PacketTransportInternal* rtp_packet_transport() const override {
|
|
return rtp_packet_transport_;
|
|
}
|
|
void SetRtpPacketTransport(rtc::PacketTransportInternal* rtp) override;
|
|
|
|
rtc::PacketTransportInternal* rtcp_packet_transport() const override {
|
|
return rtcp_packet_transport_;
|
|
}
|
|
void SetRtcpPacketTransport(rtc::PacketTransportInternal* rtcp) override;
|
|
|
|
PacketTransportInterface* GetRtpPacketTransport() const override;
|
|
PacketTransportInterface* GetRtcpPacketTransport() const override;
|
|
|
|
// TODO(zstein): Use these RtcpParameters for configuration elsewhere.
|
|
RTCError SetParameters(const RtpTransportParameters& parameters) override;
|
|
RtpTransportParameters GetParameters() const override;
|
|
|
|
bool IsWritable(bool rtcp) const override;
|
|
|
|
bool SendRtpPacket(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketOptions& options,
|
|
int flags) override;
|
|
|
|
bool SendRtcpPacket(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketOptions& options,
|
|
int flags) override;
|
|
|
|
void UpdateRtpHeaderExtensionMap(
|
|
const cricket::RtpHeaderExtensions& header_extensions) override;
|
|
|
|
bool RegisterRtpDemuxerSink(const RtpDemuxerCriteria& criteria,
|
|
RtpPacketSinkInterface* sink) override;
|
|
|
|
bool UnregisterRtpDemuxerSink(RtpPacketSinkInterface* sink) override;
|
|
|
|
void SetMetricsObserver(
|
|
rtc::scoped_refptr<MetricsObserverInterface> metrics_observer) override {}
|
|
|
|
protected:
|
|
// TODO(zstein): Remove this when we remove RtpTransportAdapter.
|
|
RtpTransportAdapter* GetInternal() override;
|
|
|
|
// These methods will be used in the subclasses.
|
|
void DemuxPacket(rtc::CopyOnWriteBuffer* packet, const rtc::PacketTime& time);
|
|
|
|
bool SendPacket(bool rtcp,
|
|
rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketOptions& options,
|
|
int flags);
|
|
|
|
bool IsTransportWritable();
|
|
|
|
// Overridden by SrtpTransport.
|
|
virtual void OnNetworkRouteChanged(
|
|
rtc::Optional<rtc::NetworkRoute> network_route);
|
|
virtual void OnRtpPacketReceived(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketTime& packet_time);
|
|
virtual void OnRtcpPacketReceived(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketTime& packet_time);
|
|
// Overridden by DtlsSrtpTransport.
|
|
virtual void OnWritableState(rtc::PacketTransportInternal* packet_transport);
|
|
|
|
private:
|
|
void OnReadyToSend(rtc::PacketTransportInternal* transport);
|
|
void OnSentPacket(rtc::PacketTransportInternal* packet_transport,
|
|
const rtc::SentPacket& sent_packet);
|
|
void OnReadPacket(rtc::PacketTransportInternal* transport,
|
|
const char* data,
|
|
size_t len,
|
|
const rtc::PacketTime& packet_time,
|
|
int flags);
|
|
|
|
// Updates "ready to send" for an individual channel and fires
|
|
// SignalReadyToSend.
|
|
void SetReadyToSend(bool rtcp, bool ready);
|
|
|
|
void MaybeSignalReadyToSend();
|
|
|
|
// SRTP specific methods.
|
|
// TODO(zhihuang): Improve the inheritance model so that the RtpTransport
|
|
// doesn't need to implement SRTP specfic methods.
|
|
RTCError SetSrtpSendKey(const cricket::CryptoParams& params) override {
|
|
RTC_NOTREACHED();
|
|
return RTCError::OK();
|
|
}
|
|
RTCError SetSrtpReceiveKey(const cricket::CryptoParams& params) override {
|
|
RTC_NOTREACHED();
|
|
return RTCError::OK();
|
|
}
|
|
|
|
bool rtcp_mux_enabled_;
|
|
|
|
rtc::PacketTransportInternal* rtp_packet_transport_ = nullptr;
|
|
rtc::PacketTransportInternal* rtcp_packet_transport_ = nullptr;
|
|
|
|
bool ready_to_send_ = false;
|
|
bool rtp_ready_to_send_ = false;
|
|
bool rtcp_ready_to_send_ = false;
|
|
|
|
RtpTransportParameters parameters_;
|
|
RtpDemuxer rtp_demuxer_;
|
|
|
|
// Used for identifying the MID for RtpDemuxer.
|
|
RtpHeaderExtensionMap header_extension_map_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_RTPTRANSPORT_H_
|