From b54bf8a9af320bb3052d68c5dc26ad1b2e82ba59 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Thu, 7 Dec 2023 12:31:13 +0000 Subject: [PATCH] Remove pointless Set*Encryptor functions These functions had dummy implementations, but were not virtual. The need for those functions seems to be lost in time. Bug: None Change-Id: I66dcac4a92f9993d82031f943f2f9ae767156b8a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330422 Commit-Queue: Harald Alvestrand Reviewed-by: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#41336} --- media/base/media_channel_impl.cc | 20 -------------------- media/base/media_channel_impl.h | 14 -------------- 2 files changed, 34 deletions(-) diff --git a/media/base/media_channel_impl.cc b/media/base/media_channel_impl.cc index e7e84c781c..1c08382969 100644 --- a/media/base/media_channel_impl.cc +++ b/media/base/media_channel_impl.cc @@ -71,18 +71,6 @@ int MediaChannelUtil::GetRtpSendTimeExtnId() const { return -1; } -void MediaChannelUtil::SetFrameEncryptor( - uint32_t ssrc, - rtc::scoped_refptr frame_encryptor) { - // Placeholder should be pure virtual once internal supports it. -} - -void MediaChannelUtil::SetFrameDecryptor( - uint32_t ssrc, - rtc::scoped_refptr frame_decryptor) { - // Placeholder should be pure virtual once internal supports it. -} - bool MediaChannelUtil::SendPacket(rtc::CopyOnWriteBuffer* packet, const rtc::PacketOptions& options) { return transport_.DoSendPacket(packet, false, options); @@ -115,14 +103,6 @@ bool MediaChannelUtil::HasNetworkInterface() const { return transport_.HasNetworkInterface(); } -void MediaChannelUtil::SetEncoderToPacketizerFrameTransformer( - uint32_t ssrc, - rtc::scoped_refptr frame_transformer) {} - -void MediaChannelUtil::SetDepacketizerToDecoderFrameTransformer( - uint32_t ssrc, - rtc::scoped_refptr frame_transformer) {} - bool MediaChannelUtil::DscpEnabled() const { return transport_.DscpEnabled(); } diff --git a/media/base/media_channel_impl.h b/media/base/media_channel_impl.h index f8c8174efa..eda47af568 100644 --- a/media/base/media_channel_impl.h +++ b/media/base/media_channel_impl.h @@ -106,20 +106,6 @@ class MediaChannelUtil { // Must be called on the network thread. bool HasNetworkInterface() const; - void SetFrameEncryptor( - uint32_t ssrc, - rtc::scoped_refptr frame_encryptor); - void SetFrameDecryptor( - uint32_t ssrc, - rtc::scoped_refptr frame_decryptor); - - void SetEncoderToPacketizerFrameTransformer( - uint32_t ssrc, - rtc::scoped_refptr frame_transformer); - void SetDepacketizerToDecoderFrameTransformer( - uint32_t ssrc, - rtc::scoped_refptr frame_transformer); - protected: bool DscpEnabled() const;