commit 5ab79e62f691875a237ea28ca3975ea1f0ed62ec
author Eldar Rello <elrello@microsoft.com> Wed Oct 09 18:29:44 2019 +0300
committer Commit Bot <commit-bot@chromium.org> Mon Oct 14 12:40:53 2019 +0000
tree e97b9a3d7cb832e715643b094ed58833b45b0187
parent 75acef396265beccab231928f7b989dac3b081e3

Reland "Implement rollback for setRemoteDescription"

This is a reland of 16d4c4d4fbb8644033def1091d2d5c941c1b01fa after
downstream project was updated to be prepared for the new SdpType.

Original change's description:
> Implement rollback for setRemoteDescription
>
> Bug: chromium:980875
> Change-Id: I4575e9ad1902a20937f9812f49edee2a2441f76d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153525
> Commit-Queue: Eldar Rello <elrello@microsoft.com>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#29422}

TBR=steveanton@webrtc.org

Bug: chromium:980875
Change-Id: Iba8d25bf2dc481b25a03eeae9818bd5f4c3eaa2d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156569
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29460}

api/jsep.cc

diff --git a/api/jsep.cc b/api/jsep.cc
index 01f5720..ddb39b6 100644
--- a/api/jsep.cc
+++ b/api/jsep.cc
@@ -41,6 +41,7 @@
 const char SessionDescriptionInterface::kOffer[] = "offer";
 const char SessionDescriptionInterface::kPrAnswer[] = "pranswer";
 const char SessionDescriptionInterface::kAnswer[] = "answer";
+const char SessionDescriptionInterface::kRollback[] = "rollback";
 
 const char* SdpTypeToString(SdpType type) {
   switch (type) {
@@ -50,6 +51,8 @@
       return SessionDescriptionInterface::kPrAnswer;
     case SdpType::kAnswer:
       return SessionDescriptionInterface::kAnswer;
+    case SdpType::kRollback:
+      return SessionDescriptionInterface::kRollback;
   }
   return "";
 }
@@ -61,6 +64,8 @@
     return SdpType::kPrAnswer;
   } else if (type_str == SessionDescriptionInterface::kAnswer) {
     return SdpType::kAnswer;
+  } else if (type_str == SessionDescriptionInterface::kRollback) {
+    return SdpType::kRollback;
   } else {
     return absl::nullopt;
   }

api/jsep.h

diff --git a/api/jsep.h b/api/jsep.h
index 6da7827..3f7f12a 100644
--- a/api/jsep.h
+++ b/api/jsep.h
@@ -103,8 +103,11 @@
   kOffer,     // Description must be treated as an SDP offer.
   kPrAnswer,  // Description must be treated as an SDP answer, but not a final
               // answer.
-  kAnswer  // Description must be treated as an SDP final answer, and the offer-
-           // answer exchange must be considered complete after receiving this.
+  kAnswer,    // Description must be treated as an SDP final answer, and the
+              // offer-answer exchange must be considered complete after
+              // receiving this.
+  kRollback   // Resets any pending offers and sets signaling state back to
+              // stable.
 };
 
 // Returns the string form of the given SDP type. String forms are defined in
@@ -128,6 +131,7 @@
   static const char kOffer[];
   static const char kPrAnswer[];
   static const char kAnswer[];
+  static const char kRollback[];
 
   virtual ~SessionDescriptionInterface() {}
 

api/peer_connection_interface.h

diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h
index a417641..f526c37 100644
--- a/api/peer_connection_interface.h
+++ b/api/peer_connection_interface.h
@@ -659,6 +659,9 @@
     // logs with TURN server logs. It will not be added if it's an empty string.
     std::string turn_logging_id;
 
+    // Added to be able to control rollout of this feature.
+    bool enable_implicit_rollback = false;
+
     //
     // Don't forget to update operator== if adding something.
     //