ca6d5d1c9f
Reason for revert: Taking out the VideoFrameBuffer changes which broke downstream. Original issue's description: > Revert of Delete unused and almost unused frame-related methods. (patchset #12 id:220001 of https://codereview.webrtc.org/2065733003/ ) > > Reason for revert: > Breaks downstream applications which inherits webrtc::VideoFrameBuffer and tries to override deleted methods data(), stride() and MutableData(). > > Original issue's description: > > Delete unused and almost unused frame-related methods. > > > > webrtc::VideoFrame::set_video_frame_buffer > > webrtc::VideoFrame::ConvertNativeToI420Frame > > > > cricket::WebRtcVideoFrame::InitToBlack > > > > VideoFrameBuffer::data > > VideoFrameBuffer::stride > > VideoFrameBuffer::MutableData > > > > TBR=tkchin@webrtc.org # Refactoring affecting RTCVideoFrame > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/76270de4bc2dac188f10f805e6e2fb86693ef864 > > Cr-Commit-Position: refs/heads/master@{#13183} > > TBR=perkj@webrtc.org,pbos@webrtc.org,marpan@webrtc.org,tkchin@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/72e735d3867a0fd6ab7e4d0761c7ba5f6c068617 > Cr-Commit-Position: refs/heads/master@{#13184} TBR=perkj@webrtc.org,pbos@webrtc.org,marpan@webrtc.org,tkchin@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2076123002 Cr-Commit-Position: refs/heads/master@{#13189}
119 lines
2.5 KiB
Plaintext
119 lines
2.5 KiB
Plaintext
/*
|
|
* Copyright 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.
|
|
*/
|
|
|
|
#import "RTCVideoFrame+Private.h"
|
|
|
|
#include <memory>
|
|
|
|
@implementation RTCVideoFrame {
|
|
std::unique_ptr<cricket::VideoFrame> _videoFrame;
|
|
rtc::scoped_refptr<webrtc::VideoFrameBuffer> _i420Buffer;
|
|
}
|
|
|
|
- (size_t)width {
|
|
return _videoFrame->width();
|
|
}
|
|
|
|
- (size_t)height {
|
|
return _videoFrame->height();
|
|
}
|
|
|
|
// TODO(nisse): chromaWidth and chromaHeight are used only in
|
|
// RTCOpenGLVideoRenderer.mm. Update, and then delete these
|
|
// properties.
|
|
- (size_t)chromaWidth {
|
|
return (self.width + 1) / 2;
|
|
}
|
|
|
|
- (size_t)chromaHeight {
|
|
return (self.height + 1) / 2;
|
|
}
|
|
|
|
- (const uint8_t *)yPlane {
|
|
if (!self.i420Buffer) {
|
|
return nullptr;
|
|
}
|
|
return self.i420Buffer->DataY();
|
|
}
|
|
|
|
- (const uint8_t *)uPlane {
|
|
if (!self.i420Buffer) {
|
|
return nullptr;
|
|
}
|
|
return self.i420Buffer->DataU();
|
|
}
|
|
|
|
- (const uint8_t *)vPlane {
|
|
if (!self.i420Buffer) {
|
|
return nullptr;
|
|
}
|
|
return self.i420Buffer->DataV();
|
|
}
|
|
|
|
- (int32_t)yPitch {
|
|
if (!self.i420Buffer) {
|
|
return 0;
|
|
}
|
|
return self.i420Buffer->StrideY();
|
|
}
|
|
|
|
- (int32_t)uPitch {
|
|
if (!self.i420Buffer) {
|
|
return 0;
|
|
}
|
|
return self.i420Buffer->StrideU();
|
|
}
|
|
|
|
- (int32_t)vPitch {
|
|
if (!self.i420Buffer) {
|
|
return 0;
|
|
}
|
|
return self.i420Buffer->StrideV();
|
|
}
|
|
|
|
- (int64_t)timeStamp {
|
|
return _videoFrame->GetTimeStamp();
|
|
}
|
|
|
|
- (CVPixelBufferRef)nativeHandle {
|
|
return static_cast<CVPixelBufferRef>(
|
|
_videoFrame->video_frame_buffer()->native_handle());
|
|
}
|
|
|
|
- (void)convertBufferIfNeeded {
|
|
if (!_i420Buffer) {
|
|
if (_videoFrame->video_frame_buffer()->native_handle()) {
|
|
// Convert to I420.
|
|
_i420Buffer = _videoFrame->video_frame_buffer()->NativeToI420Buffer();
|
|
} else {
|
|
// Should already be I420.
|
|
_i420Buffer = _videoFrame->video_frame_buffer();
|
|
}
|
|
}
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (instancetype)initWithNativeFrame:(const cricket::VideoFrame *)nativeFrame {
|
|
if (self = [super init]) {
|
|
// Keep a shallow copy of the video frame. The underlying frame buffer is
|
|
// not copied.
|
|
_videoFrame.reset(nativeFrame->Copy());
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (rtc::scoped_refptr<webrtc::VideoFrameBuffer>)i420Buffer {
|
|
[self convertBufferIfNeeded];
|
|
return _i420Buffer;
|
|
}
|
|
|
|
@end
|