Add passkey to TransformableFrameInterface to prevent external impls

This makes the downcasts currently used in eg
modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
safer.

Bug: webrtc:339815768
Change-Id: Ie6c7ab84666d399dbca4c95846b850aac5327f1a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350361
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tony Herre <herre@google.com>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42325}
This commit is contained in:
Tony Herre 2024-05-16 13:38:25 +02:00 committed by WebRTC LUCI CQ
parent d1a8ce588f
commit a45c7056ad
10 changed files with 82 additions and 12 deletions

View File

@ -393,7 +393,10 @@ rtc_library("libjingle_peerconnection_api") {
rtc_source_set("frame_transformer_interface") {
visibility = [ "*" ]
sources = [ "frame_transformer_interface.h" ]
sources = [
"frame_transformer_interface.cc",
"frame_transformer_interface.h",
]
deps = [
":make_ref_counted",
":ref_count",

View File

@ -0,0 +1,26 @@
/*
* Copyright 2024 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "api/frame_transformer_interface.h"
namespace webrtc {
TransformableFrameInterface::TransformableFrameInterface(
TransformableFrameInterface::Passkey) {}
TransformableVideoFrameInterface::TransformableVideoFrameInterface(
TransformableFrameInterface::Passkey passkey)
: TransformableFrameInterface(passkey) {}
TransformableAudioFrameInterface::TransformableAudioFrameInterface(
TransformableFrameInterface::Passkey passkey)
: TransformableFrameInterface(passkey) {}
} // namespace webrtc

View File

@ -24,6 +24,18 @@ namespace webrtc {
// Owns the frame payload data.
class TransformableFrameInterface {
public:
// Only a known list of internal implementations of transformable frames are
// permitted to allow internal downcasting. This is enforced via the
// internally-constructable Passkey.
// TODO: bugs.webrtc.org/339815768 - Remove this passkey once the
// downcasts are removed.
class Passkey;
RTC_EXPORT explicit TransformableFrameInterface(Passkey);
TransformableFrameInterface(TransformableFrameInterface&&) = default;
TransformableFrameInterface& operator=(TransformableFrameInterface&&) =
default;
virtual ~TransformableFrameInterface() = default;
// Returns the frame payload data. The data is valid until the next non-const
@ -58,6 +70,7 @@ class TransformableFrameInterface {
class TransformableVideoFrameInterface : public TransformableFrameInterface {
public:
RTC_EXPORT explicit TransformableVideoFrameInterface(Passkey passkey);
virtual ~TransformableVideoFrameInterface() = default;
virtual bool IsKeyFrame() const = 0;
@ -69,6 +82,7 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface {
// Extends the TransformableFrameInterface to expose audio-specific information.
class TransformableAudioFrameInterface : public TransformableFrameInterface {
public:
RTC_EXPORT explicit TransformableAudioFrameInterface(Passkey passkey);
virtual ~TransformableAudioFrameInterface() = default;
virtual rtc::ArrayView<const uint32_t> GetContributingSources() const = 0;
@ -137,6 +151,27 @@ class FrameTransformerHost {
// virtual AddOutgoingMediaType(RtpCodec codec) = 0;
};
//------------------------------------------------------------------------------
// Implementation details follow
//------------------------------------------------------------------------------
class TransformableFrameInterface::Passkey {
public:
~Passkey() = default;
private:
// Explicit list of allowed internal implmentations of
// TransformableFrameInterface.
friend class TransformableOutgoingAudioFrame;
friend class TransformableIncomingAudioFrame;
friend class TransformableVideoSenderFrame;
friend class TransformableVideoReceiverFrame;
friend class MockTransformableFrame;
friend class MockTransformableAudioFrame;
friend class MockTransformableVideoFrame;
Passkey() = default;
};
} // namespace webrtc
#endif // API_FRAME_TRANSFORMER_INTERFACE_H_

View File

@ -20,6 +20,8 @@ namespace webrtc {
class MockTransformableAudioFrame : public TransformableAudioFrameInterface {
public:
MockTransformableAudioFrame() : TransformableAudioFrameInterface(Passkey()) {}
MOCK_METHOD(rtc::ArrayView<const uint8_t>, GetData, (), (const, override));
MOCK_METHOD(void, SetData, (rtc::ArrayView<const uint8_t>), (override));
MOCK_METHOD(void, SetRTPTimestamp, (uint32_t), (override));

View File

@ -23,8 +23,10 @@
namespace webrtc {
class MockTransformableFrame : public webrtc::TransformableFrameInterface {
class MockTransformableFrame : public TransformableFrameInterface {
public:
MockTransformableFrame() : TransformableFrameInterface(Passkey()) {}
MOCK_METHOD(rtc::ArrayView<const uint8_t>, GetData, (), (const, override));
MOCK_METHOD(void, SetData, (rtc::ArrayView<const uint8_t>), (override));
MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override));

View File

@ -22,6 +22,7 @@ namespace webrtc {
class MockTransformableVideoFrame
: public webrtc::TransformableVideoFrameInterface {
public:
MockTransformableVideoFrame() : TransformableVideoFrameInterface(Passkey()) {}
MOCK_METHOD(rtc::ArrayView<const uint8_t>, GetData, (), (const, override));
MOCK_METHOD(void, SetData, (rtc::ArrayView<const uint8_t> data), (override));
MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));

View File

@ -16,7 +16,6 @@
#include "rtc_base/buffer.h"
namespace webrtc {
namespace {
class TransformableIncomingAudioFrame
: public TransformableAudioFrameInterface {
@ -25,7 +24,8 @@ class TransformableIncomingAudioFrame
const RTPHeader& header,
uint32_t ssrc,
const std::string& codec_mime_type)
: payload_(payload.data(), payload.size()),
: TransformableAudioFrameInterface(Passkey()),
payload_(payload.data(), payload.size()),
header_(header),
ssrc_(ssrc),
codec_mime_type_(codec_mime_type) {}
@ -83,7 +83,6 @@ class TransformableIncomingAudioFrame
uint32_t ssrc_;
std::string codec_mime_type_;
};
} // namespace
ChannelReceiveFrameTransformerDelegate::ChannelReceiveFrameTransformerDelegate(
ReceiveFrameCallback receive_frame_callback,

View File

@ -45,6 +45,7 @@ AudioFrameType InterfaceFrameTypeToInternalFrameType(
RTC_DCHECK_NOTREACHED();
return AudioFrameType::kEmptyFrame;
}
} // namespace
class TransformableOutgoingAudioFrame
: public TransformableAudioFrameInterface {
@ -61,7 +62,8 @@ class TransformableOutgoingAudioFrame
const std::string& codec_mime_type,
absl::optional<uint16_t> sequence_number,
absl::optional<uint8_t> audio_level_dbov)
: frame_type_(frame_type),
: TransformableAudioFrameInterface(Passkey()),
frame_type_(frame_type),
payload_type_(payload_type),
rtp_timestamp_with_offset_(rtp_timestamp_with_offset),
payload_(payload_data, payload_size),
@ -119,7 +121,6 @@ class TransformableOutgoingAudioFrame
absl::optional<uint16_t> sequence_number_;
absl::optional<uint8_t> audio_level_dbov_;
};
} // namespace
ChannelSendFrameTransformerDelegate::ChannelSendFrameTransformerDelegate(
SendFrameCallback send_frame_callback,

View File

@ -28,6 +28,7 @@ namespace {
// estimate of the RTT of the link,so 10ms should be a reasonable estimate for
// frames being re-transmitted to a peer, probably on the same network.
const TimeDelta kDefaultRetransmissionsTime = TimeDelta::Millis(10);
} // namespace
class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
public:
@ -39,7 +40,8 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
TimeDelta expected_retransmission_time,
uint32_t ssrc,
std::vector<uint32_t> csrcs)
: encoded_data_(encoded_image.GetEncodedData()),
: TransformableVideoFrameInterface(Passkey()),
encoded_data_(encoded_image.GetEncodedData()),
pre_transform_payload_size_(encoded_image.size()),
header_(video_header),
frame_type_(encoded_image._frameType),
@ -128,7 +130,6 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
uint32_t ssrc_;
std::vector<uint32_t> csrcs_;
};
} // namespace
RTPSenderVideoFrameTransformerDelegate::RTPSenderVideoFrameTransformerDelegate(
RTPVideoFrameSenderInterface* sender,

View File

@ -16,20 +16,21 @@
#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h"
#include "modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
namespace webrtc {
namespace {
class TransformableVideoReceiverFrame
: public TransformableVideoFrameInterface {
public:
TransformableVideoReceiverFrame(std::unique_ptr<RtpFrameObject> frame,
uint32_t ssrc,
RtpVideoFrameReceiver* receiver)
: frame_(std::move(frame)),
: TransformableVideoFrameInterface(Passkey()),
frame_(std::move(frame)),
metadata_(frame_->GetRtpVideoHeader().GetAsMetadata()),
receiver_(receiver) {
metadata_.SetSsrc(ssrc);
@ -89,7 +90,6 @@ class TransformableVideoReceiverFrame
VideoFrameMetadata metadata_;
RtpVideoFrameReceiver* receiver_;
};
} // namespace
RtpVideoStreamReceiverFrameTransformerDelegate::
RtpVideoStreamReceiverFrameTransformerDelegate(