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}
141 lines
4.3 KiB
C++
141 lines
4.3 KiB
C++
/*
|
|
* Copyright (c) 2011 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_MEDIA_BASE_FAKEVIDEORENDERER_H_
|
|
#define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
|
|
|
|
#include "webrtc/api/video/video_frame.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/media/base/videosinkinterface.h"
|
|
|
|
namespace cricket {
|
|
|
|
// Faked video renderer that has a callback for actions on rendering.
|
|
class FakeVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
|
|
public:
|
|
FakeVideoRenderer()
|
|
: errors_(0),
|
|
width_(0),
|
|
height_(0),
|
|
rotation_(webrtc::kVideoRotation_0),
|
|
timestamp_us_(0),
|
|
num_rendered_frames_(0),
|
|
black_frame_(false) {}
|
|
|
|
virtual void OnFrame(const webrtc::VideoFrame& frame) {
|
|
rtc::CritScope cs(&crit_);
|
|
// TODO(zhurunz) Check with VP8 team to see if we can remove this
|
|
// tolerance on Y values. Some unit tests produce Y values close
|
|
// to 16 rather than close to zero, for supposedly black frames.
|
|
// Largest value observed is 34, e.g., running
|
|
// PeerConnectionIntegrationTest.SendAndReceive16To9AspectRatio.
|
|
black_frame_ = CheckFrameColorYuv(0, 48, 128, 128, 128, 128, &frame);
|
|
// Treat unexpected frame size as error.
|
|
++num_rendered_frames_;
|
|
width_ = frame.width();
|
|
height_ = frame.height();
|
|
rotation_ = frame.rotation();
|
|
timestamp_us_ = frame.timestamp_us();
|
|
}
|
|
|
|
int errors() const { return errors_; }
|
|
int width() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return width_;
|
|
}
|
|
int height() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return height_;
|
|
}
|
|
webrtc::VideoRotation rotation() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return rotation_;
|
|
}
|
|
|
|
int64_t timestamp_us() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return timestamp_us_;
|
|
}
|
|
int num_rendered_frames() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return num_rendered_frames_;
|
|
}
|
|
bool black_frame() const {
|
|
rtc::CritScope cs(&crit_);
|
|
return black_frame_;
|
|
}
|
|
|
|
private:
|
|
static bool CheckFrameColorYuv(uint8_t y_min,
|
|
uint8_t y_max,
|
|
uint8_t u_min,
|
|
uint8_t u_max,
|
|
uint8_t v_min,
|
|
uint8_t v_max,
|
|
const webrtc::VideoFrame* frame) {
|
|
if (!frame || !frame->video_frame_buffer()) {
|
|
return false;
|
|
}
|
|
// Y
|
|
int y_width = frame->width();
|
|
int y_height = frame->height();
|
|
const uint8_t* y_plane = frame->video_frame_buffer()->DataY();
|
|
const uint8_t* y_pos = y_plane;
|
|
int32_t y_pitch = frame->video_frame_buffer()->StrideY();
|
|
for (int i = 0; i < y_height; ++i) {
|
|
for (int j = 0; j < y_width; ++j) {
|
|
uint8_t y_value = *(y_pos + j);
|
|
if (y_value < y_min || y_value > y_max) {
|
|
return false;
|
|
}
|
|
}
|
|
y_pos += y_pitch;
|
|
}
|
|
// U and V
|
|
int chroma_width = (frame->width() + 1)/2;
|
|
int chroma_height = (frame->height() + 1)/2;
|
|
const uint8_t* u_plane = frame->video_frame_buffer()->DataU();
|
|
const uint8_t* v_plane = frame->video_frame_buffer()->DataV();
|
|
const uint8_t* u_pos = u_plane;
|
|
const uint8_t* v_pos = v_plane;
|
|
int32_t u_pitch = frame->video_frame_buffer()->StrideU();
|
|
int32_t v_pitch = frame->video_frame_buffer()->StrideV();
|
|
for (int i = 0; i < chroma_height; ++i) {
|
|
for (int j = 0; j < chroma_width; ++j) {
|
|
uint8_t u_value = *(u_pos + j);
|
|
if (u_value < u_min || u_value > u_max) {
|
|
return false;
|
|
}
|
|
uint8_t v_value = *(v_pos + j);
|
|
if (v_value < v_min || v_value > v_max) {
|
|
return false;
|
|
}
|
|
}
|
|
u_pos += u_pitch;
|
|
v_pos += v_pitch;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
int errors_;
|
|
int width_;
|
|
int height_;
|
|
webrtc::VideoRotation rotation_;
|
|
int64_t timestamp_us_;
|
|
int num_rendered_frames_;
|
|
bool black_frame_;
|
|
rtc::CriticalSection crit_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
|