It's possible to build Chrome on Windows with this patch now. BUG=1128 > This is unfortunately causing build problems in Chrome on Windows. >> Unify underlying frame buffer in I420VideoFrame and WebRtcVideoFrame >> >> Currently, I420VideoFrame uses three webrtc::Plane to store pixel data, and WebRtcVideoFrame uses WebRtcVideoFrame::FrameBuffer/webrtc::VideoFrame. The two subclasses WebRtcTextureVideoFrame and TextureVideoFrame use a NativeHandle to store pixel data, and there is also a class WebRtcVideoRenderFrame that wraps an I420VideoFrame. >> >> This CL replaces these classes with a new interface VideoFrameBuffer that provides the common functionality. This makes it possible to remove deep frame copies between cricket::VideoFrame and I420VideoFrame. >> >> Some additional minor changes are: >> * Disallow creation of 0x0 texture frames. >> * Remove the half-implemented ref count functions in I420VideoFrame. >> * Remove the Alias functionality in WebRtcVideoFrame >> >> The final goal is to eliminate all frame copies, but to limit the scope of this CL, some planned changes are postponed to follow-up CL:s (see planned changes in https://webrtc-codereview.appspot.com/38879004, or https://docs.google.com/document/d/1bxoJZNmlo-Z9GnQwIaWpEG6hDlL_W-bzka8Zb_K2NbA/preview). Specifically, this CL: >> * Keeps empty subclasses WebRtcTextureVideoFrame and TextureVideoFrame, and just delegates the construction to the superclass. >> * Keeps the deep copies from cricket::VideoFrame to I420VideoFrame. >> >> BUG=1128 >> R=mflodman@webrtc.org, pbos@webrtc.org, perkj@webrtc.org, tommi@webrtc.org >> >> Review URL: https://webrtc-codereview.appspot.com/42469004 R=pbos@webrtc.org TBR=mflodman, pbos, perkj, tommi Review URL: https://webrtc-codereview.appspot.com/45489004 Cr-Commit-Position: refs/heads/master@{#8616} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8616 4adac7df-926f-26a2-2b94-8c16560cd09d
137 lines
3.3 KiB
C++
137 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2015 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/common_video/interface/video_frame_buffer.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
|
|
// Aligning pointer to 64 bytes for improved performance, e.g. use SIMD.
|
|
static const int kBufferAlignment = 64;
|
|
|
|
namespace webrtc {
|
|
|
|
VideoFrameBuffer::~VideoFrameBuffer() {}
|
|
|
|
I420Buffer::I420Buffer(int width, int height)
|
|
: I420Buffer(width, height, width, (width + 1) / 2, (width + 1) / 2) {
|
|
}
|
|
|
|
I420Buffer::I420Buffer(int width,
|
|
int height,
|
|
int stride_y,
|
|
int stride_u,
|
|
int stride_v)
|
|
: width_(width),
|
|
height_(height),
|
|
stride_y_(stride_y),
|
|
stride_u_(stride_u),
|
|
stride_v_(stride_v),
|
|
data_(static_cast<uint8_t*>(AlignedMalloc(
|
|
stride_y * height + (stride_u + stride_v) * ((height + 1) / 2),
|
|
kBufferAlignment))) {
|
|
DCHECK_GT(width, 0);
|
|
DCHECK_GT(height, 0);
|
|
DCHECK_GE(stride_y, width);
|
|
DCHECK_GE(stride_u, (width + 1) / 2);
|
|
DCHECK_GE(stride_v, (width + 1) / 2);
|
|
}
|
|
|
|
I420Buffer::~I420Buffer() {
|
|
}
|
|
|
|
int I420Buffer::width() const {
|
|
return width_;
|
|
}
|
|
|
|
int I420Buffer::height() const {
|
|
return height_;
|
|
}
|
|
|
|
const uint8_t* I420Buffer::data(PlaneType type) const {
|
|
switch (type) {
|
|
case kYPlane:
|
|
return data_.get();
|
|
case kUPlane:
|
|
return data_.get() + stride_y_ * height_;
|
|
case kVPlane:
|
|
return data_.get() + stride_y_ * height_ +
|
|
stride_u_ * ((height_ + 1) / 2);
|
|
default:
|
|
RTC_NOTREACHED();
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
uint8_t* I420Buffer::data(PlaneType type) {
|
|
DCHECK(HasOneRef());
|
|
return const_cast<uint8_t*>(
|
|
static_cast<const VideoFrameBuffer*>(this)->data(type));
|
|
}
|
|
|
|
int I420Buffer::stride(PlaneType type) const {
|
|
switch (type) {
|
|
case kYPlane:
|
|
return stride_y_;
|
|
case kUPlane:
|
|
return stride_u_;
|
|
case kVPlane:
|
|
return stride_v_;
|
|
default:
|
|
RTC_NOTREACHED();
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
rtc::scoped_refptr<NativeHandle> I420Buffer::native_handle() const {
|
|
return nullptr;
|
|
}
|
|
|
|
TextureBuffer::TextureBuffer(
|
|
const rtc::scoped_refptr<NativeHandle>& native_handle,
|
|
int width,
|
|
int height)
|
|
: native_handle_(native_handle), width_(width), height_(height) {
|
|
DCHECK(native_handle.get());
|
|
DCHECK_GT(width, 0);
|
|
DCHECK_GT(height, 0);
|
|
}
|
|
|
|
TextureBuffer::~TextureBuffer() {
|
|
}
|
|
|
|
int TextureBuffer::width() const {
|
|
return width_;
|
|
}
|
|
|
|
int TextureBuffer::height() const {
|
|
return height_;
|
|
}
|
|
|
|
const uint8_t* TextureBuffer::data(PlaneType type) const {
|
|
RTC_NOTREACHED(); // Should not be called.
|
|
return nullptr;
|
|
}
|
|
|
|
uint8_t* TextureBuffer::data(PlaneType type) {
|
|
RTC_NOTREACHED(); // Should not be called.
|
|
return nullptr;
|
|
}
|
|
|
|
int TextureBuffer::stride(PlaneType type) const {
|
|
RTC_NOTREACHED(); // Should not be called.
|
|
return 0;
|
|
}
|
|
|
|
rtc::scoped_refptr<NativeHandle> TextureBuffer::native_handle() const {
|
|
return native_handle_;
|
|
}
|
|
|
|
} // namespace webrtc
|