webrtc_m130/webrtc/test/frame_generator_capturer.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

162 lines
4.5 KiB
C++
Raw Normal View History

/*
* 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 "webrtc/base/criticalsection.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/system_wrappers/include/clock.h"
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/video_send_stream.h"
namespace webrtc {
namespace test {
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),
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
tick_(EventTimerWrapper::Create()),
thread_(FrameGeneratorCapturer::Run, this, "FrameGeneratorCapturer"),
frame_generator_(std::move(frame_generator)),
target_fps_(target_fps),
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
first_frame_capture_time_(-1) {
RTC_DCHECK(frame_generator_);
RTC_DCHECK_GT(target_fps, 0);
}
FrameGeneratorCapturer::~FrameGeneratorCapturer() {
Stop();
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
thread_.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;
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
if (!tick_->StartTimer(true, 1000 / target_fps_))
return false;
thread_.Start();
thread_.SetPriority(rtc::kHighPriority);
return true;
}
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
bool FrameGeneratorCapturer::Run(void* obj) {
static_cast<FrameGeneratorCapturer*>(obj)->InsertFrame();
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);
}
}
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
tick_->Wait(WEBRTC_EVENT_INFINITE);
}
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() {
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
tick_->Set();
}
Revert of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #11 id:300001 of https://codereview.webrtc.org/2750473002/ ) Reason for revert: Changes to frame-generator resulted in reduced fps on android and Mac on all tests. Original issue's description: > Reland of write frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2748643002/ ) > > Reason for revert: > Reland with fixes to the failing perf tests. > > Original issue's description: > > Revert of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #2 id:90001 of https://codereview.webrtc.org/2744003002/ ) > > > > Reason for revert: > > CallPerfTest.ReceivesCpuOveruseAndUnderuse perf test fails due to this CL. It requires very accurate frame rate, which may not be so accurate now. > > > > Original issue's description: > > > Reland of rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper (patchset #1 id:1 of https://codereview.webrtc.org/2743993002/ ) > > > > > > And enable large full-stack test depending on that change (Reland of https://codereview.webrtc.org/2741823003/) > > > TBR=stefan@webrtc.org,tommi@webrtc.org > > > BUG=webrtc:7301,webrtc:7325 > > > > > > Review-Url: https://codereview.webrtc.org/2744003002 > > > Cr-Commit-Position: refs/heads/master@{#17196} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/8c0a5896d1cdc7bb81307c33fa4b3538d8160a0f > > > > TBR=stefan@webrtc.org,tommi@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:7301,webrtc:7325 > > > > Review-Url: https://codereview.webrtc.org/2748643002 > > Cr-Commit-Position: refs/heads/master@{#17198} > > Committed: https://chromium.googlesource.com/external/webrtc/+/382a72a0d321f19ac9cdc9bb30712cefe2639f88 > > BUG=webrtc:7301,webrtc:7325 > > Review-Url: https://codereview.webrtc.org/2750473002 > Cr-Commit-Position: refs/heads/master@{#17253} > Committed: https://chromium.googlesource.com/external/webrtc/+/2549ad4fef419a055671c5be39fcfa27ba573c3b TBR=sprang@webrtc.org,tommi@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7301,webrtc:7325 Review-Url: https://codereview.webrtc.org/2751063005 Cr-Commit-Position: refs/heads/master@{#17276}
2017-03-16 09:43:44 -07:00
} // test
} // webrtc