admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated deregistration functions in RtcpTransceiver

Browse Source 
These functions were deprecated in
https://webrtc-review.googlesource.com/c/src/+/107305

Bug: None
Change-Id: I3246f1e2f16be7591daec520e90c6b75071eb92d
Reviewed-on: https://webrtc-review.googlesource.com/c/107730
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25388}
This commit is contained in:
Danil Chapovalov 2018-10-24 18:55:01 +02:00 committed by Commit Bot
parent 06aa209645
commit 6dd7f9120e
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/rtp_rtcp/BUILD.gn
View File

@ -251,7 +251,6 @@ rtc_source_set("rtcp_transceiver") {
"../../api:transport_api",
"../../api/video:video_bitrate_allocation",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_cancelable_task",
"../../rtc_base:rtc_task_queue",

19
modules/rtp_rtcp/source/rtcp_transceiver.cc
View File

@ -39,13 +39,6 @@ RtcpTransceiver::~RtcpTransceiver() {
RTC_DCHECK(!rtcp_transceiver_);
}
void RtcpTransceiver::Stop(std::unique_ptr<rtc::QueuedTask> on_destroyed) {
RTC_DCHECK(rtcp_transceiver_);
task_queue_->PostTaskAndReply(Destructor{std::move(rtcp_transceiver_)},
std::move(on_destroyed));
RTC_DCHECK(!rtcp_transceiver_);
}
void RtcpTransceiver::Stop(std::function<void()> on_destroyed) {
RTC_DCHECK(rtcp_transceiver_);
task_queue_->PostTask(rtc::NewClosure(
@ -63,18 +56,6 @@ void RtcpTransceiver::AddMediaReceiverRtcpObserver(
});
}
void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
uint32_t remote_ssrc,
MediaReceiverRtcpObserver* observer,
std::unique_ptr<rtc::QueuedTask> on_removed) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
auto remove = [ptr, remote_ssrc, observer] {
ptr->RemoveMediaReceiverRtcpObserver(remote_ssrc, observer);
};
task_queue_->PostTaskAndReply(std::move(remove), std::move(on_removed));
}
void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
uint32_t remote_ssrc,
MediaReceiverRtcpObserver* observer,

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

@ -19,7 +19,6 @@
#include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
#include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
#include "rtc_base/copyonwritebuffer.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/task_queue.h"
namespace webrtc {
@ -44,8 +43,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
// Note that interfaces provided in constructor or registered with AddObserver
// still might be used by the transceiver on the task queue
// until |on_destroyed| runs.
RTC_DEPRECATED
void Stop(std::unique_ptr<rtc::QueuedTask> on_destroyed);
void Stop(std::function<void()> on_destroyed);
// Registers observer to be notified about incoming rtcp packets.
@ -54,11 +51,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
MediaReceiverRtcpObserver* observer);
// Deregisters the observer. Might return before observer is deregistered.
// Runs |on_removed| when observer is deregistered.
RTC_DEPRECATED
void RemoveMediaReceiverRtcpObserver(
uint32_t remote_ssrc,
MediaReceiverRtcpObserver* observer,
std::unique_ptr<rtc::QueuedTask> on_removed);
void RemoveMediaReceiverRtcpObserver(uint32_t remote_ssrc,
MediaReceiverRtcpObserver* observer,
std::function<void()> on_removed);