mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
9a99905301
This emulates behaviour from frame buffer 2, but does not handle stats. In contrast to frame buffer 2, all work happens on the same task queue. FrameBuffer3Proxy encapsulates FrameBuffer3 and scheduler behind a field trial WebRTC-FrameBuffer3. This separates frame scheduling behaviour into a few components, VideoReceiveStreamTimeoutTracker * Handles the stream timeouts. FrameDecodeScheduler * Manages the scheduling and cancelling of frames being sent to the decoder. FrameDecodeTiming * Handles the timing and ordering of frames to be decoded. Other changes * Adds CurrentSize() method to FrameBuffer3 * Move timing to a separate library * Does a thread check for Receive statistics as this is now on the worker thread. * Adds `FlushImmediate` method to RunLoop so that video_receive_stream2_unittest can pass when scheduling is happening on the worker thread. Change-Id: Ia8d2e5650d1708cdc1be3631a5214134583a0721 Bug: webrtc:13343 Tested: Ran webrtc_perf_tests, video_engine_tests, rtc_unittests forcing frame buffer3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/241603 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Markus Handell <handellm@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35847}
95 lines
3.1 KiB
C++
95 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2022 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.
|
|
*/
|
|
|
|
#include "video/video_receive_stream_timeout_tracker.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "api/task_queue/task_queue_base.h"
|
|
#include "rtc_base/task_queue.h"
|
|
#include "test/gmock.h"
|
|
#include "test/gtest.h"
|
|
#include "test/time_controller/simulated_time_controller.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
constexpr auto kMaxWaitForKeyframe = TimeDelta::Millis(500);
|
|
constexpr auto kMaxWaitForFrame = TimeDelta::Millis(1500);
|
|
constexpr VideoReceiveStreamTimeoutTracker::Timeouts config = {
|
|
kMaxWaitForKeyframe, kMaxWaitForFrame};
|
|
} // namespace
|
|
|
|
class VideoReceiveStreamTimeoutTrackerTest : public ::testing::Test {
|
|
public:
|
|
VideoReceiveStreamTimeoutTrackerTest()
|
|
: time_controller_(Timestamp::Millis(2000)),
|
|
task_queue_(time_controller_.GetTaskQueueFactory()->CreateTaskQueue(
|
|
"scheduler",
|
|
TaskQueueFactory::Priority::NORMAL)),
|
|
timeout_tracker_(time_controller_.GetClock(),
|
|
task_queue_.Get(),
|
|
config,
|
|
[this] { OnTimeout(); }) {}
|
|
|
|
protected:
|
|
template <class Task>
|
|
void OnQueue(Task&& t) {
|
|
task_queue_.PostTask(std::forward<Task>(t));
|
|
time_controller_.AdvanceTime(TimeDelta::Zero());
|
|
}
|
|
|
|
GlobalSimulatedTimeController time_controller_;
|
|
rtc::TaskQueue task_queue_;
|
|
VideoReceiveStreamTimeoutTracker timeout_tracker_;
|
|
int timeouts_ = 0;
|
|
|
|
private:
|
|
void OnTimeout() { ++timeouts_; }
|
|
};
|
|
|
|
TEST_F(VideoReceiveStreamTimeoutTrackerTest, TimeoutAfterInitialPeriod) {
|
|
OnQueue([&] { timeout_tracker_.Start(true); });
|
|
time_controller_.AdvanceTime(kMaxWaitForKeyframe);
|
|
EXPECT_EQ(1, timeouts_);
|
|
OnQueue([&] { timeout_tracker_.Stop(); });
|
|
}
|
|
|
|
TEST_F(VideoReceiveStreamTimeoutTrackerTest, NoTimeoutAfterStop) {
|
|
OnQueue([&] { timeout_tracker_.Start(true); });
|
|
time_controller_.AdvanceTime(kMaxWaitForKeyframe / 2);
|
|
OnQueue([&] { timeout_tracker_.Stop(); });
|
|
time_controller_.AdvanceTime(kMaxWaitForKeyframe);
|
|
EXPECT_EQ(0, timeouts_);
|
|
}
|
|
|
|
TEST_F(VideoReceiveStreamTimeoutTrackerTest, TimeoutForDeltaFrame) {
|
|
OnQueue([&] { timeout_tracker_.Start(true); });
|
|
time_controller_.AdvanceTime(TimeDelta::Millis(5));
|
|
OnQueue([&] { timeout_tracker_.OnEncodedFrameReleased(); });
|
|
time_controller_.AdvanceTime(kMaxWaitForFrame);
|
|
EXPECT_EQ(1, timeouts_);
|
|
|
|
OnQueue([&] { timeout_tracker_.Stop(); });
|
|
}
|
|
|
|
TEST_F(VideoReceiveStreamTimeoutTrackerTest, TimeoutForKeyframeWhenForced) {
|
|
OnQueue([&] { timeout_tracker_.Start(true); });
|
|
time_controller_.AdvanceTime(TimeDelta::Millis(5));
|
|
OnQueue([&] { timeout_tracker_.OnEncodedFrameReleased(); });
|
|
OnQueue([&] { timeout_tracker_.SetWaitingForKeyframe(); });
|
|
time_controller_.AdvanceTime(kMaxWaitForKeyframe);
|
|
EXPECT_EQ(1, timeouts_);
|
|
|
|
OnQueue([&] { timeout_tracker_.Stop(); });
|
|
}
|
|
|
|
} // namespace webrtc
|