From b3517fea8358d6fc91601e5a15d408a8f3908784 Mon Sep 17 00:00:00 2001 From: Tomas Gunnarsson Date: Fri, 18 Mar 2022 19:32:38 +0100 Subject: [PATCH] Remove RefCountedObject dependency from FakeFrameDecryptor Bug: webrtc:12701 Change-Id: I705007948eed7b8300f02a61307e8f4b3410e666 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256108 Auto-Submit: Tomas Gunnarsson Reviewed-by: Niels Moller Commit-Queue: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#36276} --- api/test/fake_frame_decryptor.h | 3 +-- pc/rtp_sender_receiver_unittest.cc | 8 ++++---- video/end_to_end_tests/frame_encryption_tests.cc | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h index bfd0e6903b..cb58dd6c99 100644 --- a/api/test/fake_frame_decryptor.h +++ b/api/test/fake_frame_decryptor.h @@ -27,8 +27,7 @@ namespace webrtc { // FrameDecryptorInterface. It is constructed with a simple single digit key and // a fixed postfix byte. This is just to validate that the core code works // as expected. -class FakeFrameDecryptor final - : public rtc::RefCountedObject { +class FakeFrameDecryptor : public FrameDecryptorInterface { public: // Provide a key (0,255) and some postfix byte (0,255) this should match the // byte you expect from the FakeFrameEncryptor. diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc index a7b9c9ab68..20621e44ae 100644 --- a/pc/rtp_sender_receiver_unittest.cc +++ b/pc/rtp_sender_receiver_unittest.cc @@ -1635,7 +1635,7 @@ TEST_F(RtpSenderReceiverTest, AudioSenderCannotSetFrameEncryptorAfterStop) { TEST_F(RtpSenderReceiverTest, AudioReceiverCanSetFrameDecryptor) { CreateAudioRtpReceiver(); rtc::scoped_refptr fake_frame_decryptor( - new FakeFrameDecryptor()); + rtc::make_ref_counted()); EXPECT_EQ(nullptr, audio_rtp_receiver_->GetFrameDecryptor()); audio_rtp_receiver_->SetFrameDecryptor(fake_frame_decryptor); EXPECT_EQ(fake_frame_decryptor.get(), @@ -1647,7 +1647,7 @@ TEST_F(RtpSenderReceiverTest, AudioReceiverCanSetFrameDecryptor) { TEST_F(RtpSenderReceiverTest, AudioReceiverCannotSetFrameDecryptorAfterStop) { CreateAudioRtpReceiver(); rtc::scoped_refptr fake_frame_decryptor( - new FakeFrameDecryptor()); + rtc::make_ref_counted()); EXPECT_EQ(nullptr, audio_rtp_receiver_->GetFrameDecryptor()); audio_rtp_receiver_->SetMediaChannel(nullptr); audio_rtp_receiver_->SetFrameDecryptor(fake_frame_decryptor); @@ -1682,7 +1682,7 @@ TEST_F(RtpSenderReceiverTest, VideoSenderCannotSetFrameEncryptorAfterStop) { TEST_F(RtpSenderReceiverTest, VideoReceiverCanSetFrameDecryptor) { CreateVideoRtpReceiver(); rtc::scoped_refptr fake_frame_decryptor( - new FakeFrameDecryptor()); + rtc::make_ref_counted()); EXPECT_EQ(nullptr, video_rtp_receiver_->GetFrameDecryptor()); video_rtp_receiver_->SetFrameDecryptor(fake_frame_decryptor); EXPECT_EQ(fake_frame_decryptor.get(), @@ -1694,7 +1694,7 @@ TEST_F(RtpSenderReceiverTest, VideoReceiverCanSetFrameDecryptor) { TEST_F(RtpSenderReceiverTest, VideoReceiverCannotSetFrameDecryptorAfterStop) { CreateVideoRtpReceiver(); rtc::scoped_refptr fake_frame_decryptor( - new FakeFrameDecryptor()); + rtc::make_ref_counted()); EXPECT_EQ(nullptr, video_rtp_receiver_->GetFrameDecryptor()); video_rtp_receiver_->SetMediaChannel(nullptr); video_rtp_receiver_->SetFrameDecryptor(fake_frame_decryptor); diff --git a/video/end_to_end_tests/frame_encryption_tests.cc b/video/end_to_end_tests/frame_encryption_tests.cc index df54337be5..30e65e8abd 100644 --- a/video/end_to_end_tests/frame_encryption_tests.cc +++ b/video/end_to_end_tests/frame_encryption_tests.cc @@ -51,7 +51,7 @@ class DecryptedFrameObserver : public test::EndToEndTest, recv_config.decoders.clear(); recv_config.decoders.push_back(decoder); recv_config.renderer = this; - recv_config.frame_decryptor = new FakeFrameDecryptor(); + recv_config.frame_decryptor = rtc::make_ref_counted(); recv_config.crypto_options.sframe.require_frame_encryption = true; } }