From 5179469f4b86af10b0010b4468e6b3e477758d9a Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Wed, 1 Apr 2020 15:42:41 +0200
Subject: [PATCH] Delete deprecated RtpFrameObject constructor

Bug: None
Change-Id: Ifd496d6681004f3afff43628bda2d4b888aef958
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172620
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30974}
---
 modules/video_coding/frame_object.cc | 37 ----------------------------
 modules/video_coding/frame_object.h  | 23 -----------------
 2 files changed, 60 deletions(-)

diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index 7152c3b2ce..cb83999c94 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -90,43 +90,6 @@ RtpFrameObject::RtpFrameObject(
   is_last_spatial_layer = markerBit;
 }
 
-RtpFrameObject::RtpFrameObject(
-    uint16_t first_seq_num,
-    uint16_t last_seq_num,
-    bool markerBit,
-    int times_nacked,
-    int64_t first_packet_received_time,
-    int64_t last_packet_received_time,
-    uint32_t rtp_timestamp,
-    int64_t ntp_time_ms,
-    const VideoSendTiming& timing,
-    uint8_t payload_type,
-    VideoCodecType codec,
-    VideoRotation rotation,
-    VideoContentType content_type,
-    const RTPVideoHeader& video_header,
-    const absl::optional<webrtc::ColorSpace>& color_space,
-    const absl::optional<RtpGenericFrameDescriptor>& /*generic_descriptor*/,
-    RtpPacketInfos packet_infos,
-    rtc::scoped_refptr<EncodedImageBuffer> image_buffer)
-    : RtpFrameObject(first_seq_num,
-                     last_seq_num,
-                     markerBit,
-                     times_nacked,
-                     first_packet_received_time,
-                     last_packet_received_time,
-                     rtp_timestamp,
-                     ntp_time_ms,
-                     timing,
-                     payload_type,
-                     codec,
-                     rotation,
-                     content_type,
-                     video_header,
-                     color_space,
-                     std::move(packet_infos),
-                     std::move(image_buffer)) {}
-
 RtpFrameObject::~RtpFrameObject() {
 }
 
diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
index f43fafd9a8..f7988763d3 100644
--- a/modules/video_coding/frame_object.h
+++ b/modules/video_coding/frame_object.h
@@ -13,8 +13,6 @@
 
 #include "absl/types/optional.h"
 #include "api/video/encoded_frame.h"
-#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
-#include "rtc_base/deprecation.h"
 
 namespace webrtc {
 namespace video_coding {
@@ -39,27 +37,6 @@ class RtpFrameObject : public EncodedFrame {
                  RtpPacketInfos packet_infos,
                  rtc::scoped_refptr<EncodedImageBuffer> image_buffer);
 
-  RTC_DEPRECATED
-  RtpFrameObject(
-      uint16_t first_seq_num,
-      uint16_t last_seq_num,
-      bool markerBit,
-      int times_nacked,
-      int64_t first_packet_received_time,
-      int64_t last_packet_received_time,
-      uint32_t rtp_timestamp,
-      int64_t ntp_time_ms,
-      const VideoSendTiming& timing,
-      uint8_t payload_type,
-      VideoCodecType codec,
-      VideoRotation rotation,
-      VideoContentType content_type,
-      const RTPVideoHeader& video_header,
-      const absl::optional<webrtc::ColorSpace>& color_space,
-      const absl::optional<RtpGenericFrameDescriptor>& generic_descriptor,
-      RtpPacketInfos packet_infos,
-      rtc::scoped_refptr<EncodedImageBuffer> image_buffer);
-
   ~RtpFrameObject() override;
   uint16_t first_seq_num() const;
   uint16_t last_seq_num() const;