2386d6dd92
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
110 lines
3.4 KiB
C++
110 lines
3.4 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_VIDEO_FRAME_BUFFER_H_
|
|
#define WEBRTC_VIDEO_FRAME_BUFFER_H_
|
|
|
|
#include "webrtc/base/refcount.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/common_video/interface/native_handle.h"
|
|
#include "webrtc/system_wrappers/interface/aligned_malloc.h"
|
|
|
|
namespace webrtc {
|
|
|
|
enum PlaneType {
|
|
kYPlane = 0,
|
|
kUPlane = 1,
|
|
kVPlane = 2,
|
|
kNumOfPlanes = 3,
|
|
};
|
|
|
|
// Interface of a simple frame buffer containing pixel data. This interface does
|
|
// not contain any frame metadata such as rotation, timestamp, pixel_width, etc.
|
|
class VideoFrameBuffer : public rtc::RefCountInterface {
|
|
public:
|
|
// Returns true if this buffer has a single exclusive owner.
|
|
virtual bool HasOneRef() const = 0;
|
|
|
|
// The resolution of the frame in pixels. For formats where some planes are
|
|
// subsampled, this is the highest-resolution plane.
|
|
virtual int width() const = 0;
|
|
virtual int height() const = 0;
|
|
|
|
// Returns pointer to the pixel data for a given plane. The memory is owned by
|
|
// the VideoFrameBuffer object and must not be freed by the caller.
|
|
virtual const uint8_t* data(PlaneType type) const = 0;
|
|
|
|
// Non-const data access is only allowed if |HasOneRef| is true.
|
|
virtual uint8_t* data(PlaneType type) = 0;
|
|
|
|
// Returns the number of bytes between successive rows for a given plane.
|
|
virtual int stride(PlaneType type) const = 0;
|
|
|
|
// Return the handle of the underlying video frame. This is used when the
|
|
// frame is backed by a texture.
|
|
virtual rtc::scoped_refptr<NativeHandle> native_handle() const = 0;
|
|
|
|
protected:
|
|
virtual ~VideoFrameBuffer();
|
|
};
|
|
|
|
// Plain I420 buffer in standard memory.
|
|
class I420Buffer : public VideoFrameBuffer {
|
|
public:
|
|
I420Buffer(int width, int height);
|
|
I420Buffer(int width, int height, int stride_y, int stride_u, int stride_v);
|
|
|
|
int width() const override;
|
|
int height() const override;
|
|
const uint8_t* data(PlaneType type) const override;
|
|
uint8_t* data(PlaneType type) override;
|
|
int stride(PlaneType type) const override;
|
|
rtc::scoped_refptr<NativeHandle> native_handle() const override;
|
|
|
|
private:
|
|
friend class rtc::RefCountedObject<I420Buffer>;
|
|
~I420Buffer() override;
|
|
|
|
const int width_;
|
|
const int height_;
|
|
const int stride_y_;
|
|
const int stride_u_;
|
|
const int stride_v_;
|
|
const rtc::scoped_ptr<uint8_t, AlignedFreeDeleter> data_;
|
|
};
|
|
|
|
// Texture buffer around a NativeHandle.
|
|
class TextureBuffer : public VideoFrameBuffer {
|
|
public:
|
|
TextureBuffer(const rtc::scoped_refptr<NativeHandle>& native_handle,
|
|
int width,
|
|
int height);
|
|
|
|
int width() const override;
|
|
int height() const override;
|
|
const uint8_t* data(PlaneType type) const override;
|
|
uint8_t* data(PlaneType type) override;
|
|
int stride(PlaneType type) const override;
|
|
rtc::scoped_refptr<NativeHandle> native_handle() const override;
|
|
|
|
private:
|
|
friend class rtc::RefCountedObject<TextureBuffer>;
|
|
~TextureBuffer() override;
|
|
|
|
const rtc::scoped_refptr<NativeHandle> native_handle_;
|
|
const int width_;
|
|
const int height_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_FRAME_BUFFER_H_
|