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

Add RtcpTransceiver::Stop to allow non-blocking destruction

Browse Source 
As downside it disallows to destroy RtcpTransceiver on the TaskQueue
without prio call to the Stop function

BUG: webrtc:8239
Change-Id: I236b9aff7a0746044dd764c619174cc5ac03d27f
Reviewed-on: https://webrtc-review.googlesource.com/98120
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24587}
This commit is contained in:
Danil Chapovalov
2018-09-05 16:46:40 +02:00
committed by Commit Bot
parent 389d2261c3
commit f0076d31f8
4 changed files with 90 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
View File

@ -83,18 +83,39 @@ TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
WaitPostedTasks(&queue);
}
TEST(RtcpTransceiverTest, CanBeDestoryedOnTaskQueue) {
TEST(RtcpTransceiverTest, CanBeDestroyedOnTaskQueueAfterStop) {
rtc::TaskQueue queue("rtcp");
NiceMock<MockTransport> outgoing_transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtcp_transceiver->Stop(rtc::NewClosure([] {}));
queue.PostTask([&] { rtcp_transceiver.reset(); });
WaitPostedTasks(&queue);
}
TEST(RtcpTransceiverTest, CanBeDestroyedWithoutBlockingAfterStop) {
rtc::TaskQueue queue("rtcp");
NiceMock<MockTransport> outgoing_transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtcp_transceiver->SendCompoundPacket();
rtc::Event heavy_task(false, false);
queue.PostTask(
rtc::NewClosure([&] { EXPECT_TRUE(heavy_task.Wait(kTimeoutMs)); }));
rtc::Event done(false, false);
rtcp_transceiver->Stop(rtc::NewClosure([&done] { done.Set(); }));
rtcp_transceiver = nullptr;
heavy_task.Set();
EXPECT_TRUE(done.Wait(kTimeoutMs));
}
// Use rtp timestamp to distinguish different incoming sender reports.
rtc::CopyOnWriteBuffer CreateSenderReport(uint32_t ssrc, uint32_t rtp_time) {
webrtc::rtcp::SenderReport sr;
@ -189,26 +210,23 @@ TEST(RtcpTransceiverTest, CanCallSendCompoundPacketFromAnyThread) {
WaitPostedTasks(&queue);
}
TEST(RtcpTransceiverTest, DoesntSendPacketsAfterDestruction) {
MockTransport outgoing_transport;
TEST(RtcpTransceiverTest, DoesntSendPacketsAfterStopCallback) {
NiceMock<MockTransport> outgoing_transport;
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
config.schedule_periodic_compound_packets = false;
EXPECT_CALL(outgoing_transport, SendRtcp(_, _)).Times(0);
config.schedule_periodic_compound_packets = true;
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtc::Event pause(false, false);
queue.PostTask([&] {
pause.Wait(rtc::Event::kForever);
rtcp_transceiver.reset();
});
rtc::Event done(false, false);
rtcp_transceiver->SendCompoundPacket();
pause.Set();
WaitPostedTasks(&queue);
EXPECT_FALSE(rtcp_transceiver);
rtcp_transceiver->Stop(rtc::NewClosure([&] {
EXPECT_CALL(outgoing_transport, SendRtcp).Times(0);
done.Set();
}));
rtcp_transceiver = nullptr;
EXPECT_TRUE(done.Wait(kTimeoutMs));
}
TEST(RtcpTransceiverTest, SendsTransportFeedbackOnTaskQueue) {