Prevent channels being set on stopped transceiver.
Fixing bug that allows a channel to be set on a stopped transceiver.
This CL contains the following refactoring:
1. Extracted ChannelInterface from BaseChannel
2. Unified SetXxxMediaChannel (Voice, Video) into SetMediaChannel
Bug: webrtc:9932
Change-Id: I2fbf00c823b7848ad4f2acb6e80b1b58ac45ee38
Reviewed-on: https://webrtc-review.googlesource.com/c/110564
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Amit Hilbuch <amithi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25641}diff --git a/pc/channelinterface.h b/pc/channelinterface.h
new file mode 100644
index 0000000..8e4109a
--- /dev/null
+++ b/pc/channelinterface.h
@@ -0,0 +1,68 @@
+/*
+ * 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_CHANNELINTERFACE_H_
+#define PC_CHANNELINTERFACE_H_
+
+#include <string>
+
+#include "api/jsep.h"
+#include "api/mediatypes.h"
+#include "media/base/mediachannel.h"
+#include "pc/rtptransportinternal.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;
+
+ // 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;
+
+ protected:
+ virtual ~ChannelInterface() = default;
+};
+
+} // namespace cricket
+
+#endif // PC_CHANNELINTERFACE_H_
