From 58e64bbf3b3f154292c7910d7f5dc3efd9187d5f Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 2 Jul 2020 07:47:20 +0000 Subject: [PATCH] Revert "peerconnection: prefer spec names for signaling state" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f79bfc65e52a35d27cf0db2d212e94043fb44da3. Reason for revert: Potentially affects Chromium tests, see failures on https://chromium-review.googlesource.com/c/chromium/src/+/2276338. Original change's description: > peerconnection: prefer spec names for signaling state > > Map the internal state names to the spec ones defined in > https://w3c.github.io/webrtc-pc/#rtcsignalingstate-enum > instead of exposing them. This only affects the (not specified) > error strings. > > Bug: None > Change-Id: Ib0b35bb3106b1688e8386f6fdd0b8c7fdebaf1dc > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178390 > Reviewed-by: Henrik Boström > Commit-Queue: Philipp Hancke > Cr-Commit-Position: refs/heads/master@{#31591} TBR=hbos@webrtc.org,philipp.hancke@googlemail.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: None Change-Id: I6df20c93f6944b819eb11f22ba30c6221de61d79 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178560 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#31610} --- pc/peer_connection.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc index 3b71dc1888..3def31a441 100644 --- a/pc/peer_connection.cc +++ b/pc/peer_connection.cc @@ -251,23 +251,21 @@ uint32_t ConvertIceTransportTypeToCandidateFilter( return cricket::CF_NONE; } -// Map internal signaling state name to spec name: -// https://w3c.github.io/webrtc-pc/#rtcsignalingstate-enum std::string GetSignalingStateString( PeerConnectionInterface::SignalingState state) { switch (state) { case PeerConnectionInterface::kStable: - return "stable"; + return "kStable"; case PeerConnectionInterface::kHaveLocalOffer: - return "have-local-offer"; + return "kHaveLocalOffer"; case PeerConnectionInterface::kHaveLocalPrAnswer: - return "have-local-pranswer"; + return "kHavePrAnswer"; case PeerConnectionInterface::kHaveRemoteOffer: - return "have-remote-offer"; + return "kHaveRemoteOffer"; case PeerConnectionInterface::kHaveRemotePrAnswer: - return "have-remote-pranswer"; + return "kHaveRemotePrAnswer"; case PeerConnectionInterface::kClosed: - return "closed"; + return "kClosed"; } RTC_NOTREACHED(); return "";