365381fdf1
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 The JsepTransport2 is renamed to JsepTransport. 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: Ibd880e7b744bd912336a691309950bc18e42cf62 Reviewed-on: https://webrtc-review.googlesource.com/65786 Commit-Queue: Zhi Huang <zhihuang@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Reviewed-by: Benjamin Wright <benwright@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22867}
120 lines
3.7 KiB
C++
120 lines
3.7 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_RTPTRANSPORTINTERNALADAPTER_H_
|
|
#define PC_RTPTRANSPORTINTERNALADAPTER_H_
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "pc/rtptransportinternal.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// This class is used by SrtpTransport and DtlsSrtpTransport in order to reduce
|
|
// the duplicated code. Using this class, different subclasses can override only
|
|
// part of RtpTransportInternal methods without implementing all the common
|
|
// methods.
|
|
class RtpTransportInternalAdapter : public RtpTransportInternal {
|
|
public:
|
|
RtpTransportInternalAdapter() {}
|
|
|
|
explicit RtpTransportInternalAdapter(RtpTransportInternal* transport)
|
|
: transport_(transport) {
|
|
RTC_DCHECK(transport_);
|
|
}
|
|
|
|
void SetRtcpMuxEnabled(bool enable) override {
|
|
transport_->SetRtcpMuxEnabled(enable);
|
|
}
|
|
|
|
bool rtcp_mux_enabled() const override {
|
|
return transport_->rtcp_mux_enabled();
|
|
}
|
|
|
|
rtc::PacketTransportInternal* rtp_packet_transport() const override {
|
|
return transport_->rtp_packet_transport();
|
|
}
|
|
void SetRtpPacketTransport(rtc::PacketTransportInternal* rtp) override {
|
|
transport_->SetRtpPacketTransport(rtp);
|
|
}
|
|
|
|
rtc::PacketTransportInternal* rtcp_packet_transport() const override {
|
|
return transport_->rtcp_packet_transport();
|
|
}
|
|
void SetRtcpPacketTransport(rtc::PacketTransportInternal* rtcp) override {
|
|
transport_->SetRtcpPacketTransport(rtcp);
|
|
}
|
|
|
|
bool IsReadyToSend() const override { return transport_->IsReadyToSend(); }
|
|
|
|
bool IsWritable(bool rtcp) const override {
|
|
return transport_->IsWritable(rtcp);
|
|
}
|
|
|
|
bool SendRtpPacket(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketOptions& options,
|
|
int flags) override {
|
|
return transport_->SendRtpPacket(packet, options, flags);
|
|
}
|
|
|
|
bool SendRtcpPacket(rtc::CopyOnWriteBuffer* packet,
|
|
const rtc::PacketOptions& options,
|
|
int flags) override {
|
|
return transport_->SendRtcpPacket(packet, options, flags);
|
|
}
|
|
|
|
void UpdateRtpHeaderExtensionMap(
|
|
const cricket::RtpHeaderExtensions& header_extensions) override {
|
|
transport_->UpdateRtpHeaderExtensionMap(header_extensions);
|
|
}
|
|
|
|
bool RegisterRtpDemuxerSink(const RtpDemuxerCriteria& criteria,
|
|
RtpPacketSinkInterface* sink) override {
|
|
return transport_->RegisterRtpDemuxerSink(criteria, sink);
|
|
}
|
|
|
|
bool UnregisterRtpDemuxerSink(RtpPacketSinkInterface* sink) override {
|
|
return transport_->UnregisterRtpDemuxerSink(sink);
|
|
}
|
|
|
|
// RtpTransportInterface overrides.
|
|
PacketTransportInterface* GetRtpPacketTransport() const override {
|
|
return transport_->GetRtpPacketTransport();
|
|
}
|
|
|
|
PacketTransportInterface* GetRtcpPacketTransport() const override {
|
|
return transport_->GetRtcpPacketTransport();
|
|
}
|
|
|
|
RTCError SetParameters(const RtpTransportParameters& parameters) override {
|
|
return transport_->SetParameters(parameters);
|
|
}
|
|
|
|
RtpTransportParameters GetParameters() const override {
|
|
return transport_->GetParameters();
|
|
}
|
|
|
|
RtpTransportAdapter* GetInternal() override { return nullptr; }
|
|
|
|
void SetMetricsObserver(
|
|
rtc::scoped_refptr<MetricsObserverInterface> metrics_observer) override {
|
|
transport_->SetMetricsObserver(metrics_observer);
|
|
}
|
|
|
|
protected:
|
|
// Owned by the subclasses.
|
|
RtpTransportInternal* transport_ = nullptr;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_RTPTRANSPORTINTERNALADAPTER_H_
|