zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make FrameBuffer be able to signal if it's trivially convertible to I420

Browse Source 
Bug: chromium:930186,webrtc:10310
Change-Id: I7857c33d3616ac58738b22816f9c78fe9e6d1d3c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134206
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27798}
This commit is contained in:
Ilya Nikolaevskiy
2019-04-29 11:25:50 +02:00
committed by Commit Bot
parent 4babc68eee
commit ade0dc9860
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/video/video_frame_buffer.cc
View File

@ -15,14 +15,20 @@
namespace webrtc { namespace webrtc {
rtc::scoped_refptr<I420BufferInterface> VideoFrameBuffer::GetI420() { rtc::scoped_refptr<I420BufferInterface> VideoFrameBuffer::GetI420() {
RTC_CHECK(type() == Type::kI420); if (type() == Type::kI420 || type() == Type::kI420A) {
return static_cast<I420BufferInterface*>(this); return static_cast<I420BufferInterface*>(this);
} else {
return nullptr;
}
} }
rtc::scoped_refptr<const I420BufferInterface> VideoFrameBuffer::GetI420() rtc::scoped_refptr<const I420BufferInterface> VideoFrameBuffer::GetI420()
const { const {
RTC_CHECK(type() == Type::kI420); if (type() == Type::kI420 || type() == Type::kI420A) {
return static_cast<const I420BufferInterface*>(this); return static_cast<const I420BufferInterface*>(this);
} else {
return nullptr;
}
} }
I420ABufferInterface* VideoFrameBuffer::GetI420A() { I420ABufferInterface* VideoFrameBuffer::GetI420A() {

15
api/video/video_frame_buffer.h
View File

@ -65,12 +65,19 @@ class VideoFrameBuffer : public rtc::RefCountInterface {
// software encoders. // software encoders.
virtual rtc::scoped_refptr<I420BufferInterface> ToI420() = 0; virtual rtc::scoped_refptr<I420BufferInterface> ToI420() = 0;
// These functions should only be called if type() is of the correct type. // GetI420() methods should return I420 buffer if conversion is trivial, i.e
// Calling with a different type will result in a crash. // no change for binary data is needed. Otherwise these methods should return
// nullptr. One example of buffer with that property is
// WebrtcVideoFrameAdapter in Chrome - it's I420 buffer backed by a shared
// memory buffer. Therefore it must have type kNative. Yet, ToI420()
// doesn't affect binary data at all. Another example is any I420A buffer.
// TODO(magjed): Return raw pointers for GetI420 once deprecated interface is // TODO(magjed): Return raw pointers for GetI420 once deprecated interface is
// removed. // removed.
rtc::scoped_refptr<I420BufferInterface> GetI420(); virtual rtc::scoped_refptr<I420BufferInterface> GetI420();
rtc::scoped_refptr<const I420BufferInterface> GetI420() const; virtual rtc::scoped_refptr<const I420BufferInterface> GetI420() const;
// These functions should only be called if type() is of the correct type.
// Calling with a different type will result in a crash.
I420ABufferInterface* GetI420A(); I420ABufferInterface* GetI420A();
const I420ABufferInterface* GetI420A() const; const I420ABufferInterface* GetI420A() const;
I444BufferInterface* GetI444(); I444BufferInterface* GetI444();