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}
119 lines
3.8 KiB
C++
119 lines
3.8 KiB
C++
/*
|
|
* Copyright (c) 2016 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/media/base/adaptedvideotracksource.h"
|
|
|
|
#include "webrtc/api/video/i420_buffer.h"
|
|
|
|
namespace rtc {
|
|
|
|
AdaptedVideoTrackSource::AdaptedVideoTrackSource() {
|
|
thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
AdaptedVideoTrackSource::AdaptedVideoTrackSource(int required_alignment)
|
|
: video_adapter_(required_alignment) {
|
|
thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
bool AdaptedVideoTrackSource::GetStats(Stats* stats) {
|
|
rtc::CritScope lock(&stats_crit_);
|
|
|
|
if (!stats_) {
|
|
return false;
|
|
}
|
|
|
|
*stats = *stats_;
|
|
return true;
|
|
}
|
|
|
|
void AdaptedVideoTrackSource::OnFrame(const webrtc::VideoFrame& frame) {
|
|
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
|
|
frame.video_frame_buffer());
|
|
/* Note that this is a "best effort" approach to
|
|
wants.rotation_applied; apply_rotation_ can change from false to
|
|
true between the check of apply_rotation() and the call to
|
|
broadcaster_.OnFrame(), in which case we generate a frame with
|
|
pending rotation despite some sink with wants.rotation_applied ==
|
|
true was just added. The VideoBroadcaster enforces
|
|
synchronization for us in this case, by not passing the frame on
|
|
to sinks which don't want it. */
|
|
if (apply_rotation() &&
|
|
frame.rotation() != webrtc::kVideoRotation_0 &&
|
|
!buffer->native_handle()) {
|
|
/* Apply pending rotation. */
|
|
broadcaster_.OnFrame(webrtc::VideoFrame(
|
|
webrtc::I420Buffer::Rotate(*buffer, frame.rotation()),
|
|
webrtc::kVideoRotation_0, frame.timestamp_us()));
|
|
} else {
|
|
broadcaster_.OnFrame(frame);
|
|
}
|
|
}
|
|
|
|
void AdaptedVideoTrackSource::AddOrUpdateSink(
|
|
rtc::VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
broadcaster_.AddOrUpdateSink(sink, wants);
|
|
OnSinkWantsChanged(broadcaster_.wants());
|
|
}
|
|
|
|
void AdaptedVideoTrackSource::RemoveSink(
|
|
rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
broadcaster_.RemoveSink(sink);
|
|
OnSinkWantsChanged(broadcaster_.wants());
|
|
}
|
|
|
|
bool AdaptedVideoTrackSource::apply_rotation() {
|
|
return broadcaster_.wants().rotation_applied;
|
|
}
|
|
|
|
void AdaptedVideoTrackSource::OnSinkWantsChanged(
|
|
const rtc::VideoSinkWants& wants) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
video_adapter_.OnResolutionFramerateRequest(
|
|
wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);
|
|
}
|
|
|
|
bool AdaptedVideoTrackSource::AdaptFrame(int width,
|
|
int height,
|
|
int64_t time_us,
|
|
int* out_width,
|
|
int* out_height,
|
|
int* crop_width,
|
|
int* crop_height,
|
|
int* crop_x,
|
|
int* crop_y) {
|
|
{
|
|
rtc::CritScope lock(&stats_crit_);
|
|
stats_ = rtc::Optional<Stats>({width, height});
|
|
}
|
|
|
|
if (!broadcaster_.frame_wanted()) {
|
|
return false;
|
|
}
|
|
|
|
if (!video_adapter_.AdaptFrameResolution(
|
|
width, height, time_us * rtc::kNumNanosecsPerMicrosec,
|
|
crop_width, crop_height, out_width, out_height)) {
|
|
// VideoAdapter dropped the frame.
|
|
return false;
|
|
}
|
|
|
|
*crop_x = (width - *crop_width) / 2;
|
|
*crop_y = (height - *crop_height) / 2;
|
|
return true;
|
|
}
|
|
|
|
} // namespace rtc
|