diff --git a/api/call/transport.h b/api/call/transport.h index 6c6cbb8941..292aa11da3 100644 --- a/api/call/transport.h +++ b/api/call/transport.h @@ -45,29 +45,9 @@ struct PacketOptions { class Transport { public: - // New style functions. Default implementations are to accomodate - // subclasses that haven't been converted to new style yet. - // TODO(bugs.webrtc.org/14870): Deprecate and remove old functions. -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" virtual bool SendRtp(rtc::ArrayView packet, - const PacketOptions& options) { - return SendRtp(packet.data(), packet.size(), options); - } - virtual bool SendRtcp(rtc::ArrayView packet) { - return SendRtcp(packet.data(), packet.size()); - } -#pragma clang diagnostic pop - // Old style functions. - [[deprecated("Use ArrayView version")]] virtual bool - SendRtp(const uint8_t* packet, size_t length, const PacketOptions& options) { - return SendRtp(rtc::MakeArrayView(packet, length), options); - } - [[deprecated("Use ArrayView version")]] virtual bool SendRtcp( - const uint8_t* packet, - size_t length) { - return SendRtcp(rtc::MakeArrayView(packet, length)); - } + const PacketOptions& options) = 0; + virtual bool SendRtcp(rtc::ArrayView packet) = 0; protected: virtual ~Transport() {} diff --git a/examples/androidvoip/jni/android_voip_client.cc b/examples/androidvoip/jni/android_voip_client.cc index 92fad221d8..8a0a3badb9 100644 --- a/examples/androidvoip/jni/android_voip_client.cc +++ b/examples/androidvoip/jni/android_voip_client.cc @@ -427,10 +427,9 @@ void AndroidVoipClient::SendRtpPacket(const std::vector& packet_copy) { } } -bool AndroidVoipClient::SendRtp(const uint8_t* packet, - size_t length, +bool AndroidVoipClient::SendRtp(rtc::ArrayView packet, const webrtc::PacketOptions& options) { - std::vector packet_copy(packet, packet + length); + std::vector packet_copy(packet.begin(), packet.end()); voip_thread_->PostTask([this, packet_copy = std::move(packet_copy)] { SendRtpPacket(packet_copy); }); @@ -447,8 +446,8 @@ void AndroidVoipClient::SendRtcpPacket( } } -bool AndroidVoipClient::SendRtcp(const uint8_t* packet, size_t length) { - std::vector packet_copy(packet, packet + length); +bool AndroidVoipClient::SendRtcp(rtc::ArrayView packet) { + std::vector packet_copy(packet.begin(), packet.end()); voip_thread_->PostTask([this, packet_copy = std::move(packet_copy)] { SendRtcpPacket(packet_copy); }); diff --git a/examples/androidvoip/jni/android_voip_client.h b/examples/androidvoip/jni/android_voip_client.h index 8e1edd5ef9..e2f1c64590 100644 --- a/examples/androidvoip/jni/android_voip_client.h +++ b/examples/androidvoip/jni/android_voip_client.h @@ -118,10 +118,9 @@ class AndroidVoipClient : public webrtc::Transport, void Delete(JNIEnv* env); // Implementation for Transport. - bool SendRtp(const uint8_t* packet, - size_t length, + bool SendRtp(rtc::ArrayView packet, const webrtc::PacketOptions& options) override; - bool SendRtcp(const uint8_t* packet, size_t length) override; + bool SendRtcp(rtc::ArrayView packet) override; // Slots for sockets to connect to. void OnSignalReadRTPPacket(rtc::AsyncPacketSocket* socket,