mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
eb89027733
This reverts commit 209ac5fd95.
Reason for revert: Breaks WebRTC autoroll presubmit:
https://chromium-review.googlesource.com/c/chromium/src/+/3134502
Example failure https://ci.chromium.org/ui/p/chromium/builders/try/mac-rel/775468/overview
../../buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h:725:32: error: allocating an object of abstract class type 'testing::NiceMock<blink::(anonymous namespace)::MockTransformableVideoFrame>'
return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
^
../../third_party/blink/renderer/platform/peerconnection/rtc_encoded_video_stream_transformer_test.cc:69:26: note: in instantiation of function template specialization 'std::make_unique<testing::NiceMock<blink::(anonymous namespace)::MockTransformableVideoFrame>>' requested here
auto mock_frame = std::make_unique<NiceMock<MockTransformableVideoFrame>>();
^
../../third_party/webrtc/api/frame_transformer_interface.h:36:19: note: unimplemented pure virtual method 'GetPayloadType' in 'NiceMock'
virtual uint8_t GetPayloadType() const = 0;
^
Original change's description:
> frame transformer: make GetPayloadType pure virtual again
>
> after chrome was updated in
> https://chromium-review.googlesource.com/c/chromium/src/+/3103323
>
> BUG=webrtc:13077
>
> Change-Id: I7e5ff6aaae81c5dcfbaa41b09ef01bc95bb7251a
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230143
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
> Cr-Commit-Position: refs/heads/main@{#34877}
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:13077
Change-Id: I6b2e4e2804890c857f1f832a6a4faa614ec026c4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230920
Reviewed-by: Olga Sharonova <olka@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Olga Sharonova <olka@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34891}
102 lines
3.6 KiB
C++
102 lines
3.6 KiB
C++
/*
|
|
* Copyright 2020 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.
|
|
*/
|
|
|
|
#ifndef API_FRAME_TRANSFORMER_INTERFACE_H_
|
|
#define API_FRAME_TRANSFORMER_INTERFACE_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/video/encoded_frame.h"
|
|
#include "api/video/video_frame_metadata.h"
|
|
#include "rtc_base/ref_count.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Owns the frame payload data.
|
|
class TransformableFrameInterface {
|
|
public:
|
|
virtual ~TransformableFrameInterface() = default;
|
|
|
|
// Returns the frame payload data. The data is valid until the next non-const
|
|
// method call.
|
|
virtual rtc::ArrayView<const uint8_t> GetData() const = 0;
|
|
|
|
// Copies `data` into the owned frame payload data.
|
|
virtual void SetData(rtc::ArrayView<const uint8_t> data) = 0;
|
|
|
|
// TODO(bugs.webrtc.org/13077) make pure virtual again after rolling into
|
|
// Chrome.
|
|
virtual uint8_t GetPayloadType() const { return 255; }
|
|
virtual uint32_t GetSsrc() const = 0;
|
|
virtual uint32_t GetTimestamp() const = 0;
|
|
};
|
|
|
|
class TransformableVideoFrameInterface : public TransformableFrameInterface {
|
|
public:
|
|
virtual ~TransformableVideoFrameInterface() = default;
|
|
virtual bool IsKeyFrame() const = 0;
|
|
|
|
// Returns data needed in the frame transformation logic; for example,
|
|
// when the transformation applied to the frame is encryption/decryption, the
|
|
// additional data holds the serialized generic frame descriptor extension
|
|
// calculated in webrtc::RtpDescriptorAuthentication.
|
|
// TODO(bugs.webrtc.org/11380) remove from interface once
|
|
// webrtc::RtpDescriptorAuthentication is exposed in api/.
|
|
virtual std::vector<uint8_t> GetAdditionalData() const = 0;
|
|
|
|
virtual const VideoFrameMetadata& GetMetadata() const = 0;
|
|
};
|
|
|
|
// Extends the TransformableFrameInterface to expose audio-specific information.
|
|
class TransformableAudioFrameInterface : public TransformableFrameInterface {
|
|
public:
|
|
virtual ~TransformableAudioFrameInterface() = default;
|
|
|
|
// Exposes the frame header, enabling the interface clients to use the
|
|
// information in the header as needed, for example to compile the list of
|
|
// csrcs.
|
|
virtual const RTPHeader& GetHeader() const = 0;
|
|
};
|
|
|
|
// Objects implement this interface to be notified with the transformed frame.
|
|
class TransformedFrameCallback : public rtc::RefCountInterface {
|
|
public:
|
|
virtual void OnTransformedFrame(
|
|
std::unique_ptr<TransformableFrameInterface> frame) = 0;
|
|
|
|
protected:
|
|
~TransformedFrameCallback() override = default;
|
|
};
|
|
|
|
// Transforms encoded frames. The transformed frame is sent in a callback using
|
|
// the TransformedFrameCallback interface (see above).
|
|
class FrameTransformerInterface : public rtc::RefCountInterface {
|
|
public:
|
|
// Transforms `frame` using the implementing class' processing logic.
|
|
virtual void Transform(
|
|
std::unique_ptr<TransformableFrameInterface> transformable_frame) = 0;
|
|
|
|
virtual void RegisterTransformedFrameCallback(
|
|
rtc::scoped_refptr<TransformedFrameCallback>) {}
|
|
virtual void RegisterTransformedFrameSinkCallback(
|
|
rtc::scoped_refptr<TransformedFrameCallback>,
|
|
uint32_t ssrc) {}
|
|
virtual void UnregisterTransformedFrameCallback() {}
|
|
virtual void UnregisterTransformedFrameSinkCallback(uint32_t ssrc) {}
|
|
|
|
protected:
|
|
~FrameTransformerInterface() override = default;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_FRAME_TRANSFORMER_INTERFACE_H_
|