diff options
author | Harald Alvestrand <hta@webrtc.org> | 2019-05-05 19:00:00 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-05-05 19:00:13 +0000 |
commit | 141c0ad8ab1a2c1da126c46d627057c404bf2727 (patch) | |
tree | fceb12a3d901d2702034210d111b32cc7e15429d /pc/media_protocol_names.h | |
parent | 4b831ac127bb1d3a16da886e5b988c770426110f (diff) | |
download | webrtc-141c0ad8ab1a2c1da126c46d627057c404bf2727.tar.gz |
Revert "Version 2 "Refactoring DataContentDescription class""
This reverts commit 14b2758726879d21671a21291dfed8fb4fd5c21c.
Reason for revert: Internal import failed.
Original change's description:
> Version 2 "Refactoring DataContentDescription class"
>
> (substantial changes since version 1)
>
> This CL splits the cricket::DataContentDescription class into
> two classes: cricket::RtpDataContentDescription (used for RTP data)
> and cricket::SctpDataContentDescription (used for SCTP only).
>
> SctpDataContentDescription no longer inherits from
> MediaContentDescriptionImpl, and no longer contains "codecs".
>
> Due to usage of internal interfaces by consumers, shimming the old
> DataContentDescription API is needed.
>
> A new cricket::DataContentDescription class is defined, which is
> a shim over RtpDataContentDescription and SctpDataContentDescription.
> It exposes as little functionality as possible, but supports the
> concerned consumer's usage
>
> Design document:
> https://docs.google.com/document/d/1H5LfQxJA2ikMWTQ8FZ3_GAmaXM7knfVQWiSz6ph8VQ0/edit#
>
> Version 1 reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132700
>
> Bug: webrtc:10358
> Change-Id: Icf95fb7308244d6f2ebfdb403aaffc544e358580
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133900
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27853}
TBR=danilchap@webrtc.org,steveanton@webrtc.org,kwiberg@webrtc.org,hbos@webrtc.org,hta@webrtc.org,shampson@webrtc.org
Change-Id: Ibc16ba14c1cbf50345a9b79151b79df140482539
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10358
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135280
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27855}
Diffstat (limited to 'pc/media_protocol_names.h')
-rw-r--r-- | pc/media_protocol_names.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/pc/media_protocol_names.h b/pc/media_protocol_names.h deleted file mode 100644 index 88f1c4659d..0000000000 --- a/pc/media_protocol_names.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2019 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_MEDIA_PROTOCOL_NAMES_H_ -#define PC_MEDIA_PROTOCOL_NAMES_H_ - -#include <string> - -namespace cricket { - -// Names or name prefixes of protocols as defined by SDP specifications. -extern const char kMediaProtocolRtpPrefix[]; -extern const char kMediaProtocolSctp[]; -extern const char kMediaProtocolDtlsSctp[]; -extern const char kMediaProtocolUdpDtlsSctp[]; -extern const char kMediaProtocolTcpDtlsSctp[]; - -bool IsDtlsSctp(const std::string& protocol); -bool IsPlainSctp(const std::string& protocol); - -// Returns true if the given media section protocol indicates use of RTP. -bool IsRtpProtocol(const std::string& protocol); -// Returns true if the given media section protocol indicates use of SCTP. -bool IsSctpProtocol(const std::string& protocol); - -} // namespace cricket - -#endif // PC_MEDIA_PROTOCOL_NAMES_H_ |