Reason for revert: Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test. Original issue's description: > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ ) > > Reason for revert: > This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780 > > Original issue's description: > > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ ) > > > > Reason for revert: > > Found issue with test case, will add fix to reland cl. > > > > Original issue's description: > > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ ) > > > > > > 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} > > > Committed:8b45b11144> > > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:4172 > > > > Review-Url: https://codereview.webrtc.org/2781433002 > > Cr-Commit-Position: refs/heads/master@{#17474} > > Committed:3ea3c77e93> > TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@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/2783183003 > Cr-Commit-Position: refs/heads/master@{#17477} > Committed:f9ed235c9bR=ilnik@webrtc.org,stefan@webrtc.org BUG=webrtc:4172 Review-Url: https://codereview.webrtc.org/2789823002 Cr-Commit-Position: refs/heads/master@{#17498}
115 lines
3.1 KiB
C++
115 lines
3.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/vcm_capturer.h"
|
|
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/modules/video_capture/video_capture_factory.h"
|
|
#include "webrtc/video_send_stream.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
VcmCapturer::VcmCapturer() : started_(false), sink_(nullptr), vcm_(nullptr) {}
|
|
|
|
bool VcmCapturer::Init(size_t width, size_t height, size_t target_fps) {
|
|
std::unique_ptr<VideoCaptureModule::DeviceInfo> device_info(
|
|
VideoCaptureFactory::CreateDeviceInfo());
|
|
|
|
char device_name[256];
|
|
char unique_name[256];
|
|
if (device_info->GetDeviceName(0, device_name, sizeof(device_name),
|
|
unique_name, sizeof(unique_name)) !=
|
|
0) {
|
|
Destroy();
|
|
return false;
|
|
}
|
|
|
|
vcm_ = webrtc::VideoCaptureFactory::Create(unique_name);
|
|
vcm_->RegisterCaptureDataCallback(this);
|
|
|
|
device_info->GetCapability(vcm_->CurrentDeviceName(), 0, capability_);
|
|
|
|
capability_.width = static_cast<int32_t>(width);
|
|
capability_.height = static_cast<int32_t>(height);
|
|
capability_.maxFPS = static_cast<int32_t>(target_fps);
|
|
capability_.rawType = kVideoI420;
|
|
|
|
if (vcm_->StartCapture(capability_) != 0) {
|
|
Destroy();
|
|
return false;
|
|
}
|
|
|
|
RTC_CHECK(vcm_->CaptureStarted());
|
|
|
|
return true;
|
|
}
|
|
|
|
VcmCapturer* VcmCapturer::Create(size_t width,
|
|
size_t height,
|
|
size_t target_fps) {
|
|
std::unique_ptr<VcmCapturer> vcm_capturer(new VcmCapturer());
|
|
if (!vcm_capturer->Init(width, height, target_fps)) {
|
|
LOG(LS_WARNING) << "Failed to create VcmCapturer(w = " << width
|
|
<< ", h = " << height << ", fps = " << target_fps << ")";
|
|
return nullptr;
|
|
}
|
|
return vcm_capturer.release();
|
|
}
|
|
|
|
|
|
void VcmCapturer::Start() {
|
|
rtc::CritScope lock(&crit_);
|
|
started_ = true;
|
|
}
|
|
|
|
void VcmCapturer::Stop() {
|
|
rtc::CritScope lock(&crit_);
|
|
started_ = false;
|
|
}
|
|
|
|
void VcmCapturer::AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) {
|
|
rtc::CritScope lock(&crit_);
|
|
RTC_CHECK(!sink_ || sink_ == sink);
|
|
sink_ = sink;
|
|
VideoCapturer::AddOrUpdateSink(sink, wants);
|
|
}
|
|
|
|
void VcmCapturer::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
|
|
rtc::CritScope lock(&crit_);
|
|
RTC_CHECK(sink_ == sink);
|
|
sink_ = nullptr;
|
|
}
|
|
|
|
void VcmCapturer::Destroy() {
|
|
if (!vcm_)
|
|
return;
|
|
|
|
vcm_->StopCapture();
|
|
vcm_->DeRegisterCaptureDataCallback();
|
|
// Release reference to VCM.
|
|
vcm_ = nullptr;
|
|
}
|
|
|
|
VcmCapturer::~VcmCapturer() { Destroy(); }
|
|
|
|
void VcmCapturer::OnFrame(const VideoFrame& frame) {
|
|
rtc::CritScope lock(&crit_);
|
|
if (started_ && sink_) {
|
|
rtc::Optional<VideoFrame> out_frame = AdaptFrame(frame);
|
|
if (out_frame)
|
|
sink_->OnFrame(*out_frame);
|
|
}
|
|
}
|
|
|
|
} // test
|
|
} // webrtc
|