From 21f12d592aa9ebe8505b9b42e43b86ea59c4f2b3 Mon Sep 17 00:00:00 2001
From: Artem Titarenko <artit@webrtc.org>
Date: Wed, 13 Apr 2022 17:33:43 +0200
Subject: [PATCH] Add rtc_offer_answer_options to
 peer_connection_quality_test_params.

And use it to generate SDP offers.

Bug: b/203195868
Change-Id: I6f04c92dcef42e2d406d954c2e2ee6e845bcbac1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258795
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titarenko <artit@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36551}
---
 api/test/peerconnection_quality_test_fixture.h    | 2 ++
 test/pc/e2e/peer_configurer.h                     | 5 +++++
 test/pc/e2e/peer_connection_quality_test_params.h | 1 +
 test/pc/e2e/test_peer.h                           | 5 ++---
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index 434a3a643f..35a42ba8f1 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -431,6 +431,8 @@ class PeerConnectionE2EQualityTestFixture {
     virtual PeerConfigurer* SetAecDumpPath(std::string path) = 0;
     virtual PeerConfigurer* SetRTCConfiguration(
         PeerConnectionInterface::RTCConfiguration configuration) = 0;
+    virtual PeerConfigurer* SetRTCOfferAnswerOptions(
+        PeerConnectionInterface::RTCOfferAnswerOptions options) = 0;
     // Set bitrate parameters on PeerConnection. This constraints will be
     // applied to all summed RTP streams for this peer.
     virtual PeerConfigurer* SetBitrateSettings(
diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h
index 27133e494d..711e09d18d 100644
--- a/test/pc/e2e/peer_configurer.h
+++ b/test/pc/e2e/peer_configurer.h
@@ -190,6 +190,11 @@ class PeerConfigurerImpl final
     params_->rtc_configuration = std::move(configuration);
     return this;
   }
+  PeerConfigurer* SetRTCOfferAnswerOptions(
+      PeerConnectionInterface::RTCOfferAnswerOptions options) override {
+    params_->rtc_offer_answer_options = std::move(options);
+    return this;
+  }
   PeerConfigurer* SetBitrateSettings(
       BitrateSettings bitrate_settings) override {
     params_->bitrate_settings = bitrate_settings;
diff --git a/test/pc/e2e/peer_connection_quality_test_params.h b/test/pc/e2e/peer_connection_quality_test_params.h
index d9108267ab..8062d20707 100644
--- a/test/pc/e2e/peer_connection_quality_test_params.h
+++ b/test/pc/e2e/peer_connection_quality_test_params.h
@@ -139,6 +139,7 @@ struct Params {
   double video_encoder_bitrate_multiplier = 1.0;
 
   PeerConnectionInterface::RTCConfiguration rtc_configuration;
+  PeerConnectionInterface::RTCOfferAnswerOptions rtc_offer_answer_options;
   BitrateSettings bitrate_settings;
   std::vector<PeerConnectionE2EQualityTestFixture::VideoCodecConfig>
       video_codecs;
diff --git a/test/pc/e2e/test_peer.h b/test/pc/e2e/test_peer.h
index 9858ff389d..0aadeb61aa 100644
--- a/test/pc/e2e/test_peer.h
+++ b/test/pc/e2e/test_peer.h
@@ -57,12 +57,11 @@ class TestPeer final {
   void CreateOffer(
       rtc::scoped_refptr<CreateSessionDescriptionObserver> observer) {
     RTC_CHECK(wrapper_) << "TestPeer is already closed";
-    pc()->CreateOffer(observer.release(),
-                      webrtc::PeerConnectionInterface::RTCOfferAnswerOptions());
+    pc()->CreateOffer(observer.release(), params_->rtc_offer_answer_options);
   }
   std::unique_ptr<SessionDescriptionInterface> CreateOffer() {
     RTC_CHECK(wrapper_) << "TestPeer is already closed";
-    return wrapper_->CreateOffer();
+    return wrapper_->CreateOffer(params_->rtc_offer_answer_options);
   }
 
   std::unique_ptr<SessionDescriptionInterface> CreateAnswer() {