diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h index 2786a2ac19..41d35bc287 100644 --- a/api/rtp_sender_interface.h +++ b/api/rtp_sender_interface.h @@ -109,11 +109,6 @@ class RTC_EXPORT RtpSenderInterface : public rtc::RefCountInterface { std::unique_ptr encoder_selector) = 0; - // TODO(crbug.com/1354101): make pure virtual again after Chrome roll. - virtual RTCError GenerateKeyFrame(const std::vector& rids) { - return RTCError::OK(); - } - protected: ~RtpSenderInterface() override = default; }; diff --git a/pc/rtp_sender.h b/pc/rtp_sender.h index 232f7473e9..d29c3760e6 100644 --- a/pc/rtp_sender.h +++ b/pc/rtp_sender.h @@ -288,6 +288,8 @@ class RtpSenderBase : public RtpSenderInternal, public ObserverInterface { rtc::scoped_refptr frame_transformer_; std::unique_ptr encoder_selector_; + + virtual RTCError GenerateKeyFrame(const std::vector& rids) = 0; }; // LocalAudioSinkAdapter receives data callback as a sink to the local diff --git a/pc/rtp_sender_proxy.h b/pc/rtp_sender_proxy.h index 236ac10fa2..39862eb133 100644 --- a/pc/rtp_sender_proxy.h +++ b/pc/rtp_sender_proxy.h @@ -52,7 +52,6 @@ PROXY_METHOD1(void, PROXY_METHOD1(void, SetEncoderSelector, std::unique_ptr) -PROXY_METHOD1(RTCError, GenerateKeyFrame, const std::vector&) END_PROXY_MAP(RtpSender) } // namespace webrtc