Remove unused RtpFrameObject ctor.
Bug: webrtc:10979
Change-Id: I9ab8cbd3da4c753f0fa318c41b6e74ddd9679901
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155172
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29354}
diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index 4e124bb..682ce17 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -16,99 +16,11 @@
#include "api/video/encoded_image.h"
#include "api/video/video_timing.h"
-#include "modules/video_coding/packet.h"
-#include "modules/video_coding/packet_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/critical_section.h"
namespace webrtc {
namespace video_coding {
-
-// TODO(philipel): Remove this ctor.
-RtpFrameObject::RtpFrameObject(
- PacketBuffer* packet_buffer,
- uint16_t first_seq_num,
- uint16_t last_seq_num,
- int times_nacked,
- int64_t first_packet_received_time,
- int64_t last_packet_received_time,
- RtpPacketInfos packet_infos,
- rtc::scoped_refptr<EncodedImageBuffer> image_buffer)
- : first_seq_num_(first_seq_num),
- last_seq_num_(last_seq_num),
- last_packet_received_time_(last_packet_received_time),
- times_nacked_(times_nacked) {
- VCMPacket* first_packet = packet_buffer->GetPacket(first_seq_num);
- RTC_CHECK(first_packet);
-
- rtp_video_header_ = first_packet->video_header;
- rtp_generic_frame_descriptor_ = first_packet->generic_descriptor;
-
- // EncodedFrame members
- codec_type_ = first_packet->codec();
-
- // TODO(philipel): Remove when encoded image is replaced by EncodedFrame.
- // VCMEncodedFrame members
- CopyCodecSpecific(&first_packet->video_header);
- _completeFrame = true;
- _payloadType = first_packet->payloadType;
- SetTimestamp(first_packet->timestamp);
- ntp_time_ms_ = first_packet->ntp_time_ms_;
- _frameType = first_packet->video_header.frame_type;
-
- // Setting frame's playout delays to the same values
- // as of the first packet's.
- SetPlayoutDelay(first_packet->video_header.playout_delay);
-
- SetEncodedData(std::move(image_buffer));
- _encodedWidth = first_packet->width();
- _encodedHeight = first_packet->height();
-
- // EncodedFrame members
- SetTimestamp(first_packet->timestamp);
- SetPacketInfos(std::move(packet_infos));
-
- VCMPacket* last_packet = packet_buffer->GetPacket(last_seq_num);
- RTC_CHECK(last_packet);
- RTC_CHECK(last_packet->is_last_packet_in_frame());
- // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
- // ts_126114v120700p.pdf Section 7.4.5.
- // The MTSI client shall add the payload bytes as defined in this clause
- // onto the last RTP packet in each group of packets which make up a key
- // frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265
- // (HEVC)).
- rotation_ = last_packet->video_header.rotation;
- SetColorSpace(last_packet->video_header.color_space);
- content_type_ = last_packet->video_header.content_type;
- if (last_packet->video_header.video_timing.flags !=
- VideoSendTiming::kInvalid) {
- // ntp_time_ms_ may be -1 if not estimated yet. This is not a problem,
- // as this will be dealt with at the time of reporting.
- timing_.encode_start_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.encode_start_delta_ms;
- timing_.encode_finish_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.encode_finish_delta_ms;
- timing_.packetization_finish_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.packetization_finish_delta_ms;
- timing_.pacer_exit_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.pacer_exit_delta_ms;
- timing_.network_timestamp_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.network_timestamp_delta_ms;
- timing_.network2_timestamp_ms =
- ntp_time_ms_ +
- last_packet->video_header.video_timing.network2_timestamp_delta_ms;
- }
- timing_.receive_start_ms = first_packet_received_time;
- timing_.receive_finish_ms = last_packet_received_time;
- timing_.flags = last_packet->video_header.video_timing.flags;
- is_last_spatial_layer = last_packet->markerBit;
-}
-
RtpFrameObject::RtpFrameObject(
uint16_t first_seq_num,
uint16_t last_seq_num,
diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
index 8020b49..b3cee20 100644
--- a/modules/video_coding/frame_object.h
+++ b/modules/video_coding/frame_object.h
@@ -18,20 +18,8 @@
namespace webrtc {
namespace video_coding {
-class PacketBuffer;
-
class RtpFrameObject : public EncodedFrame {
public:
- // TODO(philipel): Remove this ctor.
- RtpFrameObject(PacketBuffer* packet_buffer,
- uint16_t first_seq_num,
- uint16_t last_seq_num,
- int times_nacked,
- int64_t first_packet_received_time,
- int64_t last_packet_received_time,
- RtpPacketInfos packet_infos,
- rtc::scoped_refptr<EncodedImageBuffer> image_buffer);
-
RtpFrameObject(
uint16_t first_seq_num,
uint16_t last_seq_num,
