d0acbd8645
This reverts commit c1ad1ff178f0d0dfcde42843c51ae703005aaca1. Reason for revert: This blocks the worker thread for a longer contiguous period of time which can lead to delays in processing packets. And due to other recent changes, the need to speed up SetLocalDescription/SetRemoteDescription is reduced. Still plan to reland some of the changes from the CL, just not the part that groups the Invokes. Original change's description: > Do all BaseChannel operations within a single Thread::Invoke. > > Instead of doing a separate Invoke for each channel, this CL first > gathers a list of operations to be performed on the signaling thread, > then does a single Invoke on the worker thread (and nested Invoke > on the network thread) to update all channels at once. > > This includes the methods: > * Enable > * SetLocalContent/SetRemoteContent > * RegisterRtpDemuxerSink > * UpdateRtpHeaderExtensionMap > > Also, removed the need for a network thread Invoke in > IsReadyToSendMedia_w by moving ownership of was_ever_writable_ to the > worker thread. > > Bug: webrtc:12266 > Change-Id: I31e61fe0758aeb053b09db84f234deb58dfb3d05 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194181 > Commit-Queue: Taylor <deadbeef@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32817} TBR=deadbeef@webrtc.org,hta@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:12266 Change-Id: I40ec519a614dc740133219f775b5638a488529b1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203860 Reviewed-by: Taylor <deadbeef@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33111}
78 lines
2.5 KiB
C++
78 lines
2.5 KiB
C++
/*
|
|
* Copyright 2018 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_CHANNEL_INTERFACE_H_
|
|
#define PC_CHANNEL_INTERFACE_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/jsep.h"
|
|
#include "api/media_types.h"
|
|
#include "media/base/media_channel.h"
|
|
#include "pc/rtp_transport_internal.h"
|
|
|
|
namespace cricket {
|
|
|
|
class MediaContentDescription;
|
|
|
|
// ChannelInterface contains methods common to voice, video and data channels.
|
|
// As more methods are added to BaseChannel, they should be included in the
|
|
// interface as well.
|
|
class ChannelInterface {
|
|
public:
|
|
virtual cricket::MediaType media_type() const = 0;
|
|
|
|
virtual MediaChannel* media_channel() const = 0;
|
|
|
|
// TODO(deadbeef): This is redundant; remove this.
|
|
virtual const std::string& transport_name() const = 0;
|
|
|
|
virtual const std::string& content_name() const = 0;
|
|
|
|
virtual bool enabled() const = 0;
|
|
|
|
// Enables or disables this channel
|
|
virtual bool Enable(bool enable) = 0;
|
|
|
|
// Used for latency measurements.
|
|
virtual sigslot::signal1<ChannelInterface*>& SignalFirstPacketReceived() = 0;
|
|
|
|
// Channel control
|
|
virtual bool SetLocalContent(const MediaContentDescription* content,
|
|
webrtc::SdpType type,
|
|
std::string* error_desc) = 0;
|
|
virtual bool SetRemoteContent(const MediaContentDescription* content,
|
|
webrtc::SdpType type,
|
|
std::string* error_desc) = 0;
|
|
virtual bool SetPayloadTypeDemuxingEnabled(bool enabled) = 0;
|
|
|
|
// Access to the local and remote streams that were set on the channel.
|
|
virtual const std::vector<StreamParams>& local_streams() const = 0;
|
|
virtual const std::vector<StreamParams>& remote_streams() const = 0;
|
|
|
|
// Set an RTP level transport.
|
|
// Some examples:
|
|
// * An RtpTransport without encryption.
|
|
// * An SrtpTransport for SDES.
|
|
// * A DtlsSrtpTransport for DTLS-SRTP.
|
|
virtual bool SetRtpTransport(webrtc::RtpTransportInternal* rtp_transport) = 0;
|
|
|
|
// Returns the last negotiated header extensions.
|
|
virtual RtpHeaderExtensions GetNegotiatedRtpHeaderExtensions() const = 0;
|
|
|
|
protected:
|
|
virtual ~ChannelInterface() = default;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // PC_CHANNEL_INTERFACE_H_
|