Reason for revert: Should work after cl https://codereview.webrtc.org/1985693002/ is landed, which initializes the frames used by FakeWebRtcVideoCaptureModule. So intend to reland after that, with no changes. Original issue's description: > Revert of Delete webrtc::VideoFrame methods buffer and stride. (patchset #2 id:290001 of https://codereview.webrtc.org/1963413004/ ) > > Reason for revert: > Speculative revert to see if failures on the DrMemory bot are related to this cl. See e.g. here: > https://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Full/builds/4243 > > UNINITIALIZED READ: reading 0x04980040-0x04980060 32 byte(s) within 0x04980040-0x04980060 > # 0 CopyRow_AVX > # 1 CopyPlane > # 2 I420Copy > # 3 webrtc::ExtractBuffer > # 4 cricket::WebRtcVideoCapturer::SignalFrameCapturedOnStartThread > # 5 cricket::WebRtcVideoCapturer::OnIncomingCapturedFrame > # 6 FakeWebRtcVideoCaptureModule::SendFrame > # 7 WebRtcVideoCapturerTest_TestCaptureVcm_Test::TestBody > # 8 testing::internal::HandleSehExceptionsInMethodIfSupported<> > > Original issue's description: > > Reland of Delete webrtc::VideoFrame methods buffer and stride. (patchset #1 id:1 of https://codereview.webrtc.org/1935443002/ ) > > > > Reason for revert: > > I plan to reland this change in a week or two, after downstream users are updated. > > > > Original issue's description: > > > Revert of Delete webrtc::VideoFrame methods buffer and stride. (patchset #14 id:250001 of https://codereview.webrtc.org/1900673002/ ) > > > > > > Reason for revert: > > > Breaks chrome FYI bots. > > > > > > Original issue's description: > > > > Delete webrtc::VideoFrame methods buffer and stride. > > > > > > > > To make the HasOneRef/IsMutable hack work, also had to change the > > > > video_frame_buffer method to return a const ref to a scoped_ref_ptr, > > > > to not imply an AddRef. > > > > > > > > BUG=webrtc:5682 > > > > > > TBR=perkj@webrtc.org,magjed@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,stefan@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:5682 > > > > > > Committed: https://crrev.com/5b3c443d301f2c2f18dac5b02652c08b91ea3828 > > > Cr-Commit-Position: refs/heads/master@{#12558} > > > > TBR=perkj@webrtc.org,magjed@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,stefan@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/d0dc66e0ea30c8614001e425a4ae0aa7dd56c2a7 > > Cr-Commit-Position: refs/heads/master@{#12721} > > TBR=perkj@webrtc.org,magjed@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,stefan@webrtc.org,nisse@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/d49c30cd2fe442f2b5b4ecec8d5cbaa430464725 > Cr-Commit-Position: refs/heads/master@{#12745} TBR=perkj@webrtc.org,magjed@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/1979193003 Cr-Commit-Position: refs/heads/master@{#12773}
206 lines
6.4 KiB
C++
206 lines
6.4 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 "webrtc/video_frame.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <algorithm> // swap
|
|
|
|
#include "webrtc/base/bind.h"
|
|
#include "webrtc/base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// FFmpeg's decoder, used by H264DecoderImpl, requires up to 8 bytes padding due
|
|
// to optimized bitstream readers. See avcodec_decode_video2.
|
|
const size_t EncodedImage::kBufferPaddingBytesH264 = 8;
|
|
|
|
int ExpectedSize(int plane_stride, int image_height, PlaneType type) {
|
|
if (type == kYPlane)
|
|
return plane_stride * image_height;
|
|
return plane_stride * ((image_height + 1) / 2);
|
|
}
|
|
|
|
VideoFrame::VideoFrame()
|
|
: video_frame_buffer_(nullptr),
|
|
timestamp_(0),
|
|
ntp_time_ms_(0),
|
|
render_time_ms_(0),
|
|
rotation_(kVideoRotation_0) {}
|
|
|
|
VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
|
uint32_t timestamp,
|
|
int64_t render_time_ms,
|
|
VideoRotation rotation)
|
|
: video_frame_buffer_(buffer),
|
|
timestamp_(timestamp),
|
|
ntp_time_ms_(0),
|
|
render_time_ms_(render_time_ms),
|
|
rotation_(rotation) {
|
|
}
|
|
|
|
void VideoFrame::CreateEmptyFrame(int width,
|
|
int height,
|
|
int stride_y,
|
|
int stride_u,
|
|
int stride_v) {
|
|
const int half_width = (width + 1) / 2;
|
|
RTC_DCHECK_GT(width, 0);
|
|
RTC_DCHECK_GT(height, 0);
|
|
RTC_DCHECK_GE(stride_y, width);
|
|
RTC_DCHECK_GE(stride_u, half_width);
|
|
RTC_DCHECK_GE(stride_v, half_width);
|
|
|
|
// Creating empty frame - reset all values.
|
|
timestamp_ = 0;
|
|
ntp_time_ms_ = 0;
|
|
render_time_ms_ = 0;
|
|
rotation_ = kVideoRotation_0;
|
|
|
|
// Check if it's safe to reuse allocation.
|
|
if (video_frame_buffer_ && video_frame_buffer_->IsMutable() &&
|
|
!video_frame_buffer_->native_handle() &&
|
|
width == video_frame_buffer_->width() &&
|
|
height == video_frame_buffer_->height() &&
|
|
stride_y == video_frame_buffer_->StrideY() &&
|
|
stride_u == video_frame_buffer_->StrideU() &&
|
|
stride_v == video_frame_buffer_->StrideV()) {
|
|
return;
|
|
}
|
|
|
|
// Need to allocate new buffer.
|
|
video_frame_buffer_ = new rtc::RefCountedObject<I420Buffer>(
|
|
width, height, stride_y, stride_u, stride_v);
|
|
}
|
|
|
|
void VideoFrame::CreateFrame(const uint8_t* buffer_y,
|
|
const uint8_t* buffer_u,
|
|
const uint8_t* buffer_v,
|
|
int width,
|
|
int height,
|
|
int stride_y,
|
|
int stride_u,
|
|
int stride_v,
|
|
VideoRotation rotation) {
|
|
const int half_height = (height + 1) / 2;
|
|
const int expected_size_y = height * stride_y;
|
|
const int expected_size_u = half_height * stride_u;
|
|
const int expected_size_v = half_height * stride_v;
|
|
CreateEmptyFrame(width, height, stride_y, stride_u, stride_v);
|
|
memcpy(video_frame_buffer_->MutableDataY(), buffer_y, expected_size_y);
|
|
memcpy(video_frame_buffer_->MutableDataU(), buffer_u, expected_size_u);
|
|
memcpy(video_frame_buffer_->MutableDataV(), buffer_v, expected_size_v);
|
|
rotation_ = rotation;
|
|
}
|
|
|
|
void VideoFrame::CreateFrame(const uint8_t* buffer,
|
|
int width,
|
|
int height,
|
|
VideoRotation rotation) {
|
|
const int stride_y = width;
|
|
const int stride_uv = (width + 1) / 2;
|
|
|
|
const uint8_t* buffer_y = buffer;
|
|
const uint8_t* buffer_u = buffer_y + stride_y * height;
|
|
const uint8_t* buffer_v = buffer_u + stride_uv * ((height + 1) / 2);
|
|
CreateFrame(buffer_y, buffer_u, buffer_v, width, height, stride_y,
|
|
stride_uv, stride_uv, rotation);
|
|
}
|
|
|
|
void VideoFrame::CopyFrame(const VideoFrame& videoFrame) {
|
|
ShallowCopy(videoFrame);
|
|
|
|
// If backed by a plain memory buffer, create a new, non-shared, copy.
|
|
if (video_frame_buffer_ && !video_frame_buffer_->native_handle()) {
|
|
video_frame_buffer_ = I420Buffer::Copy(video_frame_buffer_);
|
|
}
|
|
}
|
|
|
|
void VideoFrame::ShallowCopy(const VideoFrame& videoFrame) {
|
|
video_frame_buffer_ = videoFrame.video_frame_buffer();
|
|
timestamp_ = videoFrame.timestamp_;
|
|
ntp_time_ms_ = videoFrame.ntp_time_ms_;
|
|
render_time_ms_ = videoFrame.render_time_ms_;
|
|
rotation_ = videoFrame.rotation_;
|
|
}
|
|
|
|
// TODO(nisse): Delete. Besides test code, only one use, in
|
|
// webrtcvideoengine2.cc:CreateBlackFrame.
|
|
int VideoFrame::allocated_size(PlaneType type) const {
|
|
const int plane_height = (type == kYPlane) ? height() : (height() + 1) / 2;
|
|
int stride;
|
|
switch (type) {
|
|
case kYPlane:
|
|
stride = video_frame_buffer_->StrideY();
|
|
break;
|
|
case kUPlane:
|
|
stride = video_frame_buffer_->StrideU();
|
|
break;
|
|
case kVPlane:
|
|
stride = video_frame_buffer_->StrideV();
|
|
break;
|
|
default:
|
|
RTC_NOTREACHED();
|
|
return 0;
|
|
}
|
|
return plane_height * stride;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
bool VideoFrame::IsZeroSize() const {
|
|
return !video_frame_buffer_;
|
|
}
|
|
|
|
const rtc::scoped_refptr<VideoFrameBuffer>& VideoFrame::video_frame_buffer()
|
|
const {
|
|
return video_frame_buffer_;
|
|
}
|
|
|
|
void VideoFrame::set_video_frame_buffer(
|
|
const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer) {
|
|
video_frame_buffer_ = buffer;
|
|
}
|
|
|
|
VideoFrame VideoFrame::ConvertNativeToI420Frame() const {
|
|
RTC_DCHECK(video_frame_buffer_->native_handle());
|
|
VideoFrame frame;
|
|
frame.ShallowCopy(*this);
|
|
frame.set_video_frame_buffer(video_frame_buffer_->NativeToI420Buffer());
|
|
return frame;
|
|
}
|
|
|
|
size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
|
|
switch (codec_type) {
|
|
case kVideoCodecVP8:
|
|
case kVideoCodecVP9:
|
|
return 0;
|
|
case kVideoCodecH264:
|
|
return kBufferPaddingBytesH264;
|
|
case kVideoCodecI420:
|
|
case kVideoCodecRED:
|
|
case kVideoCodecULPFEC:
|
|
case kVideoCodecGeneric:
|
|
case kVideoCodecUnknown:
|
|
return 0;
|
|
}
|
|
RTC_NOTREACHED();
|
|
return 0;
|
|
}
|
|
|
|
} // namespace webrtc
|