aboutsummaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorMarina Ciocea <marinaciocea@webrtc.org>2020-05-05 16:03:54 +0200
committerCommit Bot <commit-bot@chromium.org>2020-05-06 07:26:44 +0000
commit81be4217b889384fba840363670edb6da8b2373d (patch)
tree3b55360a5ef03da1b4fe493849fa262c9aedb3ef /api
parenta0ff50c0318396f65f25a4ea9e7803858aa84ea7 (diff)
downloadwebrtc-81be4217b889384fba840363670edb6da8b2373d.tar.gz
Remove FrameTransformerInterface functions using EncodedFrame.
Replaced by the function versions using TransformableFrameInterface downstream. Bug: webrtc:11380 Change-Id: Ia4aef84dd76b542ba33287aff6c9151448ed5be6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171864 Commit-Queue: Marina Ciocea <marinaciocea@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Magnus Flodman <mflodman@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31170}
Diffstat (limited to 'api')
-rw-r--r--api/frame_transformer_interface.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/api/frame_transformer_interface.h b/api/frame_transformer_interface.h
index 062b31d3e0..e712b3c190 100644
--- a/api/frame_transformer_interface.h
+++ b/api/frame_transformer_interface.h
@@ -64,14 +64,8 @@ class TransformableAudioFrameInterface : public TransformableFrameInterface {
// Objects implement this interface to be notified with the transformed frame.
class TransformedFrameCallback : public rtc::RefCountInterface {
public:
- // TODO(bugs.webrtc.org/11380) remove after updating downstream dependencies
- // to use new OnTransformedFrame signature.
virtual void OnTransformedFrame(
- std::unique_ptr<video_coding::EncodedFrame> transformed_frame) {}
- // TODO(bugs.webrtc.org/11380) make pure virtual after updating usage
- // downstream.
- virtual void OnTransformedFrame(
- std::unique_ptr<TransformableFrameInterface> transformed_frame) {}
+ std::unique_ptr<TransformableFrameInterface> frame) = 0;
protected:
~TransformedFrameCallback() override = default;
@@ -82,23 +76,8 @@ class TransformedFrameCallback : public rtc::RefCountInterface {
class FrameTransformerInterface : public rtc::RefCountInterface {
public:
// Transforms |frame| using the implementing class' processing logic.
- // |additional_data| holds data that is needed in the frame transformation
- // logic, but is not included in |frame|; for example, when the transform
- // function is used for encrypting/decrypting the frame, the additional data
- // holds the serialized generic frame descriptor extension calculated in
- // webrtc::RtpDescriptorAuthentication, needed in the encryption/decryption
- // algorithms.
- // TODO(bugs.webrtc.org/11380) remove after updating downstream dependencies
- // to use new OnTransformedFrame() signature.
- virtual void TransformFrame(std::unique_ptr<video_coding::EncodedFrame> frame,
- std::vector<uint8_t> additional_data,
- uint32_t ssrc) {}
-
- // Transforms |frame| using the implementing class' processing logic.
- // TODO(bugs.webrtc.org/11380) make pure virtual after updating usage
- // downstream.
virtual void Transform(
- std::unique_ptr<TransformableFrameInterface> transformable_frame) {}
+ std::unique_ptr<TransformableFrameInterface> transformable_frame) = 0;
virtual void RegisterTransformedFrameCallback(
rtc::scoped_refptr<TransformedFrameCallback>) {}