Reason for revert:
Breaks perf tests:
https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679
https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325
Original issue's description:
> Add framerate to VideoSinkWants and ability to signal on overuse
>
> In ViEEncoder, try to reduce framerate instead of resolution if the
> current degradation preference is maintain-resolution rather than
> balanced.
>
> BUG=webrtc:4172
>
> Review-Url: https://codereview.webrtc.org/2716643002
> Cr-Commit-Position: refs/heads/master@{#17327}
> Committed: 72acf25261
TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2764133002
Cr-Commit-Position: refs/heads/master@{#17331}
206 lines
6.1 KiB
C++
206 lines
6.1 KiB
C++
/*
|
|
* Copyright (c) 2013 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 "webrtc/test/frame_generator_capturer.h"
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/base/platform_thread.h"
|
|
#include "webrtc/base/task_queue.h"
|
|
#include "webrtc/system_wrappers/include/clock.h"
|
|
#include "webrtc/system_wrappers/include/sleep.h"
|
|
#include "webrtc/test/frame_generator.h"
|
|
#include "webrtc/video_send_stream.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class FrameGeneratorCapturer::InsertFrameTask : public rtc::QueuedTask {
|
|
public:
|
|
// Repeats in |repeat_interval_ms|. One-time if |repeat_interval_ms| == 0.
|
|
InsertFrameTask(
|
|
webrtc::test::FrameGeneratorCapturer* frame_generator_capturer,
|
|
uint32_t repeat_interval_ms)
|
|
: frame_generator_capturer_(frame_generator_capturer),
|
|
repeat_interval_ms_(repeat_interval_ms),
|
|
intended_run_time_ms_(-1) {}
|
|
|
|
private:
|
|
bool Run() override {
|
|
if (repeat_interval_ms_ > 0) {
|
|
int64_t delay_ms;
|
|
int64_t time_now_ms = rtc::TimeMillis();
|
|
if (intended_run_time_ms_ > 0) {
|
|
delay_ms = time_now_ms - intended_run_time_ms_;
|
|
} else {
|
|
delay_ms = 0;
|
|
intended_run_time_ms_ = time_now_ms;
|
|
}
|
|
intended_run_time_ms_ += repeat_interval_ms_;
|
|
if (delay_ms < repeat_interval_ms_) {
|
|
rtc::TaskQueue::Current()->PostDelayedTask(
|
|
std::unique_ptr<rtc::QueuedTask>(this),
|
|
repeat_interval_ms_ - delay_ms);
|
|
} else {
|
|
rtc::TaskQueue::Current()->PostDelayedTask(
|
|
std::unique_ptr<rtc::QueuedTask>(this), 0);
|
|
LOG(LS_ERROR)
|
|
<< "Frame Generator Capturer can't keep up with requested fps";
|
|
}
|
|
}
|
|
frame_generator_capturer_->InsertFrame();
|
|
// Task should be deleted only if it's not repeating.
|
|
return repeat_interval_ms_ == 0;
|
|
}
|
|
|
|
webrtc::test::FrameGeneratorCapturer* const frame_generator_capturer_;
|
|
const uint32_t repeat_interval_ms_;
|
|
int64_t intended_run_time_ms_;
|
|
};
|
|
|
|
FrameGeneratorCapturer* FrameGeneratorCapturer::Create(int width,
|
|
int height,
|
|
int target_fps,
|
|
Clock* clock) {
|
|
FrameGeneratorCapturer* capturer = new FrameGeneratorCapturer(
|
|
clock, FrameGenerator::CreateSquareGenerator(width, height), target_fps);
|
|
if (!capturer->Init()) {
|
|
delete capturer;
|
|
return NULL;
|
|
}
|
|
|
|
return capturer;
|
|
}
|
|
|
|
FrameGeneratorCapturer* FrameGeneratorCapturer::CreateFromYuvFile(
|
|
const std::string& file_name,
|
|
size_t width,
|
|
size_t height,
|
|
int target_fps,
|
|
Clock* clock) {
|
|
FrameGeneratorCapturer* capturer = new FrameGeneratorCapturer(
|
|
clock, FrameGenerator::CreateFromYuvFile(
|
|
std::vector<std::string>(1, file_name), width, height, 1),
|
|
target_fps);
|
|
if (!capturer->Init()) {
|
|
delete capturer;
|
|
return NULL;
|
|
}
|
|
|
|
return capturer;
|
|
}
|
|
|
|
FrameGeneratorCapturer::FrameGeneratorCapturer(
|
|
Clock* clock,
|
|
std::unique_ptr<FrameGenerator> frame_generator,
|
|
int target_fps)
|
|
: clock_(clock),
|
|
sending_(false),
|
|
sink_(nullptr),
|
|
sink_wants_observer_(nullptr),
|
|
frame_generator_(std::move(frame_generator)),
|
|
target_fps_(target_fps),
|
|
first_frame_capture_time_(-1),
|
|
task_queue_("FrameGenCapQ",
|
|
rtc::TaskQueue::Priority::HIGH) {
|
|
RTC_DCHECK(frame_generator_);
|
|
RTC_DCHECK_GT(target_fps, 0);
|
|
}
|
|
|
|
FrameGeneratorCapturer::~FrameGeneratorCapturer() {
|
|
Stop();
|
|
}
|
|
|
|
void FrameGeneratorCapturer::SetFakeRotation(VideoRotation rotation) {
|
|
rtc::CritScope cs(&lock_);
|
|
fake_rotation_ = rotation;
|
|
}
|
|
|
|
bool FrameGeneratorCapturer::Init() {
|
|
// This check is added because frame_generator_ might be file based and should
|
|
// not crash because a file moved.
|
|
if (frame_generator_.get() == NULL)
|
|
return false;
|
|
|
|
task_queue_.PostDelayedTask(
|
|
std::unique_ptr<rtc::QueuedTask>(
|
|
new InsertFrameTask(this, 1000 / target_fps_)),
|
|
1000 / target_fps_);
|
|
|
|
return true;
|
|
}
|
|
|
|
void FrameGeneratorCapturer::InsertFrame() {
|
|
{
|
|
rtc::CritScope cs(&lock_);
|
|
if (sending_) {
|
|
VideoFrame* frame = frame_generator_->NextFrame();
|
|
frame->set_ntp_time_ms(clock_->CurrentNtpInMilliseconds());
|
|
frame->set_rotation(fake_rotation_);
|
|
if (first_frame_capture_time_ == -1) {
|
|
first_frame_capture_time_ = frame->ntp_time_ms();
|
|
}
|
|
if (sink_)
|
|
sink_->OnFrame(*frame);
|
|
}
|
|
}
|
|
}
|
|
|
|
void FrameGeneratorCapturer::Start() {
|
|
rtc::CritScope cs(&lock_);
|
|
sending_ = true;
|
|
}
|
|
|
|
void FrameGeneratorCapturer::Stop() {
|
|
rtc::CritScope cs(&lock_);
|
|
sending_ = false;
|
|
}
|
|
|
|
void FrameGeneratorCapturer::ChangeResolution(size_t width, size_t height) {
|
|
rtc::CritScope cs(&lock_);
|
|
frame_generator_->ChangeResolution(width, height);
|
|
}
|
|
|
|
void FrameGeneratorCapturer::SetSinkWantsObserver(SinkWantsObserver* observer) {
|
|
rtc::CritScope cs(&lock_);
|
|
RTC_DCHECK(!sink_wants_observer_);
|
|
sink_wants_observer_ = observer;
|
|
}
|
|
|
|
void FrameGeneratorCapturer::AddOrUpdateSink(
|
|
rtc::VideoSinkInterface<VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) {
|
|
rtc::CritScope cs(&lock_);
|
|
RTC_CHECK(!sink_ || sink_ == sink);
|
|
sink_ = sink;
|
|
if (sink_wants_observer_)
|
|
sink_wants_observer_->OnSinkWantsChanged(sink, wants);
|
|
}
|
|
|
|
void FrameGeneratorCapturer::RemoveSink(
|
|
rtc::VideoSinkInterface<VideoFrame>* sink) {
|
|
rtc::CritScope cs(&lock_);
|
|
RTC_CHECK(sink_ == sink);
|
|
sink_ = nullptr;
|
|
}
|
|
|
|
void FrameGeneratorCapturer::ForceFrame() {
|
|
// One-time non-repeating task,
|
|
// therefore repeat_interval_ms is 0 in InsertFrameTask()
|
|
task_queue_.PostTask(
|
|
std::unique_ptr<rtc::QueuedTask>(new InsertFrameTask(this, 0)));
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|