Update tests to call VideoReceiveStream::GetStats() in the same or at least similar way it gets called in production (construction thread, same TQ/thread). Mapped out threads and context for ReceiveStatisticsProxy, VideoQualityObserver and VideoReceiveStream. Added follow-up TODOs for webrtc:11489. One functional change in ReceiveStatisticsProxy is that when sender side RtcpPacketTypesCounterUpdated calls are made, the counter is updated asynchronously since the sender calls the method on a different thread than the receiver. Make CallClient::SendTask public to allow tests to run tasks in the right context. CallClient already does this internally for GetStats. Remove 10 sec sleep in StopSendingKeyframeRequestsForInactiveStream. Bug: webrtc:11489 Change-Id: Ib45bfc59d8472e9c5ea556e6ecf38298b8f14921 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172847 Commit-Queue: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Magnus Flodman <mflodman@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31008}
62 lines
1.9 KiB
C++
62 lines
1.9 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 RTC_BASE_TASK_UTILS_PENDING_TASK_SAFETY_FLAG_H_
|
|
#define RTC_BASE_TASK_UTILS_PENDING_TASK_SAFETY_FLAG_H_
|
|
|
|
#include "api/scoped_refptr.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/ref_count.h"
|
|
#include "rtc_base/synchronization/sequence_checker.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Use this flag to drop pending tasks that have been posted to the "main"
|
|
// thread/TQ and end up running after the owning instance has been
|
|
// deleted. The owning instance signals deletion by calling SetNotAlive() from
|
|
// its destructor.
|
|
//
|
|
// When posting a task, post a copy (capture by-value in a lambda) of the flag
|
|
// instance and before performing the work, check the |alive()| state. Abort if
|
|
// alive() returns |false|:
|
|
//
|
|
// // Running outside of the main thread.
|
|
// my_task_queue_->PostTask(ToQueuedTask(
|
|
// [safety = pending_task_safety_flag_, this]() {
|
|
// // Now running on the main thread.
|
|
// if (!safety->alive())
|
|
// return;
|
|
// MyMethod();
|
|
// }));
|
|
//
|
|
// Note that checking the state only works on the construction/destruction
|
|
// thread of the ReceiveStatisticsProxy instance.
|
|
class PendingTaskSafetyFlag : public rtc::RefCountInterface {
|
|
public:
|
|
using Pointer = rtc::scoped_refptr<PendingTaskSafetyFlag>;
|
|
static Pointer Create();
|
|
|
|
~PendingTaskSafetyFlag() = default;
|
|
|
|
void SetNotAlive();
|
|
bool alive() const;
|
|
|
|
protected:
|
|
PendingTaskSafetyFlag() = default;
|
|
|
|
private:
|
|
bool alive_ = true;
|
|
SequenceChecker main_sequence_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // RTC_BASE_TASK_UTILS_PENDING_TASK_SAFETY_FLAG_H_
|