From 92f83cec12252a9cbe41000191f48dec28a68127 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 28 May 2018 12:53:50 +0200 Subject: [PATCH] Remove deprecated rtcp SLI/RPSI observers Bug: webrtc:7338 Change-Id: I39247a3d969637856496b630cadaacac16ef8d09 Reviewed-on: https://webrtc-review.googlesource.com/79260 Commit-Queue: Danil Chapovalov Reviewed-by: Niels Moller Cr-Commit-Position: refs/heads/master@{#23413} --- modules/rtp_rtcp/include/rtp_rtcp_defines.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index c5ff75cea0..dd253da69a 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -19,7 +19,6 @@ #include "api/rtp_headers.h" #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" -#include "rtc_base/deprecation.h" #include "system_wrappers/include/clock.h" #include "typedefs.h" // NOLINT(build/include) @@ -254,15 +253,9 @@ class RecoveredPacketReceiver { class RtcpIntraFrameObserver { public: - virtual void OnReceivedIntraFrameRequest(uint32_t ssrc) = 0; - - RTC_DEPRECATED virtual void OnReceivedSLI(uint32_t ssrc, - uint8_t picture_id) {} - - RTC_DEPRECATED virtual void OnReceivedRPSI(uint32_t ssrc, - uint64_t picture_id) {} - virtual ~RtcpIntraFrameObserver() {} + + virtual void OnReceivedIntraFrameRequest(uint32_t ssrc) = 0; }; class RtcpBandwidthObserver {