admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly mark RtpRtcp deprecated

Browse Source 
The clang pragma have been added to ensure we can still test the code
until usage is gone, and that we can still have the one implementation
compiling without itself tripping on the deprecation errors.

Users of the code will have deprecation warnings or error as intended.

Bug: webrtc:14617
Change-Id: I21dae57c669557d4d218c235c811174a477be080
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/281221
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38514}
This commit is contained in:
Florent Castelli 2022-10-31 18:47:06 +01:00 committed by WebRTC LUCI CQ
parent 7d3e5a03eb
commit a30f8829ff
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -18,8 +18,7 @@
namespace webrtc { namespace webrtc {
// DEPRECATED. Do not use. class ABSL_DEPRECATED("") RtpRtcp : public RtpRtcpInterface {
class RtpRtcp : public RtpRtcpInterface {
public: public:
// Instantiates a deprecated version of the RtpRtcp module. // Instantiates a deprecated version of the RtpRtcp module.
static std::unique_ptr<RtpRtcp> ABSL_DEPRECATED("") static std::unique_ptr<RtpRtcp> ABSL_DEPRECATED("")

8
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -43,8 +43,12 @@ class Clock;
struct PacedPacketInfo; struct PacedPacketInfo;
struct RTPVideoHeader; struct RTPVideoHeader;
// DEPRECATED. #pragma clang diagnostic push
class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { #pragma clang diagnostic ignored "-Wdeprecated-declarations"
class ABSL_DEPRECATED("") ModuleRtpRtcpImpl
: public RtpRtcp,
public RTCPReceiver::ModuleRtpRtcp {
#pragma clang diagnostic pop
public: public:
explicit ModuleRtpRtcpImpl( explicit ModuleRtpRtcpImpl(
const RtpRtcpInterface::Configuration& configuration); const RtpRtcpInterface::Configuration& configuration);

5
modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
View File

@ -44,6 +44,9 @@ const uint8_t kPayloadType = 100;
const int kWidth = 320; const int kWidth = 320;
const int kHeight = 100; const int kHeight = 100;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
class RtcpRttStatsTestImpl : public RtcpRttStats { class RtcpRttStatsTestImpl : public RtcpRttStats {
public: public:
RtcpRttStatsTestImpl() : rtt_ms_(0) {} RtcpRttStatsTestImpl() : rtt_ms_(0) {}
@ -697,4 +700,6 @@ TEST_F(RtpRtcpImplTest, SenderReportStatsPacketByteCounters) {
Field(&SenderReportStats::bytes_sent, Gt(0u))))); Field(&SenderReportStats::bytes_sent, Gt(0u)))));
} }
#pragma clang diagnostic pop
} // namespace webrtc } // namespace webrtc

4
modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
View File

@ -154,8 +154,8 @@ class RtpSenderEgressTest : public ::testing::TestWithParam<TestConfig> {
return std::make_unique<RtpSenderEgress>(DefaultConfig(), &packet_history_); return std::make_unique<RtpSenderEgress>(DefaultConfig(), &packet_history_);
} }
RtpRtcp::Configuration DefaultConfig() { RtpRtcpInterface::Configuration DefaultConfig() {
RtpRtcp::Configuration config; RtpRtcpInterface::Configuration config;
config.clock = clock_; config.clock = clock_;
config.outgoing_transport = &transport_; config.outgoing_transport = &transport_;
config.local_media_ssrc = kSsrc; config.local_media_ssrc = kSsrc;