This reverts commit efa72a1312e9871c9b33b7a1fec208b379608898. Reason for revert: It seems to break come chromium.webrtc.fyi bots: They are all release. https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Linux%20Tester/2167 https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Mac%20Tester/1833 https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Win10%20Tester/1835 Original change's description: > Propagate VideoFrame::UpdateRect to encoder > > Accumulate it in all places where frames can be dropped before they reach > the encoder. > > Reset UpdateRect in VideoBroadcaster if frame the previous frame is dropped. > No accumulation is done here since it's supposed to be a brief occusion then > configuration have changed. > > Bug: webrtc:10310 > Change-Id: I2813ecd009eb730bd99ffa0a02f979091b56bf80 > Reviewed-on: https://webrtc-review.googlesource.com/c/123102 > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26711} TBR=ilnik@webrtc.org,nisse@webrtc.org,sprang@webrtc.org Change-Id: If34b5440393fffba6c37cd80c02e2b419b7ec601 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10310 Reviewed-on: https://webrtc-review.googlesource.com/c/123224 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26719}
160 lines
4.9 KiB
C++
160 lines
4.9 KiB
C++
/*
|
|
* Copyright (c) 2012 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 "api/video/video_frame.h"
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/time_utils.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoFrame::Builder::Builder() = default;
|
|
|
|
VideoFrame::Builder::~Builder() = default;
|
|
|
|
VideoFrame VideoFrame::Builder::build() {
|
|
RTC_CHECK(video_frame_buffer_ != nullptr);
|
|
return VideoFrame(id_, video_frame_buffer_, timestamp_us_, timestamp_rtp_,
|
|
ntp_time_ms_, rotation_, color_space_, update_rect_);
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_video_frame_buffer(
|
|
const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
|
|
video_frame_buffer_ = buffer;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_timestamp_ms(
|
|
int64_t timestamp_ms) {
|
|
timestamp_us_ = timestamp_ms * rtc::kNumMicrosecsPerMillisec;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_timestamp_us(
|
|
int64_t timestamp_us) {
|
|
timestamp_us_ = timestamp_us;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_timestamp_rtp(
|
|
uint32_t timestamp_rtp) {
|
|
timestamp_rtp_ = timestamp_rtp;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_ntp_time_ms(int64_t ntp_time_ms) {
|
|
ntp_time_ms_ = ntp_time_ms;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_rotation(VideoRotation rotation) {
|
|
rotation_ = rotation;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_color_space(
|
|
const absl::optional<ColorSpace>& color_space) {
|
|
color_space_ = color_space;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_color_space(
|
|
const ColorSpace* color_space) {
|
|
color_space_ =
|
|
color_space ? absl::make_optional(*color_space) : absl::nullopt;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_id(uint16_t id) {
|
|
id_ = id;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::Builder& VideoFrame::Builder::set_update_rect(
|
|
const VideoFrame::UpdateRect& update_rect) {
|
|
update_rect_ = update_rect;
|
|
return *this;
|
|
}
|
|
|
|
VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
|
webrtc::VideoRotation rotation,
|
|
int64_t timestamp_us)
|
|
: video_frame_buffer_(buffer),
|
|
timestamp_rtp_(0),
|
|
ntp_time_ms_(0),
|
|
timestamp_us_(timestamp_us),
|
|
rotation_(rotation),
|
|
update_rect_{0, 0, buffer->width(), buffer->height()} {}
|
|
|
|
VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
|
uint32_t timestamp_rtp,
|
|
int64_t render_time_ms,
|
|
VideoRotation rotation)
|
|
: video_frame_buffer_(buffer),
|
|
timestamp_rtp_(timestamp_rtp),
|
|
ntp_time_ms_(0),
|
|
timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
|
|
rotation_(rotation),
|
|
update_rect_{0, 0, buffer->width(), buffer->height()} {
|
|
RTC_DCHECK(buffer);
|
|
}
|
|
|
|
VideoFrame::VideoFrame(uint16_t id,
|
|
const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
|
int64_t timestamp_us,
|
|
uint32_t timestamp_rtp,
|
|
int64_t ntp_time_ms,
|
|
VideoRotation rotation,
|
|
const absl::optional<ColorSpace>& color_space,
|
|
const absl::optional<UpdateRect>& update_rect)
|
|
: id_(id),
|
|
video_frame_buffer_(buffer),
|
|
timestamp_rtp_(timestamp_rtp),
|
|
ntp_time_ms_(ntp_time_ms),
|
|
timestamp_us_(timestamp_us),
|
|
rotation_(rotation),
|
|
color_space_(color_space),
|
|
update_rect_(update_rect.value_or(UpdateRect{
|
|
0, 0, video_frame_buffer_->width(), video_frame_buffer_->height()})) {
|
|
RTC_DCHECK_GE(update_rect_.offset_x, 0);
|
|
RTC_DCHECK_GE(update_rect_.offset_y, 0);
|
|
RTC_DCHECK_LE(update_rect_.offset_x + update_rect_.width, width());
|
|
RTC_DCHECK_LE(update_rect_.offset_y + update_rect_.height, height());
|
|
}
|
|
|
|
VideoFrame::~VideoFrame() = default;
|
|
|
|
VideoFrame::VideoFrame(const VideoFrame&) = default;
|
|
VideoFrame::VideoFrame(VideoFrame&&) = default;
|
|
VideoFrame& VideoFrame::operator=(const VideoFrame&) = default;
|
|
VideoFrame& VideoFrame::operator=(VideoFrame&&) = default;
|
|
|
|
int VideoFrame::width() const {
|
|
return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
|
|
}
|
|
|
|
int VideoFrame::height() const {
|
|
return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
|
|
}
|
|
|
|
uint32_t VideoFrame::size() const {
|
|
return width() * height();
|
|
}
|
|
|
|
rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
|
|
return video_frame_buffer_;
|
|
}
|
|
|
|
int64_t VideoFrame::render_time_ms() const {
|
|
return timestamp_us() / rtc::kNumMicrosecsPerMillisec;
|
|
}
|
|
|
|
} // namespace webrtc
|