diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /api/rtp_receiver_interface.h | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
download | webrtc-emu-31-release.tar.gz |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'api/rtp_receiver_interface.h')
-rw-r--r-- | api/rtp_receiver_interface.h | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/api/rtp_receiver_interface.h b/api/rtp_receiver_interface.h index e0ace545af..327c9f2fee 100644 --- a/api/rtp_receiver_interface.h +++ b/api/rtp_receiver_interface.h @@ -22,7 +22,6 @@ #include "api/frame_transformer_interface.h" #include "api/media_stream_interface.h" #include "api/media_types.h" -#include "api/proxy.h" #include "api/rtp_parameters.h" #include "api/scoped_refptr.h" #include "api/transport/rtp/rtp_source.h" @@ -100,11 +99,13 @@ class RTC_EXPORT RtpReceiverInterface : public rtc::RefCountInterface { // before it is sent across the network. This will decrypt the entire frame // using the user provided decryption mechanism regardless of whether SRTP is // enabled or not. + // TODO(bugs.webrtc.org/12772): Remove. virtual void SetFrameDecryptor( rtc::scoped_refptr<FrameDecryptorInterface> frame_decryptor); // Returns a pointer to the frame decryptor set previously by the // user. This can be used to update the state of the object. + // TODO(bugs.webrtc.org/12772): Remove. virtual rtc::scoped_refptr<FrameDecryptorInterface> GetFrameDecryptor() const; // Sets a frame transformer between the depacketizer and the decoder to enable @@ -117,32 +118,6 @@ class RTC_EXPORT RtpReceiverInterface : public rtc::RefCountInterface { ~RtpReceiverInterface() override = default; }; -// Define proxy for RtpReceiverInterface. -// TODO(deadbeef): Move this to .cc file and out of api/. What threads methods -// are called on is an implementation detail. -BEGIN_PRIMARY_PROXY_MAP(RtpReceiver) -PROXY_PRIMARY_THREAD_DESTRUCTOR() -PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track) -PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtlsTransportInterface>, dtls_transport) -PROXY_CONSTMETHOD0(std::vector<std::string>, stream_ids) -PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<MediaStreamInterface>>, - streams) -BYPASS_PROXY_CONSTMETHOD0(cricket::MediaType, media_type) -BYPASS_PROXY_CONSTMETHOD0(std::string, id) -PROXY_CONSTMETHOD0(RtpParameters, GetParameters) -PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*) -PROXY_METHOD1(void, SetJitterBufferMinimumDelay, absl::optional<double>) -PROXY_CONSTMETHOD0(std::vector<RtpSource>, GetSources) -PROXY_METHOD1(void, - SetFrameDecryptor, - rtc::scoped_refptr<FrameDecryptorInterface>) -PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameDecryptorInterface>, - GetFrameDecryptor) -PROXY_METHOD1(void, - SetDepacketizerToDecoderFrameTransformer, - rtc::scoped_refptr<FrameTransformerInterface>) -END_PROXY_MAP() - } // namespace webrtc #endif // API_RTP_RECEIVER_INTERFACE_H_ |