From cc3444155489406f5ea35b4e4abb6e001ea17e25 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sun, 12 Apr 2020 18:44:38 +0200 Subject: [PATCH] Remove deprecated RtpPacketInfo::RtpPacketInfo. Bug: webrtc:10739 Change-Id: Iceda881ffa0645d8e1519c2b1a62c840ffa6a93f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173468 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#31060} --- api/BUILD.gn | 1 - api/rtp_packet_info.cc | 12 ------------ api/rtp_packet_info.h | 9 --------- 3 files changed, 22 deletions(-) diff --git a/api/BUILD.gn b/api/BUILD.gn index c5f38287ee..98265afe49 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -88,7 +88,6 @@ rtc_library("rtp_packet_info") { ":rtp_headers", ":scoped_refptr", "..:webrtc_common", - "../rtc_base:deprecation", "../rtc_base:rtc_base_approved", "../rtc_base/system:rtc_export", "//third_party/abseil-cpp/absl/types:optional", diff --git a/api/rtp_packet_info.cc b/api/rtp_packet_info.cc index 54e26b418b..a9ebd9df48 100644 --- a/api/rtp_packet_info.cc +++ b/api/rtp_packet_info.cc @@ -32,18 +32,6 @@ RtpPacketInfo::RtpPacketInfo( absolute_capture_time_(absolute_capture_time), receive_time_ms_(receive_time_ms) {} -RtpPacketInfo::RtpPacketInfo(uint32_t ssrc, - std::vector csrcs, - uint32_t rtp_timestamp, - absl::optional audio_level, - int64_t receive_time_ms) - : RtpPacketInfo(ssrc, - std::move(csrcs), - rtp_timestamp, - audio_level, - /*absolute_capture_time=*/absl::nullopt, - receive_time_ms) {} - RtpPacketInfo::RtpPacketInfo(const RTPHeader& rtp_header, int64_t receive_time_ms) : ssrc_(rtp_header.ssrc), diff --git a/api/rtp_packet_info.h b/api/rtp_packet_info.h index 21cfefb748..639ba32770 100644 --- a/api/rtp_packet_info.h +++ b/api/rtp_packet_info.h @@ -17,7 +17,6 @@ #include "absl/types/optional.h" #include "api/rtp_headers.h" -#include "rtc_base/deprecation.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -38,14 +37,6 @@ class RTC_EXPORT RtpPacketInfo { absl::optional absolute_capture_time, int64_t receive_time_ms); - // TODO(bugs.webrtc.org/10739): Will be removed sometime after 2019-09-19. - RTC_DEPRECATED - RtpPacketInfo(uint32_t ssrc, - std::vector csrcs, - uint32_t rtp_timestamp, - absl::optional audio_level, - int64_t receive_time_ms); - RtpPacketInfo(const RTPHeader& rtp_header, int64_t receive_time_ms); RtpPacketInfo(const RtpPacketInfo& other) = default;