From e1e789b6ac82d72769f3859640fcf8dcc448983d Mon Sep 17 00:00:00 2001 From: Amit Hilbuch Date: Wed, 20 Feb 2019 10:40:12 -0800 Subject: [PATCH] Removing non-const RtpSenderInterface::GetParameters(). This removes the temporary non-const method that was kept in the code to enable backwards compatibility while we fix downstream project dependencies. Bug: webrtc:10251 Change-Id: Ie221af1d3b0f19112449d61e0f357a833f7a8b18 Reviewed-on: https://webrtc-review.googlesource.com/c/123561 Reviewed-by: Steve Anton Commit-Queue: Amit Hilbuch Cr-Commit-Position: refs/heads/master@{#26824} --- api/rtp_sender_interface.cc | 12 ------------ api/rtp_sender_interface.h | 4 +--- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/api/rtp_sender_interface.cc b/api/rtp_sender_interface.cc index 2b27b7489c..d23fd1844c 100644 --- a/api/rtp_sender_interface.cc +++ b/api/rtp_sender_interface.cc @@ -30,16 +30,4 @@ rtc::scoped_refptr RtpSenderInterface::dtls_transport() return nullptr; } -// TODO(amithi): Fix downstream dependencies and make GetParameters pure -// virtual. -RtpParameters RtpSenderInterface::GetParameters() { - const RtpSenderInterface* interface = this; - return interface->GetParameters(); -} - -RtpParameters RtpSenderInterface::GetParameters() const { - RtpSenderInterface* interface = const_cast(this); - return interface->GetParameters(); -} - } // namespace webrtc diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h index f8a97575fb..e0a29a33cb 100644 --- a/api/rtp_sender_interface.h +++ b/api/rtp_sender_interface.h @@ -67,9 +67,7 @@ class RtpSenderInterface : public rtc::RefCountInterface { // TODO(orphis): Make it pure virtual once Chrome has updated virtual std::vector init_send_encodings() const; - // TODO(amithi): Fix downstream dependecies and remove the non-const method. - virtual RtpParameters GetParameters(); - virtual RtpParameters GetParameters() const; + virtual RtpParameters GetParameters() const = 0; // Note that only a subset of the parameters can currently be changed. See // rtpparameters.h // The encodings are in increasing quality order for simulcast.