zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move RtcpTransceiver deletion of copy and assign methods to public section

Browse Source 
Bug: chromium:881453
Change-Id: Iff5c522b983af018c1308649887a1121519c73ea
Reviewed-on: https://webrtc-review.googlesource.com/98981
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24652}
This commit is contained in:
Danil Chapovalov
2018-09-10 09:59:51 +02:00
committed by Commit Bot
parent 52b4961ae1
commit 067818fe85
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/rtp_rtcp/source/rtcp_transceiver.h
View File

@ -17,7 +17,6 @@
#include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
#include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/copyonwritebuffer.h" #include "rtc_base/copyonwritebuffer.h"
#include "rtc_base/task_queue.h" #include "rtc_base/task_queue.h"
@ -29,6 +28,8 @@ namespace webrtc {
class RtcpTransceiver : public RtcpFeedbackSenderInterface { class RtcpTransceiver : public RtcpFeedbackSenderInterface {
public: public:
explicit RtcpTransceiver(const RtcpTransceiverConfig& config); explicit RtcpTransceiver(const RtcpTransceiverConfig& config);
RtcpTransceiver(const RtcpTransceiver&) = delete;
RtcpTransceiver& operator=(const RtcpTransceiver&) = delete;
// Note that interfaces provided in constructor still might be used after the // Note that interfaces provided in constructor still might be used after the
// destructor. However they can only be used on the confic.task_queue. // destructor. However they can only be used on the confic.task_queue.
// Use Stop function to get notified when they are no longer used or // Use Stop function to get notified when they are no longer used or
@ -91,8 +92,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
private: private:
rtc::TaskQueue* const task_queue_; rtc::TaskQueue* const task_queue_;
std::unique_ptr<RtcpTransceiverImpl> rtcp_transceiver_; std::unique_ptr<RtcpTransceiverImpl> rtcp_transceiver_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiver);
}; };
} // namespace webrtc } // namespace webrtc

5
modules/rtp_rtcp/source/rtcp_transceiver_impl.h
View File

@ -25,7 +25,6 @@
#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h"
#include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
#include "rtc_base/cancelable_task_handle.h" #include "rtc_base/cancelable_task_handle.h"
#include "rtc_base/constructormagic.h"
#include "system_wrappers/include/ntp_time.h" #include "system_wrappers/include/ntp_time.h"
namespace webrtc { namespace webrtc {
@ -36,6 +35,8 @@ namespace webrtc {
class RtcpTransceiverImpl { class RtcpTransceiverImpl {
public: public:
explicit RtcpTransceiverImpl(const RtcpTransceiverConfig& config); explicit RtcpTransceiverImpl(const RtcpTransceiverConfig& config);
RtcpTransceiverImpl(const RtcpTransceiverImpl&) = delete;
RtcpTransceiverImpl& operator=(const RtcpTransceiverImpl&) = delete;
~RtcpTransceiverImpl(); ~RtcpTransceiverImpl();
void AddMediaReceiverRtcpObserver(uint32_t remote_ssrc, void AddMediaReceiverRtcpObserver(uint32_t remote_ssrc,
@ -96,8 +97,6 @@ class RtcpTransceiverImpl {
// needed. // needed.
std::map<uint32_t, RemoteSenderState> remote_senders_; std::map<uint32_t, RemoteSenderState> remote_senders_;
rtc::CancelableTaskHandle periodic_task_handle_; rtc::CancelableTaskHandle periodic_task_handle_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiverImpl);
}; };
} // namespace webrtc } // namespace webrtc