diff --git a/api/DEPS b/api/DEPS index ca0726f9db..edc9a23329 100644 --- a/api/DEPS +++ b/api/DEPS @@ -107,7 +107,6 @@ specific_include_rules = { "media_transport_interface\.h": [ "+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h "+rtc_base/network_route.h", - "+rtc_base/deprecation.h", ], "peer_connection_factory_proxy\.h": [ diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index eccb74d79c..d4f9fd210b 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -63,31 +63,18 @@ MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame() = default; MediaTransportEncodedVideoFrame::~MediaTransportEncodedVideoFrame() = default; -MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame( - int64_t frame_id, - std::vector referenced_frame_ids, - VideoCodecType codec_type, - const webrtc::EncodedImage& encoded_image) - : codec_type_(codec_type), - payload_type_(0), - encoded_image_(encoded_image), - frame_id_(frame_id), - referenced_frame_ids_(std::move(referenced_frame_ids)) {} - MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame( int64_t frame_id, std::vector referenced_frame_ids, int payload_type, const webrtc::EncodedImage& encoded_image) - : codec_type_(kVideoCodecGeneric), - payload_type_(payload_type), + : payload_type_(payload_type), encoded_image_(encoded_image), frame_id_(frame_id), referenced_frame_ids_(std::move(referenced_frame_ids)) {} MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=( const MediaTransportEncodedVideoFrame& o) { - codec_type_ = o.codec_type_; payload_type_ = o.payload_type_; encoded_image_ = o.encoded_image_; encoded_data_ = o.encoded_data_; @@ -102,7 +89,6 @@ MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=( MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=( MediaTransportEncodedVideoFrame&& o) { - codec_type_ = o.codec_type_; payload_type_ = o.payload_type_; encoded_image_ = o.encoded_image_; encoded_data_ = std::move(o.encoded_data_); diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 1669b42f26..96b135df4a 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -29,7 +29,6 @@ #include "api/units/data_rate.h" #include "api/video/encoded_image.h" #include "rtc_base/copy_on_write_buffer.h" -#include "rtc_base/deprecation.h" #include "rtc_base/network_route.h" namespace rtc { @@ -185,12 +184,6 @@ class MediaTransportAudioSinkInterface { // Represents encoded video frame, along with the codec information. class MediaTransportEncodedVideoFrame final { public: - // TODO(bugs.webrtc.org/9719): Switch to payload_type - RTC_DEPRECATED MediaTransportEncodedVideoFrame( - int64_t frame_id, - std::vector referenced_frame_ids, - VideoCodecType codec_type, - const webrtc::EncodedImage& encoded_image); MediaTransportEncodedVideoFrame(int64_t frame_id, std::vector referenced_frame_ids, int payload_type, @@ -203,8 +196,6 @@ class MediaTransportEncodedVideoFrame final { MediaTransportEncodedVideoFrame&& other); MediaTransportEncodedVideoFrame(MediaTransportEncodedVideoFrame&&); - // TODO(bugs.webrtc.org/9719): Switch to payload_type - RTC_DEPRECATED VideoCodecType codec_type() const { return codec_type_; } int payload_type() const { return payload_type_; } const webrtc::EncodedImage& encoded_image() const { return encoded_image_; } @@ -220,7 +211,6 @@ class MediaTransportEncodedVideoFrame final { private: MediaTransportEncodedVideoFrame(); - VideoCodecType codec_type_; int payload_type_; // The buffer is not owned by the encoded image. On the sender it means that