8b45b11144
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}
54 lines
1.7 KiB
C++
54 lines
1.7 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.
|
|
*/
|
|
#ifndef WEBRTC_TEST_VCM_CAPTURER_H_
|
|
#define WEBRTC_TEST_VCM_CAPTURER_H_
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "webrtc/modules/video_capture/video_capture.h"
|
|
#include "webrtc/test/video_capturer.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class VcmCapturer
|
|
: public VideoCapturer,
|
|
public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
static VcmCapturer* Create(size_t width, size_t height, size_t target_fps);
|
|
virtual ~VcmCapturer();
|
|
|
|
void Start() override;
|
|
void Stop() override;
|
|
void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) override;
|
|
void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
|
|
|
|
void OnFrame(const VideoFrame& frame) override;
|
|
|
|
private:
|
|
VcmCapturer();
|
|
bool Init(size_t width, size_t height, size_t target_fps);
|
|
void Destroy();
|
|
|
|
rtc::CriticalSection crit_;
|
|
bool started_ GUARDED_BY(crit_);
|
|
rtc::VideoSinkInterface<VideoFrame>* sink_ GUARDED_BY(crit_);
|
|
rtc::scoped_refptr<VideoCaptureModule> vcm_;
|
|
VideoCaptureCapability capability_;
|
|
};
|
|
|
|
} // test
|
|
} // webrtc
|
|
|
|
#endif // WEBRTC_TEST_VCM_CAPTURER_H_
|